From aefc97d8a9ebe5f10a3203d07cee463c9b73b88e Mon Sep 17 00:00:00 2001 From: kmayer Date: Mon, 15 Jan 2018 14:51:50 +0500 Subject: [PATCH] add func to use in callbacks: NowFuncString() *string --- callback_create.go | 2 +- callback_delete.go | 2 +- callback_update.go | 2 +- utils.go | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/callback_create.go b/callback_create.go index a4da39e8..a1399721 100644 --- a/callback_create.go +++ b/callback_create.go @@ -31,7 +31,7 @@ func beforeCreateCallback(scope *Scope) { // updateTimeStampForCreateCallback will set `CreatedAt`, `UpdatedAt` when creating func updateTimeStampForCreateCallback(scope *Scope) { if !scope.HasError() { - now := NowFunc() + now := NowFuncString() if createdAtField, ok := scope.FieldByName("CreatedAt"); ok { if createdAtField.IsBlank { diff --git a/callback_delete.go b/callback_delete.go index 73d90880..2997b98b 100644 --- a/callback_delete.go +++ b/callback_delete.go @@ -40,7 +40,7 @@ func deleteCallback(scope *Scope) { "UPDATE %v SET %v=%v%v%v", scope.QuotedTableName(), scope.Quote(deletedAtField.DBName), - scope.AddToVars(NowFunc()), + scope.AddToVars(NowFuncString()), addExtraSpaceIfExist(scope.CombinedConditionSql()), addExtraSpaceIfExist(extraOption), )).Exec() diff --git a/callback_update.go b/callback_update.go index 6948439f..099ae6ba 100644 --- a/callback_update.go +++ b/callback_update.go @@ -49,7 +49,7 @@ func beforeUpdateCallback(scope *Scope) { // updateTimeStampForUpdateCallback will set `UpdatedAt` when updating func updateTimeStampForUpdateCallback(scope *Scope) { if _, ok := scope.Get("gorm:update_column"); !ok { - scope.SetColumn("UpdatedAt", NowFunc()) + scope.SetColumn("UpdatedAt", NowFuncString()) } } diff --git a/utils.go b/utils.go index 97a3d175..574c24e9 100644 --- a/utils.go +++ b/utils.go @@ -22,6 +22,11 @@ var NowFunc = func() time.Time { return time.Now() } +var NowFuncString = func() *string { + t := time.Now().UTC().Format(time.RFC3339) + return &t +} + // Copied from golint var commonInitialisms = []string{"API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "LHS", "QPS", "RAM", "RHS", "RPC", "SLA", "SMTP", "SSH", "TLS", "TTL", "UI", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XSRF", "XSS"} var commonInitialismsReplacer *strings.Replacer