Skip to content

Commit 8faa8c8

Browse files
committed
Add quoted identifiers to fix tests.
1 parent 7c73c9a commit 8faa8c8

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

tests/passed-tests.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,15 @@ TestNilPointerSlice
212212
TestNilPointerSlice2
213213
TestPrefixedPreloadDuplication
214214
TestPreloadManyToManyCallbacks
215-
#TestPreloadWithAssociations
216-
#TestNestedPreload
215+
TestPreloadWithAssociations
216+
TestNestedPreload
217217
TestNestedPreloadForSlice
218218
#TestPreloadWithConds
219-
#TestNestedPreloadWithConds
219+
TestNestedPreloadWithConds
220220
TestPreloadEmptyData
221221
TestPreloadGoroutine
222-
#TestPreloadWithDiffModel
223-
#TestNestedPreloadWithUnscoped
222+
TestPreloadWithDiffModel
223+
TestNestedPreloadWithUnscoped
224224
TestNestedPreloadWithNestedJoin
225225
#TestMergeNestedPreloadWithNestedJoin
226226
TestNestedPreloadWithPointerJoin
@@ -370,7 +370,7 @@ TestDistinctWithVaryingCase
370370
#TestDistinctWithAggregation
371371
TestUpsertWithSave
372372
TestFindOrInitialize
373-
#TestFindOrCreate
373+
TestFindOrCreate
374374
TestUpdateWithMissWhere
375375
BenchmarkCreate
376376
BenchmarkFind

tests/preload_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func TestPreloadWithAssociations(t *testing.T) {
7575
CheckUser(t, user, user)
7676

7777
var user2 User
78-
DB.Preload(clause.Associations).Find(&user2, "id = ?", user.ID)
78+
DB.Preload(clause.Associations).Find(&user2, "\"id\" = ?", user.ID)
7979
CheckUser(t, user2, user)
8080

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

92-
DB.Preload(clause.Associations).Find(&user3, "id = ?", user.ID)
92+
DB.Preload(clause.Associations).Find(&user3, "\"id\" = ?", user.ID)
9393
CheckUser(t, user3, user)
9494
}
9595

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

107107
var user2 User
108-
DB.Preload("Pets.Toy").Find(&user2, "id = ?", user.ID)
108+
DB.Preload("Pets.Toy").Find(&user2, "\"id\" = ?", user.ID)
109109
CheckUser(t, user2, user)
110110

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

115115
var user4 *User
116-
DB.Preload("Pets.Toy").Find(&user4, "id = ?", user.ID)
116+
DB.Preload("Pets.Toy").Find(&user4, "\"id\" = ?", user.ID)
117117
CheckUser(t, *user4, user)
118118
}
119119

@@ -164,7 +164,7 @@ func TestPreloadWithConds(t *testing.T) {
164164
}
165165

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

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

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

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

313313
CheckUser(t, user, result.User)
314314
}
@@ -324,29 +324,29 @@ func TestNestedPreloadWithUnscoped(t *testing.T) {
324324
}
325325

326326
var user2 User
327-
DB.Preload("Pets.Toy").Find(&user2, "id = ?", user.ID)
327+
DB.Preload("Pets.Toy").Find(&user2, "\"id\" = ?", user.ID)
328328
CheckUser(t, user2, user)
329329

330330
DB.Delete(&pet)
331331

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

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

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

348348
var user6 *User
349-
DB.Unscoped().Preload("Pets.Toy").Find(&user6, "id = ?", user.ID)
349+
DB.Unscoped().Preload("Pets.Toy").Find(&user6, "\"id\" = ?", user.ID)
350350
CheckUserUnscoped(t, *user6, user)
351351
}
352352

tests/upsert_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,11 @@ func TestFindOrCreate(t *testing.T) {
342342
}
343343

344344
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)
345-
if err := DB.Where("name = ?", "first_or_create_pet1").First(&Pet{}).Error; err != nil {
345+
if err := DB.Where("\"name\" = ?", "first_or_create_pet1").First(&Pet{}).Error; err != nil {
346346
t.Errorf("has many association should be saved")
347347
}
348348

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

0 commit comments

Comments
 (0)