Add Set-based Create and Update support to Generics API (#7578)

Author: jinzhu

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
   sqlite:
     strategy:
       matrix:
-        go: ['1.23', '1.24']
+        go: ['1.24', '1.25']
         platform: [ubuntu-latest] # can not run in windows OS
     runs-on: ${{ matrix.platform }}
 
@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         dbversion: ['mysql:9', 'mysql:8', 'mysql:5.7']
-        go: ['1.23', '1.24']
+        go: ['1.24', '1.25']
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
 
@@ -85,7 +85,7 @@ jobs:
     strategy:
       matrix:
         dbversion: [ 'mariadb:latest' ]
-        go: ['1.23', '1.24']
+        go: ['1.24', '1.25']
         platform: [ ubuntu-latest ]
     runs-on: ${{ matrix.platform }}
 
@@ -128,7 +128,7 @@ jobs:
     strategy:
       matrix:
         dbversion: ['postgres:latest', 'postgres:15', 'postgres:14', 'postgres:13']
-        go: ['1.23', '1.24']
+        go: ['1.24', '1.25']
         platform: [ubuntu-latest] # can not run in macOS and Windows
     runs-on: ${{ matrix.platform }}
 
@@ -170,7 +170,7 @@ jobs:
   sqlserver:
     strategy:
       matrix:
-        go: ['1.23', '1.24']
+        go: ['1.24', '1.25']
         platform: [ubuntu-latest] # can not run test in macOS and windows
     runs-on: ${{ matrix.platform }}
 
@@ -212,7 +212,7 @@ jobs:
     strategy:
       matrix:
         dbversion: [ 'v6.5.0' ]
-        go: ['1.23', '1.24']
+        go: ['1.24', '1.25']
         platform: [ ubuntu-latest ]
     runs-on: ${{ matrix.platform }}
 
@@ -245,7 +245,7 @@ jobs:
     strategy:
       matrix:
         dbversion: ['opengauss/opengauss:7.0.0-RC1.B023']
-        go: ['1.23', '1.24']
+        go: ['1.24', '1.25']
         platform: [ubuntu-latest] # can not run in macOS and Windows
     runs-on: ${{ matrix.platform }}
 
@@ -307,4 +307,4 @@ jobs:
           key: ${{ runner.os }}-go-${{ matrix.go }}-${{ hashFiles('tests/go.mod') }}
 
       - name: Tests
-        run: GITHUB_ACTION=true GORM_DIALECT=gaussdb GORM_DSN="user=gaussdb password=Gaussdb@123 dbname=gorm host=localhost port=9950 sslmode=disable TimeZone=Asia/Shanghai" ./tests/tests_all.sh
+        run: GITHUB_ACTION=true GORM_DIALECT=gaussdb GORM_DSN="user=gaussdb password=Gaussdb@123 dbname=gorm host=localhost port=9950 sslmode=disable TimeZone=Asia/Shanghai" ./tests/tests_all.sh

generics.go

@@ -35,10 +35,33 @@ type Interface[T any] interface {
 }
 
 type CreateInterface[T any] interface {
-	ChainInterface[T]
+	ExecInterface[T]
+	// chain methods available at start; return ChainInterface
+	Scopes(scopes ...func(db *Statement)) ChainInterface[T]
+	Where(query interface{}, args ...interface{}) ChainInterface[T]
+	Not(query interface{}, args ...interface{}) ChainInterface[T]
+	Or(query interface{}, args ...interface{}) ChainInterface[T]
+	Limit(offset int) ChainInterface[T]
+	Offset(offset int) ChainInterface[T]
+	Joins(query clause.JoinTarget, on func(db JoinBuilder, joinTable clause.Table, curTable clause.Table) error) ChainInterface[T]
+	Preload(association string, query func(db PreloadBuilder) error) ChainInterface[T]
+	Select(query string, args ...interface{}) ChainInterface[T]
+	Omit(columns ...string) ChainInterface[T]
+	MapColumns(m map[string]string) ChainInterface[T]
+	Distinct(args ...interface{}) ChainInterface[T]
+	Group(name string) ChainInterface[T]
+	Having(query interface{}, args ...interface{}) ChainInterface[T]
+	Order(value interface{}) ChainInterface[T]
+	Build(builder clause.Builder)
+
+	Delete(ctx context.Context) (rowsAffected int, err error)
+	Update(ctx context.Context, name string, value any) (rowsAffected int, err error)
+	Updates(ctx context.Context, t T) (rowsAffected int, err error)
+
 	Table(name string, args ...interface{}) CreateInterface[T]
 	Create(ctx context.Context, r *T) error
 	CreateInBatches(ctx context.Context, r *[]T, batchSize int) error
+	Set(assignments ...clause.Assignment) SetCreateOrUpdateInterface[T]
 }
 
 type ChainInterface[T any] interface {
@@ -58,15 +81,28 @@ type ChainInterface[T any] interface {
 	Group(name string) ChainInterface[T]
 	Having(query interface{}, args ...interface{}) ChainInterface[T]
 	Order(value interface{}) ChainInterface[T]
+	Set(assignments ...clause.Assignment) SetUpdateOnlyInterface[T]
 
 	Build(builder clause.Builder)
 
+	Table(name string, args ...interface{}) ChainInterface[T]
 	Delete(ctx context.Context) (rowsAffected int, err error)
 	Update(ctx context.Context, name string, value any) (rowsAffected int, err error)
 	Updates(ctx context.Context, t T) (rowsAffected int, err error)
 	Count(ctx context.Context, column string) (result int64, err error)
 }
 
+// SetUpdateOnlyInterface is returned by Set after chaining; only Update is allowed
+type SetUpdateOnlyInterface[T any] interface {
+	Update(ctx context.Context) (rowsAffected int, err error)
+}
+
+// SetCreateOrUpdateInterface is returned by Set at start; Create or Update are allowed
+type SetCreateOrUpdateInterface[T any] interface {
+	Create(ctx context.Context) error
+	Update(ctx context.Context) (rowsAffected int, err error)
+}
+
 type ExecInterface[T any] interface {
 	Scan(ctx context.Context, r interface{}) error
 	First(context.Context) (T, error)
@@ -163,6 +199,12 @@ func (c createG[T]) Table(name string, args ...interface{}) CreateInterface[T] {
 	})}
 }
 
+func (c createG[T]) Set(assignments ...clause.Assignment) SetCreateOrUpdateInterface[T] {
+	assigns := make([]clause.Assignment, len(assignments))
+	copy(assigns, assignments)
+	return setCreateOrUpdateG[T]{c: c.chainG, assigns: assigns}
+}
+
 func (c createG[T]) Create(ctx context.Context, r *T) error {
 	return c.g.apply(ctx).Create(r).Error
 }
@@ -189,6 +231,12 @@ func (c chainG[T]) with(v op) chainG[T] {
 	}
 }
 
+func (c chainG[T]) Table(name string, args ...interface{}) ChainInterface[T] {
+	return c.with(func(db *DB) *DB {
+		return db.Table(name, args...)
+	})
+}
+
 func (c chainG[T]) Scopes(scopes ...func(db *Statement)) ChainInterface[T] {
 	return c.with(func(db *DB) *DB {
 		for _, fc := range scopes {
@@ -198,12 +246,6 @@ func (c chainG[T]) Scopes(scopes ...func(db *Statement)) ChainInterface[T] {
 	})
 }
 
-func (c chainG[T]) Table(name string, args ...interface{}) ChainInterface[T] {
-	return c.with(func(db *DB) *DB {
-		return db.Table(name, args...)
-	})
-}
-
 func (c chainG[T]) Where(query interface{}, args ...interface{}) ChainInterface[T] {
 	return c.with(func(db *DB) *DB {
 		return db.Where(query, args...)
@@ -390,6 +432,12 @@ func (c chainG[T]) MapColumns(m map[string]string) ChainInterface[T] {
 	})
 }
 
+func (c chainG[T]) Set(assignments ...clause.Assignment) SetUpdateOnlyInterface[T] {
+	assigns := make([]clause.Assignment, len(assignments))
+	copy(assigns, assignments)
+	return setCreateOrUpdateG[T]{c: c, assigns: assigns}
+}
+
 func (c chainG[T]) Distinct(args ...interface{}) ChainInterface[T] {
 	return c.with(func(db *DB) *DB {
 		return db.Distinct(args...)
@@ -557,6 +605,26 @@ func (c chainG[T]) Build(builder clause.Builder) {
 	}
 }
 
+type setCreateOrUpdateG[T any] struct {
+	c       chainG[T]
+	assigns []clause.Assignment
+}
+
+func (s setCreateOrUpdateG[T]) Update(ctx context.Context) (rowsAffected int, err error) {
+	var r T
+	res := s.c.g.apply(ctx).Model(r).Clauses(clause.Set(s.assigns)).Updates(map[string]interface{}{})
+	return int(res.RowsAffected), res.Error
+}
+
+func (s setCreateOrUpdateG[T]) Create(ctx context.Context) error {
+	var r T
+	data := make(map[string]interface{}, len(s.assigns))
+	for _, a := range s.assigns {
+		data[a.Column.Name] = a.Value
+	}
+	return s.c.g.apply(ctx).Model(r).Create(data).Error
+}
+
 type execG[T any] struct {
 	g *g[T]
 }

tests/connection_test.go

@@ -1,7 +1,6 @@
 package tests_test
 
 import (
-	"fmt"
 	"testing"
 
 	"gorm.io/driver/mysql"
@@ -28,7 +27,7 @@ func TestWithSingleConnection(t *testing.T) {
 		return nil
 	})
 	if err != nil {
-		t.Errorf(fmt.Sprintf("WithSingleConnection should work, but got err %v", err))
+		t.Errorf("WithSingleConnection should work, but got err %v", err)
 	}
 
 	if actualName != expectedName {

tests/count_test.go

@@ -1,7 +1,6 @@
 package tests_test
 
 import (
-	"fmt"
 	"regexp"
 	"sort"
 	"strings"
@@ -22,15 +21,15 @@ func TestCountWithGroup(t *testing.T) {
 
 	var count1 int64
 	if err := DB.Model(&Company{}).Where("name = ?", "company_count_group_a").Group("name").Count(&count1).Error; err != nil {
-		t.Errorf(fmt.Sprintf("Count should work, but got err %v", err))
+		t.Errorf("Count should work, but got err %v", err)
 	}
 	if count1 != 1 {
 		t.Errorf("Count with group should be 1, but got count: %v", count1)
 	}
 
 	var count2 int64
 	if err := DB.Model(&Company{}).Where("name in ?", []string{"company_count_group_b", "company_count_group_c"}).Group("name").Count(&count2).Error; err != nil {
-		t.Errorf(fmt.Sprintf("Count should work, but got err %v", err))
+		t.Errorf("Count should work, but got err %v", err)
 	}
 	if count2 != 2 {
 		t.Errorf("Count with group should be 2, but got count: %v", count2)
@@ -49,15 +48,15 @@ func TestCount(t *testing.T) {
 	DB.Save(&user1).Save(&user2).Save(&user3)
 
 	if err := DB.Where("name = ?", user1.Name).Or("name = ?", user3.Name).Find(&users).Count(&count).Error; err != nil {
-		t.Errorf(fmt.Sprintf("Count should work, but got err %v", err))
+		t.Errorf("Count should work, but got err %v", err)
 	}
 
 	if count != int64(len(users)) {
 		t.Errorf("Count() method should get correct value, expect: %v, got %v", count, len(users))
 	}
 
 	if err := DB.Model(&User{}).Where("name = ?", user1.Name).Or("name = ?", user3.Name).Count(&count).Find(&users).Error; err != nil {
-		t.Errorf(fmt.Sprintf("Count should work, but got err %v", err))
+		t.Errorf("Count should work, but got err %v", err)
 	}
 
 	if count != int64(len(users)) {
@@ -110,7 +109,7 @@ func TestCount(t *testing.T) {
 	if err := DB.Model(&User{}).Where("name in ?", []string{user1.Name, user2.Name, user3.Name}).Select(
 		"(CASE WHEN name=? THEN ? ELSE ? END) as name", "count-1", "main", "other",
 	).Count(&count6).Find(&users).Error; err != nil || count6 != 3 {
-		t.Fatalf(fmt.Sprintf("Count should work, but got err %v", err))
+		t.Fatalf("Count should work, but got err %v", err)
 	}
 
 	expects := []User{{Name: "main"}, {Name: "other"}, {Name: "other"}}
@@ -124,7 +123,7 @@ func TestCount(t *testing.T) {
 	if err := DB.Model(&User{}).Where("name in ?", []string{user1.Name, user2.Name, user3.Name}).Select(
 		"(CASE WHEN name=? THEN ? ELSE ? END) as name, age", "count-1", "main", "other",
 	).Count(&count7).Find(&users).Error; err != nil || count7 != 3 {
-		t.Fatalf(fmt.Sprintf("Count should work, but got err %v", err))
+		t.Fatalf("Count should work, but got err %v", err)
 	}
 
 	expects = []User{{Name: "main", Age: 18}, {Name: "other", Age: 18}, {Name: "other", Age: 18}}

tests/generics_test.go

@@ -667,6 +667,64 @@ func TestGenericsDistinct(t *testing.T) {
 	}
 }
 
+func TestGenericsSetCreate(t *testing.T) {
+    ctx := context.Background()
+
+    name := "GenericsSetCreate"
+    age := uint(21)
+
+    err := gorm.G[User](DB).Set(
+        clause.Assignment{Column: clause.Column{Name: "name"}, Value: name},
+        clause.Assignment{Column: clause.Column{Name: "age"}, Value: age},
+    ).Create(ctx)
+    if err != nil {
+        t.Fatalf("Set Create failed: %v", err)
+    }
+
+    u, err := gorm.G[User](DB).Where("name = ?", name).First(ctx)
+    if err != nil {
+        t.Fatalf("failed to find created user: %v", err)
+    }
+    if u.ID == 0 || u.Name != name || u.Age != age {
+        t.Fatalf("created user mismatch, got %+v", u)
+    }
+}
+
+func TestGenericsSetUpdate(t *testing.T) {
+    ctx := context.Background()
+
+    // prepare
+    u := User{Name: "GenericsSetUpdate_Before", Age: 30}
+    if err := gorm.G[User](DB).Create(ctx, &u); err != nil {
+        t.Fatalf("prepare user failed: %v", err)
+    }
+
+    // update with Set after chain
+    newName := "GenericsSetUpdate_After"
+    newAge := uint(31)
+    rows, err := gorm.G[User](DB).
+        Where("id = ?", u.ID).
+        Set(
+            clause.Assignment{Column: clause.Column{Name: "name"}, Value: newName},
+            clause.Assignment{Column: clause.Column{Name: "age"}, Value: newAge},
+        ).
+        Update(ctx)
+    if err != nil {
+        t.Fatalf("Set Update failed: %v", err)
+    }
+    if rows != 1 {
+        t.Fatalf("expected 1 row affected, got %d", rows)
+    }
+
+    nu, err := gorm.G[User](DB).Where("id = ?", u.ID).First(ctx)
+    if err != nil {
+        t.Fatalf("failed to query updated user: %v", err)
+    }
+    if nu.Name != newName || nu.Age != newAge {
+        t.Fatalf("updated user mismatch, got %+v", nu)
+    }
+}
+
 func TestGenericsGroupHaving(t *testing.T) {
 	ctx := context.Background()
 

tests/go.mod

@@ -1,6 +1,6 @@
 module gorm.io/gorm/tests
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/google/uuid v1.6.0
@@ -12,7 +12,7 @@ require (
 	gorm.io/driver/postgres v1.6.0
 	gorm.io/driver/sqlite v1.6.0
 	gorm.io/driver/sqlserver v1.6.1
-	gorm.io/gorm v1.30.2
+	gorm.io/gorm v1.30.3
 )
 
 require (
@@ -32,8 +32,8 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	golang.org/x/crypto v0.41.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )