Merge pull request #13 from oracle-samples/tests_fix

Add quoted identifiers to fix tests.

Author: BidyadharM

tests/passed-tests.txt

@@ -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
@@ -370,7 +370,7 @@ TestDistinctWithVaryingCase
 #TestDistinctWithAggregation
 TestUpsertWithSave
 TestFindOrInitialize
-#TestFindOrCreate
+TestFindOrCreate
 TestUpdateWithMissWhere
 BenchmarkCreate
 BenchmarkFind

tests/preload_test.go

@@ -76,7 +76,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{
@@ -90,7 +90,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)
 }
 
@@ -107,15 +107,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)
 }
 
@@ -167,7 +167,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
 	})
@@ -232,7 +232,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 {
@@ -312,8 +312,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)
 }
@@ -330,29 +330,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)
 }
 

tests/upsert_test.go

@@ -344,11 +344,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")
 	}
 }