Merge pull request #13 from go-gorm/12-fix-auto-update-time-invalid

fix: auto update time invalid

Author: icpd

version.go

@@ -140,7 +140,11 @@ func (v VersionUpdateClause) ModifyStatement(stmt *gorm.Statement) {
 				continue
 			}
 
-			if v, ok := selectColumns[field.DBName]; (ok && v) || (!ok && (!restricted || (!stmt.SkipHooks && field.AutoUpdateTime > 0))) {
+			if v, ok := selectColumns[field.DBName]; (ok && v) || (!ok && (!restricted || !stmt.SkipHooks)) {
+				if field.AutoUpdateTime > 0 {
+					continue
+				}
+
 				val, isZero := field.ValueOf(stmt.Context, dv)
 				if (ok || !isZero) && field.Updatable {
 					d[field.DBName] = val

version_test.go

@@ -49,7 +49,7 @@ func TestVersion(t *testing.T) {
 	require.Equal(t, int64(2), user.Version.Int64)
 	require.Equal(t, uint(18), user.Age)
 	require.Equal(t, date, user.UpdatedAt)
-	DB.NowFunc = time.Now().Local
+	DB.NowFunc = time.Now
 
 	rows = DB.Model(&user).Update("age", 16).RowsAffected
 	require.Equal(t, int64(1), rows)
@@ -100,6 +100,15 @@ func TestVersion(t *testing.T) {
 	require.Contains(t, sql, "`version`=`version`+1")
 	require.Contains(t, sql, "`version` = ?")
 
+	DB.NowFunc = func() time.Time {
+		return date
+	}
+	user.Name = "micky"
+	rows = DB.Updates(&user).RowsAffected
+	require.Equal(t, int64(1), rows)
+	require.Equal(t, date, user.UpdatedAt)
+	DB.NowFunc = time.Now
+
 	// support create
 	users := []User{{Name: "foo", Age: 30}, {Name: "bar", Age: 40, Version: Version{Int64: 100}}}
 	DB.Create(&users)
@@ -191,7 +200,11 @@ func TestEmbed(t *testing.T) {
 	DB.Save(&account)
 
 	sql := DB.Session(&gorm.Session{DryRun: true}).Updates(&account).Statement.SQL.String()
-	require.Equal(t, "UPDATE `accounts` SET `amount`=?,`created_at`=?,`ext`=?,`id`=?,`updated_at`=?,`user_id`=?,`version`=`version`+1 WHERE `accounts`.`deleted_at` IS NULL AND `accounts`.`version` = ? AND `id` = ?", sql)
+	require.Contains(t, sql, "`updated_at`=?")
+	require.Contains(t, sql, "`version`=`version`+1")
+	require.Contains(t, sql, "`user_id`=?")
+	require.Contains(t, sql, "`ext`=?")
+	require.Contains(t, sql, "`amount`=?")
 
 	var a Account
 	DB.First(&a)