fix TestGenericsPreloads in tests/generics_test

Author: norah-li

tests/generics_test.go

@@ -67,25 +67,25 @@ func TestGenericsCreate(t *testing.T) {
 		t.Fatalf("no primary key found for %v", user)
 	}
 
-	if u, err := gorm.G[User](DB).Where(`"name" = ?`, user.Name).First(ctx); err != nil {
+	if u, err := gorm.G[User](DB).Where("\"name\" = ?", user.Name).First(ctx); err != nil {
 		t.Fatalf("failed to find user, got error: %v", err)
 	} else if u.Name != user.Name || u.ID != user.ID {
 		t.Errorf("found invalid user, got %v, expect %v", u, user)
 	}
 
-	if u, err := gorm.G[User](DB).Where(`"name" = ?`, user.Name).Take(ctx); err != nil {
+	if u, err := gorm.G[User](DB).Where("\"name\" = ?", user.Name).Take(ctx); err != nil {
 		t.Fatalf("failed to find user, got error: %v", err)
 	} else if u.Name != user.Name || u.ID != user.ID {
 		t.Errorf("found invalid user, got %v, expect %v", u, user)
 	}
 
-	if u, err := gorm.G[User](DB).Select("name").Where(`"name" = ?`, user.Name).First(ctx); err != nil {
+	if u, err := gorm.G[User](DB).Select("name").Where("\"name\" = ?", user.Name).First(ctx); err != nil {
 		t.Fatalf("failed to find user, got error: %v", err)
 	} else if u.Name != user.Name || u.Age != 0 {
 		t.Errorf("found invalid user, got %v, expect %v", u, user)
 	}
 
-	if u, err := gorm.G[User](DB).Omit("name").Where(`"name" = ?`, user.Name).First(ctx); err != nil {
+	if u, err := gorm.G[User](DB).Omit("name").Where("\"name\" = ?", user.Name).First(ctx); err != nil {
 		t.Fatalf("failed to find user, got error: %v", err)
 	} else if u.Name != "" || u.Age != user.Age {
 		t.Errorf("found invalid user, got %v, expect %v", u, user)
@@ -95,13 +95,13 @@ func TestGenericsCreate(t *testing.T) {
 		ID   int
 		Name string
 	}{}
-	if err := gorm.G[User](DB).Where(`"name" = ?`, user.Name).Scan(ctx, &result); err != nil {
+	if err := gorm.G[User](DB).Where("\"name\" = ?", user.Name).Scan(ctx, &result); err != nil {
 		t.Fatalf("failed to scan user, got error: %v", err)
 	} else if result.Name != user.Name || uint(result.ID) != user.ID {
 		t.Errorf("found invalid user, got %v, expect %v", result, user)
 	}
 
-	mapResult, err := gorm.G[map[string]interface{}](DB).Table("users").Where(`"name" = ?`, user.Name).MapColumns(map[string]string{"name": "user_name"}).Take(ctx)
+	mapResult, err := gorm.G[map[string]interface{}](DB).Table("users").Where("\"name\" = ?", user.Name).MapColumns(map[string]string{"name": "user_name"}).Take(ctx)
 	if v := mapResult["user_name"]; fmt.Sprint(v) != user.Name {
 		t.Errorf("failed to find map results, got %v, err %v", mapResult, err)
 	}
@@ -497,7 +497,6 @@ func TestGenericsNestedJoins(t *testing.T) {
 }
 
 func TestGenericsPreloads(t *testing.T) {
-	t.Skip()
 	ctx := context.Background()
 	db := gorm.G[User](DB)
 
@@ -508,7 +507,7 @@ func TestGenericsPreloads(t *testing.T) {
 
 	db.CreateInBatches(ctx, &[]User{u3, u, u2}, 10)
 
-	result, err := db.Preload("Company", nil).Preload("Pets", nil).Where("name = ?", u.Name).First(ctx)
+	result, err := db.Preload("Company", nil).Preload("Pets", nil).Where("\"name\" = ?", u.Name).First(ctx)
 	if err != nil {
 		t.Fatalf("Preload failed: %v", err)
 	}
@@ -518,9 +517,9 @@ func TestGenericsPreloads(t *testing.T) {
 	}
 
 	results, err := db.Preload("Company", func(db gorm.PreloadBuilder) error {
-		db.Where("name = ?", u.Company.Name)
+		db.Where("\"name\" = ?", u.Company.Name)
 		return nil
-	}).Where("name in ?", names).Find(ctx)
+	}).Where("\"name\" in ?", names).Find(ctx)
 	if err != nil {
 		t.Fatalf("Preload failed: %v", err)
 	}
@@ -536,15 +535,23 @@ func TestGenericsPreloads(t *testing.T) {
 
 	_, err = db.Preload("Company", func(db gorm.PreloadBuilder) error {
 		return errors.New("preload error")
-	}).Where("name in ?", names).Find(ctx)
+	}).Where("\"name\" in ?", names).Find(ctx)
 	if err == nil {
 		t.Fatalf("Preload should failed, but got nil")
 	}
 
 	results, err = db.Preload("Pets", func(db gorm.PreloadBuilder) error {
+		db.Select(
+			"pets.id",
+			"pets.created_at",
+			"pets.updated_at",
+			"pets.deleted_at",
+			"pets.user_id",
+			"pets.name",
+		)
 		db.LimitPerRecord(5)
 		return nil
-	}).Where("name in ?", names).Find(ctx)
+	}).Where("\"name\" in ?", names).Find(ctx)
 
 	for _, result := range results {
 		if result.Name == u.Name {
@@ -557,9 +564,17 @@ func TestGenericsPreloads(t *testing.T) {
 	}
 
 	results, err = db.Preload("Pets", func(db gorm.PreloadBuilder) error {
-		db.Order("name desc").LimitPerRecord(5)
+		db.Select(
+			"pets.id",
+			"pets.created_at",
+			"pets.updated_at",
+			"pets.deleted_at",
+			"pets.user_id",
+			"pets.name",
+		)
+		db.Order("\"name\" desc").LimitPerRecord(5)
 		return nil
-	}).Where("name in ?", names).Find(ctx)
+	}).Where("\"name\" in ?", names).Find(ctx)
 
 	for _, result := range results {
 		if result.Name == u.Name {
@@ -577,12 +592,20 @@ func TestGenericsPreloads(t *testing.T) {
 	}
 
 	results, err = db.Preload("Pets", func(db gorm.PreloadBuilder) error {
-		db.Order("name").LimitPerRecord(5)
+		db.Select(
+			"pets.id",
+			"pets.created_at",
+			"pets.updated_at",
+			"pets.deleted_at",
+			"pets.user_id",
+			"pets.name",
+		)
+		db.Order("\"name\"").LimitPerRecord(5)
 		return nil
 	}).Preload("Friends", func(db gorm.PreloadBuilder) error {
-		db.Order("name")
+		db.Order("\"name\"")
 		return nil
-	}).Where("name in ?", names).Find(ctx)
+	}).Where("\"name\" in ?", names).Find(ctx)
 
 	for _, result := range results {
 		if result.Name == u.Name {

tests/passed-tests.txt

@@ -104,7 +104,7 @@ TestEmbeddedTagSetting
 TestDialectorWithErrorTranslatorSupport
 TestSupportedDialectorWithErrDuplicatedKey
 TestSupportedDialectorWithErrForeignKeyViolated
-#TestGenericsCreate
+TestGenericsCreate
 TestGenericsCreateInBatches
 #TestGenericsExecAndUpdate
 TestGenericsRow
@@ -113,7 +113,7 @@ TestGenericsFindInBatches
 TestGenericsScopes
 #TestGenericsJoins
 TestGenericsNestedJoins
-#TestGenericsPreloads
+TestGenericsPreloads
 #TestGenericsNestedPreloads
 TestGenericsDistinct
 TestGenericsGroupHaving