Merge 400d51c927 into 6bfccf8afa

clause/expr_case.go

@@ -0,0 +1,54 @@
+package clause
+
+type ExprCaseCondition struct {
+	When string
+	Then string
+	Vars []any
+}
+
+type ExprCaseElse struct {
+	Then string
+	Vars []any
+}
+
+type ExprCase struct {
+	Cases []*ExprCaseCondition
+	Else  *ExprCaseElse
+}
+
+func (expr ExprCase) Name() string {
+	return "CASE"
+}
+
+func (expr ExprCase) Build(builder Builder) {
+	var vars []any
+	for idx, condition := range expr.Cases {
+		if idx > 0 {
+			_ = builder.WriteByte(' ')
+		}
+		_, _ = builder.WriteString("WHEN ")
+		_, _ = builder.WriteString(condition.When)
+		_, _ = builder.WriteString(" THEN ")
+		_, _ = builder.WriteString(condition.Then)
+		if len(condition.Vars) > 0 {
+			vars = append(vars, condition.Vars...)
+		}
+	}
+
+	if expr.Else != nil {
+		elseExpr := expr.Else
+		_, _ = builder.WriteString(" ELSE ")
+		_, _ = builder.WriteString(elseExpr.Then)
+		if len(elseExpr.Vars) > 0 {
+			vars = append(vars, elseExpr.Vars...)
+		}
+	}
+	_, _ = builder.WriteString(" END")
+
+	clauseExpr := Expr{SQL: "", Vars: vars}
+	clauseExpr.Build(builder)
+}
+
+func (expr ExprCase) MergeClause(clause *Clause) {
+	clause.Expression = expr
+}

clause/expr_case_test.go

@@ -0,0 +1,60 @@
+package clause_test
+
+import (
+	"testing"
+
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+)
+
+func Test_ExprCase(t *testing.T) {
+	type exampleUser struct {
+		ID   string
+		Name string
+	}
+
+	inputUsers := []*exampleUser{
+		{
+			ID:   "user-001",
+			Name: "user-name-001",
+		},
+		{
+			ID:   "user-002",
+			Name: "user-name-002",
+		},
+	}
+
+	userIDs := make([]string, len(inputUsers))
+	userNameCases := make([]*clause.ExprCaseCondition, len(inputUsers))
+	for idx, user := range inputUsers {
+		userIDs[idx] = user.ID
+		userNameCases[idx] = &clause.ExprCaseCondition{
+			When: "user_id=?",
+			Then: "?",
+			Vars: []any{
+				user.ID,
+				user.Name,
+			},
+		}
+	}
+
+	sqlQuery := db.ToSQL(func(db *gorm.DB) *gorm.DB {
+		return db.
+			Table("users").
+			Where("user_id IN (?)", userIDs).
+			UpdateColumns(map[string]any{
+				"user_name": clause.ExprCase{
+					Cases: userNameCases,
+					Else: &clause.ExprCaseElse{
+						Then: "user_name",
+						Vars: nil,
+					},
+				},
+			})
+	})
+
+	expectedSQLQuery := "UPDATE `users` SET `user_name`=CASE WHEN user_id=\"user-001\" THEN \"user-name-001\" WHEN user_id=\"user-002\" THEN \"user-name-002\" ELSE user_name END WHERE user_id IN (\"user-001\",\"user-002\")"
+	if sqlQuery != expectedSQLQuery {
+		t.Errorf("SQLQuery is mismatch actual: %v expected:%v\n", sqlQuery, expectedSQLQuery)
+	}
+}

go.mod

@@ -5,5 +5,5 @@ go 1.18
 require (
 	github.com/jinzhu/inflection v1.0.0
 	github.com/jinzhu/now v1.1.5
-	golang.org/x/text v0.14.0
+	golang.org/x/text v0.20.0
 )

go.sum

@@ -2,5 +2,5 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
+golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=

gorm.go

@@ -183,7 +183,6 @@ func Open(dialector Dialector, opts ...Option) (db *DB, err error) {
 
 	if config.Dialector != nil {
 		err = config.Dialector.Initialize(db)
-
 		if err != nil {
 			if db, _ := db.DB(); db != nil {
 				_ = db.Close()

tests/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/stretchr/testify v1.9.0
 	gorm.io/driver/mysql v1.5.7
-	gorm.io/driver/postgres v1.5.9
+	gorm.io/driver/postgres v1.5.10
 	gorm.io/driver/sqlite v1.5.6
 	gorm.io/driver/sqlserver v1.5.4
 	gorm.io/gorm v1.25.12
@@ -25,12 +25,12 @@ require (
 	github.com/jackc/pgx/v5 v5.7.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/mattn/go-sqlite3 v1.14.23 // indirect
+	github.com/mattn/go-sqlite3 v1.14.24 // indirect
 	github.com/microsoft/go-mssqldb v1.7.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/crypto v0.29.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

tests/tests_all.sh

@@ -16,22 +16,23 @@ then
 fi
 
 # SqlServer for Mac M1
-if [[ -z $GITHUB_ACTION ]]; then
-  if [ -d tests ]
-  then
+if [[ -z $GITHUB_ACTION && -d tests ]]; then
   cd tests
   if [[ $(uname -a) == *" arm64" ]]; then
-      MSSQL_IMAGE=mcr.microsoft.com/azure-sql-edge docker compose up -d || true
+    MSSQL_IMAGE=mcr.microsoft.com/azure-sql-edge docker compose up -d --wait
     go install github.com/microsoft/go-sqlcmd/cmd/sqlcmd@latest || true
-      SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "IF DB_ID('gorm') IS NULL CREATE DATABASE gorm" > /dev/null || true
-      SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "IF SUSER_ID (N'gorm') IS NULL CREATE LOGIN gorm WITH PASSWORD = 'LoremIpsum86';" > /dev/null || true
-      SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "IF USER_ID (N'gorm') IS NULL CREATE USER gorm FROM LOGIN gorm; ALTER SERVER ROLE sysadmin ADD MEMBER [gorm];" > /dev/null || true
+    for query in \
+      "IF DB_ID('gorm') IS NULL CREATE DATABASE gorm" \
+      "IF SUSER_ID (N'gorm') IS NULL CREATE LOGIN gorm WITH PASSWORD = 'LoremIpsum86';" \
+      "IF USER_ID (N'gorm') IS NULL CREATE USER gorm FROM LOGIN gorm; ALTER SERVER ROLE sysadmin ADD MEMBER [gorm];"
+    do
+      SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "$query" > /dev/null || true
+    done
   else
-      MSSQL_IMAGE=mcr.microsoft.com/mssql/server docker compose up -d
+    MSSQL_IMAGE=mcr.microsoft.com/mssql/server docker compose up -d --wait
   fi
   cd ..
 fi
-fi
 
 
 for dialect in "${dialects[@]}" ; do