Skip to content

Add quoted identifiers to fix tests. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 17, 2025
Merged

Add quoted identifiers to fix tests. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/passed-tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,15 +212,15 @@ TestNilPointerSlice
TestNilPointerSlice2
TestPrefixedPreloadDuplication
TestPreloadManyToManyCallbacks
#TestPreloadWithAssociations
#TestNestedPreload
TestPreloadWithAssociations
TestNestedPreload
TestNestedPreloadForSlice
#TestPreloadWithConds
#TestNestedPreloadWithConds
TestNestedPreloadWithConds
TestPreloadEmptyData
TestPreloadGoroutine
#TestPreloadWithDiffModel
#TestNestedPreloadWithUnscoped
TestPreloadWithDiffModel
TestNestedPreloadWithUnscoped
TestNestedPreloadWithNestedJoin
#TestMergeNestedPreloadWithNestedJoin
TestNestedPreloadWithPointerJoin
Expand Down Expand Up @@ -370,7 +370,7 @@ TestDistinctWithVaryingCase
#TestDistinctWithAggregation
TestUpsertWithSave
TestFindOrInitialize
#TestFindOrCreate
TestFindOrCreate
TestUpdateWithMissWhere
BenchmarkCreate
BenchmarkFind
Expand Down
28 changes: 14 additions & 14 deletions tests/preload_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func TestPreloadWithAssociations(t *testing.T) {
CheckUser(t, user, user)

var user2 User
DB.Preload(clause.Associations).Find(&user2, "id = ?", user.ID)
DB.Preload(clause.Associations).Find(&user2, "\"id\" = ?", user.ID)
CheckUser(t, user2, user)

user3 := *GetUser("preload_with_associations_new", Config{
Expand All @@ -89,7 +89,7 @@ func TestPreloadWithAssociations(t *testing.T) {
Friends: 1,
})

DB.Preload(clause.Associations).Find(&user3, "id = ?", user.ID)
DB.Preload(clause.Associations).Find(&user3, "\"id\" = ?", user.ID)
CheckUser(t, user3, user)
}

Expand All @@ -105,15 +105,15 @@ func TestNestedPreload(t *testing.T) {
}

var user2 User
DB.Preload("Pets.Toy").Find(&user2, "id = ?", user.ID)
DB.Preload("Pets.Toy").Find(&user2, "\"id\" = ?", user.ID)
CheckUser(t, user2, user)

var user3 User
DB.Preload(clause.Associations+"."+clause.Associations).Find(&user3, "id = ?", user.ID)
DB.Preload(clause.Associations+"."+clause.Associations).Find(&user3, "\"id\" = ?", user.ID)
CheckUser(t, user3, user)

var user4 *User
DB.Preload("Pets.Toy").Find(&user4, "id = ?", user.ID)
DB.Preload("Pets.Toy").Find(&user4, "\"id\" = ?", user.ID)
CheckUser(t, *user4, user)
}

Expand Down Expand Up @@ -164,7 +164,7 @@ func TestPreloadWithConds(t *testing.T) {
}

var users2 []User
DB.Preload("Account", clause.Eq{Column: "number", Value: users[0].Account.AccountNumber}).Find(&users2, "id IN ?", userIDs)
DB.Preload("Account", clause.Eq{Column: "account_number", Value: users[0].Account.AccountNumber}).Find(&users2, "id IN ?", userIDs)
sort.Slice(users2, func(i, j int) bool {
return users2[i].ID < users2[j].ID
})
Expand Down Expand Up @@ -228,7 +228,7 @@ func TestNestedPreloadWithConds(t *testing.T) {
}

var users2 []User
DB.Preload("Pets.Toy", "name like ?", `%preload_3`).Find(&users2, "id IN ?", userIDs)
DB.Preload("Pets.Toy", "\"name\" like ?", `%preload_3`).Find(&users2, "\"id\" IN ?", userIDs)

for idx, user := range users2[0:2] {
for _, pet := range user.Pets {
Expand Down Expand Up @@ -307,8 +307,8 @@ func TestPreloadWithDiffModel(t *testing.T) {
User
}

DB.Model(User{}).Preload("Account", clause.Eq{Column: "number", Value: user.Account.AccountNumber}).Select(
"users.*, 'yo' as something").First(&result, "name = ?", user.Name)
DB.Model(User{}).Preload("Account", clause.Eq{Column: "\"account_number\"", Value: user.Account.AccountNumber}).Select(
"\"users\".*, 'yo' as something").First(&result, "\"name\" = ?", user.Name)

CheckUser(t, user, result.User)
}
Expand All @@ -324,29 +324,29 @@ func TestNestedPreloadWithUnscoped(t *testing.T) {
}

var user2 User
DB.Preload("Pets.Toy").Find(&user2, "id = ?", user.ID)
DB.Preload("Pets.Toy").Find(&user2, "\"id\" = ?", user.ID)
CheckUser(t, user2, user)

DB.Delete(&pet)

var user3 User
DB.Preload(clause.Associations+"."+clause.Associations).Find(&user3, "id = ?", user.ID)
DB.Preload(clause.Associations+"."+clause.Associations).Find(&user3, "\"id\" = ?", user.ID)
if len(user3.Pets) != 0 {
t.Fatalf("User.Pet[0] was deleted and should not exist.")
}

var user4 *User
DB.Preload("Pets.Toy").Find(&user4, "id = ?", user.ID)
DB.Preload("Pets.Toy").Find(&user4, "\"id\" = ?", user.ID)
if len(user4.Pets) != 0 {
t.Fatalf("User.Pet[0] was deleted and should not exist.")
}

var user5 User
DB.Unscoped().Preload(clause.Associations+"."+clause.Associations).Find(&user5, "id = ?", user.ID)
DB.Unscoped().Preload(clause.Associations+"."+clause.Associations).Find(&user5, "\"id\" = ?", user.ID)
CheckUserUnscoped(t, user5, user)

var user6 *User
DB.Unscoped().Preload("Pets.Toy").Find(&user6, "id = ?", user.ID)
DB.Unscoped().Preload("Pets.Toy").Find(&user6, "\"id\" = ?", user.ID)
CheckUserUnscoped(t, *user6, user)
}

Expand Down
4 changes: 2 additions & 2 deletions tests/upsert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,11 @@ func TestFindOrCreate(t *testing.T) {
}

DB.Where(&User{Name: "find or create embedded struct"}).Assign(User{Age: 44, Account: Account{AccountNumber: "1231231231"}, Pets: []*Pet{{Name: "first_or_create_pet1"}, {Name: "first_or_create_pet2"}}}).FirstOrCreate(&user8)
if err := DB.Where("name = ?", "first_or_create_pet1").First(&Pet{}).Error; err != nil {
if err := DB.Where("\"name\" = ?", "first_or_create_pet1").First(&Pet{}).Error; err != nil {
t.Errorf("has many association should be saved")
}

if err := DB.Where("number = ?", "1231231231").First(&Account{}).Error; err != nil {
if err := DB.Where("\"account_number\" = ?", "1231231231").First(&Account{}).Error; err != nil {
t.Errorf("belongs to association should be saved")
}
}
Expand Down