Fix update blank value with Select

Author: jinzhu

Diff for: go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/stretchr/testify v1.7.0
 	gorm.io/driver/postgres v1.3.1
 	gorm.io/driver/sqlite v1.2.6
-	gorm.io/gorm v1.23.2
+	gorm.io/gorm v1.23.8
 )
 
 require (
@@ -20,7 +20,7 @@ require (
 	github.com/jackc/pgtype v1.9.1 // indirect
 	github.com/jackc/pgx/v4 v4.14.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.4 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/mattn/go-sqlite3 v1.14.9 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect

Diff for: go.sum

@@ -67,8 +67,9 @@ github.com/jackc/puddle v1.2.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=
 github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -193,6 +194,6 @@ gorm.io/driver/sqlite v1.2.6 h1:SStaH/b+280M7C8vXeZLz/zo9cLQmIGwwj3cSj7p6l4=
 gorm.io/driver/sqlite v1.2.6/go.mod h1:gyoX0vHiiwi0g49tv+x2E7l8ksauLK0U/gShcdUsjWY=
 gorm.io/gorm v1.22.3/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
 gorm.io/gorm v1.23.1/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
-gorm.io/gorm v1.23.2 h1:xmq9QRMWL8HTJyhAUBXy8FqIIQCYESeKfJL4DoGKiWQ=
-gorm.io/gorm v1.23.2/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
+gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE=
+gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

Diff for: version.go

@@ -131,15 +131,20 @@ func (v VersionUpdateClause) ModifyStatement(stmt *gorm.Statement) {
 	// struct to map
 	dv := reflect.ValueOf(stmt.Dest)
 	if reflect.Indirect(dv).Kind() == reflect.Struct {
+		selectColumns, restricted := stmt.SelectAndOmitColumns(false, true)
+
 		sd, _ := schema.Parse(stmt.Dest, &sync.Map{}, stmt.DB.NamingStrategy)
 		d := make(map[string]interface{})
 		for _, field := range sd.Fields {
 			if field.DBName == v.Field.DBName {
 				continue
 			}
 
-			if val, zero := field.ValueOf(stmt.Context, dv); !zero {
-				d[field.DBName] = val
+			if v, ok := selectColumns[field.DBName]; (ok && v) || (!ok && (!restricted || (!stmt.SkipHooks && field.AutoUpdateTime > 0))) {
+				val, isZero := field.ValueOf(stmt.Context, dv)
+				if (ok || !isZero) && field.Updatable {
+					d[field.DBName] = val
+				}
 			}
 		}
 

Diff for: version_test.go

@@ -12,6 +12,12 @@ import (
 	"gorm.io/gorm"
 )
 
+var (
+	mysqlDSN     = "gorm:gorm@tcp(localhost:9910)/gorm?charset=utf8&parseTime=True&loc=Local"
+	postgresDSN  = "user=gorm password=gorm dbname=gorm host=localhost port=9920 sslmode=disable TimeZone=Asia/Shanghai"
+	sqlserverDSN = "sqlserver://gorm:LoremIpsum86@localhost:9930?database=gorm"
+)
+
 type User struct {
 	ID      int
 	Name    string
@@ -21,7 +27,6 @@ type User struct {
 
 func TestVersion(t *testing.T) {
 	DB, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
-	DB = DB.Debug()
 	require.Nil(t, err)
 
 	user := User{Name: "bob", Age: 20}
@@ -52,11 +57,12 @@ func TestVersion(t *testing.T) {
 	require.Equal(t, int64(4), user.Version.Int64)
 	require.Equal(t, uint(12), user.Age)
 
-	rows = DB.Model(&user).Updates(&User{Name: "lewis"}).RowsAffected
+	rows = DB.Model(&user).Select("name", "age", "version").Updates(&User{Name: "lewis"}).RowsAffected
 	require.Equal(t, int64(1), rows)
 	require.Nil(t, DB.First(&user).Error)
 	require.Equal(t, int64(5), user.Version.Int64)
 	require.Equal(t, "lewis", user.Name)
+	require.Equal(t, uint(0), user.Age)
 
 	rows = DB.Model(&user).Updates(map[string]interface{}{
 		"age": 18,
@@ -145,7 +151,6 @@ func (e Ext) Value() (driver.Value, error) {
 
 func TestEmbed(t *testing.T) {
 	DB, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
-	DB = DB.Debug()
 	require.Nil(t, err)
 
 	user := User{Name: "bob", Age: 20}
@@ -189,11 +194,9 @@ func TestEmbed(t *testing.T) {
 	require.Equal(t, int64(3), a1.Version.Int64)
 }
 
-// docker run --name gormpostgresql -e POSTGRES_PASSWORD=gorm -e POSTGRES_USER=gorm -d -p 5432:5432 postgres
+// use gorm.io/gorm/tests docker compose file
 func TestPostgres(t *testing.T) {
-	dsn := "host=127.0.0.1 user=gorm password=gorm dbname=gorm port=5432 sslmode=disable TimeZone=Asia/Shanghai"
-	DB, err := gorm.Open(postgres.Open(dsn), &gorm.Config{})
-	DB = DB.Debug()
+	DB, err := gorm.Open(postgres.Open(postgresDSN), &gorm.Config{})
 	require.Nil(t, err)
 
 	user := User{Name: "bob", Age: 20}