Merge pull request #30 from oracle-samples/tinglwan-fix-miscellaneous-tests

Fix miscellaneous tests

Author: ting-lan-wang

.github/workflows/run-tests.yaml

@@ -47,4 +47,4 @@ jobs:
         cd tests
         go get -t github.com/oracle-samples/gorm-oracle/tests
         go get .
-        go test -failfast
+        go test -failfast

tests/create_test.go

@@ -181,7 +181,6 @@ func TestCreateFromMap(t *testing.T) {
 }
 
 func TestCreateWithAssociations(t *testing.T) {
-	t.Skip()
 	user := *GetUser("create_with_associations", Config{
 		Account:   true,
 		Pets:      2,
@@ -200,7 +199,7 @@ func TestCreateWithAssociations(t *testing.T) {
 	CheckUser(t, user, user)
 
 	var user2 User
-	DB.Preload("Account").Preload("Pets").Preload("Toys").Preload("Company").Preload("Manager").Preload("Team").Preload("Languages").Preload("Friends").Find(&user2, "id = ?", user.ID)
+	DB.Preload("Account").Preload("Pets").Preload("Toys").Preload("Company").Preload("Manager").Preload("Team").Preload("Languages").Preload("Friends").Find(&user2, "\"id\" = ?", user.ID)
 	CheckUser(t, user2, user)
 }
 
@@ -265,7 +264,6 @@ func TestBulkCreatePtrDataWithAssociations(t *testing.T) {
 }
 
 func TestPolymorphicHasOne(t *testing.T) {
-	t.Skip()
 	t.Run("Struct", func(t *testing.T) {
 		pet := Pet{
 			Name: "PolymorphicHasOne",
@@ -279,7 +277,7 @@ func TestPolymorphicHasOne(t *testing.T) {
 		CheckPet(t, pet, pet)
 
 		var pet2 Pet
-		DB.Preload("Toy").Find(&pet2, "id = ?", pet.ID)
+		DB.Preload("Toy").Find(&pet2, "\"id\" = ?", pet.ID)
 		CheckPet(t, pet2, pet)
 	})
 

tests/hooks_test.go

@@ -274,12 +274,14 @@ func (s Product2) BeforeCreate(tx *gorm.DB) (err error) {
 }
 
 func (s *Product2) BeforeUpdate(tx *gorm.DB) (err error) {
-	tx.Statement.Where("\"owner\" != ?", "admin")
+	// In Oracle DB, when owner is NULL, the condition "owner" != 'admin' will
+	// always returns false.
+	// Hence, we use NVL("owner", 'none') to substitute 'none' when owner is NULL.
+	tx.Statement.Where("NVL(\"owner\", 'none') != ?", "admin")
 	return
 }
 
 func TestUseDBInHooks(t *testing.T) {
-	t.Skip()
 	DB.Migrator().DropTable(&Product2{})
 	DB.AutoMigrate(&Product2{})
 
@@ -296,12 +298,12 @@ func TestUseDBInHooks(t *testing.T) {
 	}
 
 	var result Product2
-	if err := DB.First(&result, "name = ?", "Nice").Error; err != nil {
+	if err := DB.First(&result, "\"name\" = ?", "Nice").Error; err != nil {
 		t.Fatalf("Failed to query product, got error: %v", err)
 	}
 
 	var resultClone Product2
-	if err := DB.First(&resultClone, "name = ?", "Nice_clone").Error; err != nil {
+	if err := DB.First(&resultClone, "\"name\" = ?", "Nice_clone").Error; err != nil {
 		t.Fatalf("Failed to find cloned product, got error: %v", err)
 	}
 
@@ -311,7 +313,7 @@ func TestUseDBInHooks(t *testing.T) {
 
 	DB.Model(&result).Update("Price", 500)
 	var result2 Product2
-	DB.First(&result2, "name = ?", "Nice")
+	DB.First(&result2, "\"name\" = ?", "Nice")
 
 	if result2.Price != 500 {
 		t.Errorf("Failed to update product's price, expects: %v, got %v", 500, result2.Price)
@@ -323,13 +325,13 @@ func TestUseDBInHooks(t *testing.T) {
 	}
 
 	var result3 Product2
-	if err := DB.First(&result3, "name = ?", "Nice2").Error; err != nil {
+	if err := DB.First(&result3, "\"name\" = ?", "Nice2").Error; err != nil {
 		t.Fatalf("Failed to query product, got error: %v", err)
 	}
 
 	DB.Model(&result3).Update("Price", 800)
 	var result4 Product2
-	DB.First(&result4, "name = ?", "Nice2")
+	DB.First(&result4, "\"name\" = ?", "Nice2")
 
 	if result4.Price != 600 {
 		t.Errorf("Admin product's price should not be changed, expects: %v, got %v", 600, result4.Price)

tests/main_test.go

@@ -39,10 +39,9 @@
 package tests
 
 import (
-	"fmt"
+	"strings"
 	"testing"
 	"time"
-	"strings"
 
 	. "github.com/oracle-samples/gorm-oracle/tests/utils"
 )
@@ -54,9 +53,6 @@ func TestExceptionsWithInvalidSql(t *testing.T) {
 		t.Errorf("Should got error with invalid SQL")
 	}
 
-	tx := DB.Model(&User{}).Where("name = ?", "sd;;;aa").Pluck("name", &columns)
-	fmt.Println(tx.Error)
-
 	if DB.Model(&User{}).Where("sdsd.zaaa = ?", "sd;;;aa").Pluck("aaa", &columns).Error == nil {
 		t.Errorf("Should got error with invalid SQL")
 	}
@@ -65,13 +61,20 @@ func TestExceptionsWithInvalidSql(t *testing.T) {
 		t.Errorf("Should got error with invalid SQL")
 	}
 
+	// Create a user
+	user := *GetUser("user-for-test-exceptions-with-invalid-sql", Config{})
+
+	if results := DB.Create(&user); results.Error != nil {
+		t.Errorf("errors happened when create: %v", results.Error)
+	}
+
 	var count1, count2 int64
 	DB.Model(&User{}).Count(&count1)
 	if count1 <= 0 {
 		t.Errorf("Should find some users")
 	}
 
-	if DB.Where("name = ?", "jinzhu; delete * from users").First(&User{}).Error == nil {
+	if DB.Where("\"name\" = ?", "jinzhu; delete * from users").First(&User{}).Error == nil {
 		t.Errorf("Should got error with invalid SQL")
 	}
 

tests/scan_test.go

@@ -303,7 +303,13 @@ func TestScanRowsNullValuesScanToFieldDefault(t *testing.T) {
 }
 
 func TestScanToEmbedded(t *testing.T) {
-	t.Skip()
+	// TODO: Fix the issue that PersonAddress is skipped when dropping the tables together with Person and Address
+	DB.Migrator().DropTable(&PersonAddress{})
+	DB.Migrator().DropTable(&Person{}, &Address{}, &PersonAddress{})
+	if err := DB.AutoMigrate(&Person{}, &Address{}, &PersonAddress{}); err != nil {
+		t.Fatalf("Failed to migrate, got %v", err)
+	}
+
 	person1 := Person{Name: "person 1"}
 	person2 := Person{Name: "person 2"}
 	DB.Save(&person1).Save(&person2)

tests/update_test.go

@@ -1029,7 +1029,6 @@ func TestBatchUpdateSlice(t *testing.T) {
 	}
 }
 func TestMixedSaveBatch(t *testing.T) {
-	t.Skip()
 	users := []*User{
 		GetUser("existing1", Config{}),
 		GetUser("existing2", Config{}),