fix(generics): resolve CurrentTable in Raw/Exec

Author: jinzhu

generics.go

@@ -142,13 +142,15 @@ func (c *g[T]) Raw(sql string, values ...interface{}) ExecInterface[T] {
 	return execG[T]{g: &g[T]{
 		db: c.db,
 		ops: append(c.ops, func(db *DB) *DB {
-			return db.Raw(sql, values...)
+			var r T
+			return db.Model(r).Raw(sql, values...)
 		}),
 	}}
 }
 
 func (c *g[T]) Exec(ctx context.Context, sql string, values ...interface{}) error {
-	return c.apply(ctx).Exec(sql, values...).Error
+	var r T
+	return c.apply(ctx).Model(r).Exec(sql, values...).Error
 }
 
 type createG[T any] struct {

statement.go

@@ -96,7 +96,9 @@ func (stmt *Statement) QuoteTo(writer clause.Writer, field interface{}) {
 		if v.Name == clause.CurrentTable {
 			if stmt.TableExpr != nil {
 				stmt.TableExpr.Build(stmt)
-			} else {
+			} else if stmt.Table != "" {
+				write(v.Raw, stmt.Table)
+			} else if stmt.AddError(stmt.Parse(stmt.Model)) == nil {
 				write(v.Raw, stmt.Table)
 			}
 		} else {

tests/generics_test.go

@@ -121,6 +121,11 @@ func TestGenericsExecAndUpdate(t *testing.T) {
 		t.Fatalf("Exec insert failed: %v", err)
 	}
 
+	name2 := "GenericsExec2"
+	if err := gorm.G[User](DB).Exec(ctx, "INSERT INTO ?(name) VALUES(?)", clause.Table{Name: clause.CurrentTable}, name2); err != nil {
+		t.Fatalf("Exec insert failed: %v", err)
+	}
+
 	u, err := gorm.G[User](DB).Table("users as u").Where("u.name = ?", name).First(ctx)
 	if err != nil {
 		t.Fatalf("failed to find user, got error: %v", err)
@@ -162,7 +167,7 @@ func TestGenericsRow(t *testing.T) {
 		t.Fatalf("Create failed: %v", err)
 	}
 
-	row := gorm.G[User](DB).Raw("SELECT name FROM users WHERE id = ?", user.ID).Row(ctx)
+	row := gorm.G[User](DB).Raw("SELECT name FROM ? WHERE id = ?", clause.Table{Name: clause.CurrentTable}, user.ID).Row(ctx)
 	var name string
 	if err := row.Scan(&name); err != nil {
 		t.Fatalf("Row scan failed: %v", err)

tests/go.mod

@@ -6,13 +6,13 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/jinzhu/now v1.1.5
 	github.com/lib/pq v1.10.9
-	github.com/stretchr/testify v1.11.0
+	github.com/stretchr/testify v1.11.1
 	gorm.io/driver/gaussdb v0.1.0
 	gorm.io/driver/mysql v1.6.0
 	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.0
+	gorm.io/gorm v1.30.2
 )
 
 require (