Merge branch 'main' into query_tests_fix

Author: jawad-arb123

tests/joins_test.go

@@ -259,7 +259,7 @@ func TestJoinWithSoftDeleted(t *testing.T) {
 
 	var user1 User
 	DB.Model(&User{}).Joins("NamedPet").Joins("Account").First(&user1, user.ID)
-	if user1.NamedPet == nil || user1.Account.ID == 0 {
+	if user1.NamedPet.ID == 0 || user1.Account.ID == 0 {
 		t.Fatalf("joins NamedPet and Account should not empty:%v", user1)
 	}
 
@@ -268,17 +268,17 @@ func TestJoinWithSoftDeleted(t *testing.T) {
 
 	var user2 User
 	DB.Model(&User{}).Joins("NamedPet").Joins("Account").First(&user2, user.ID)
-	if user2.NamedPet == nil || user2.Account.ID != 0 {
-		t.Fatalf("joins Account should not empty:%v", user2)
+	if user2.NamedPet.ID == 0 || user2.Account.ID != 0 {
+		t.Fatalf("joins Account should be empty:%v", user2)
 	}
 
 	// NamedPet should empty
 	DB.Delete(&user1.NamedPet)
 
 	var user3 User
 	DB.Model(&User{}).Joins("NamedPet").Joins("Account").First(&user3, user.ID)
-	if user3.NamedPet != nil || user2.Account.ID != 0 {
-		t.Fatalf("joins NamedPet and Account should not empty:%v", user2)
+	if user3.NamedPet.ID != 0 || user3.Account.ID != 0 {
+		t.Fatalf("joins NamedPet and Account should be empty:%v", user3)
 	}
 }
 

tests/main_test.go

@@ -41,6 +41,8 @@ package tests
 import (
 	"fmt"
 	"testing"
+	"time"
+	"strings"
 
 	. "github.com/oracle-samples/gorm-oracle/tests/utils"
 )
@@ -90,3 +92,65 @@ func TestSetAndGet(t *testing.T) {
 		t.Errorf("Get non existing key should return error")
 	}
 }
+
+func TestUserInsertScenarios(t *testing.T) {
+	type UserWithAge struct {
+		ID   uint   `gorm:"column:ID;primaryKey"`
+		Name string `gorm:"column:NAME;not null;size:100"`
+		Age  int    `gorm:"column:AGE"`
+	}
+
+	if err := DB.AutoMigrate(&UserWithAge{}); err != nil {
+		t.Fatalf("Failed to migrate table: %v", err)
+	}
+
+	user1 := UserWithAge{Name: "Alice", Age: 30}
+	if err := DB.Create(&user1).Error; err != nil {
+		t.Errorf("Basic insert failed: %v", err)
+	}
+
+	user2 := UserWithAge{Name: "Bob"}
+	if err := DB.Create(&user2).Error; err != nil {
+		t.Errorf("Insert with NULL failed: %v", err)
+	}
+
+	user3 := UserWithAge{Name: "O'Reilly", Age: 45}
+	if err := DB.Create(&user3).Error; err != nil {
+		t.Errorf("Insert with special characters failed: %v", err)
+	}
+
+	type UserWithTime struct {
+		ID        uint      `gorm:"column:ID;primaryKey"`
+		Name      string    `gorm:"column:NAME;not null;size:100"`
+		CreatedAt time.Time `gorm:"column:CREATED_AT"`
+	}
+
+	if err := DB.AutoMigrate(&UserWithTime{}); err != nil {
+		t.Fatalf("Failed to migrate UserWithTime table: %v", err)
+	}
+
+	user4 := UserWithTime{Name: "Charlie"}
+	if err := DB.Create(&user4).Error; err != nil {
+		t.Errorf("Insert with default timestamp failed: %v", err)
+	}
+
+	invalidUser1 := UserWithAge{Age: 50}
+	if err := DB.Create(&invalidUser1).Error; err == nil {
+		t.Errorf("Expected NOT NULL constraint failure, got no error")
+	}
+
+	invalidUser2 := UserWithAge{ID: user1.ID, Name: "Duplicate", Age: 40}
+	if err := DB.Create(&invalidUser2).Error; err == nil {
+		t.Errorf("Expected duplicate primary key error, got no error")
+	}
+
+	invalidUser3 := UserWithAge{Name: "InvalidAge", Age: -10}
+	if err := DB.Create(&invalidUser3).Error; err != nil {
+		t.Logf("Insert with negative age failed as expected: %v", err)
+	}
+
+	invalidUser4 := UserWithAge{Name: strings.Repeat("A", 300), Age: 20}
+	if err := DB.Create(&invalidUser4).Error; err == nil {
+		t.Errorf("Expected value too large error for oversized string, got no error")
+	}
+}

tests/named_argument_test.go

@@ -118,3 +118,142 @@ func TestNamedArg(t *testing.T) {
 		t.Errorf("should return record not found error, but got %v", err)
 	}
 }
+
+func TestNamedArgMultipleSameParamRefs(t *testing.T) {
+	type NamedUser struct {
+		gorm.Model
+		Name1 string
+	}
+	DB.Migrator().DropTable(&NamedUser{})
+	DB.AutoMigrate(&NamedUser{})
+
+	user := NamedUser{Name1: "multi-ref"}
+	DB.Create(&user)
+
+	var result NamedUser
+	if err := DB.Raw(`SELECT * FROM "named_users" WHERE @name = @name AND "name1" = @name`,
+		sql.Named("name", "multi-ref")).Scan(&result).Error; err != nil {
+		t.Errorf("failed with multiple same param refs: %v", err)
+	}
+	tests.AssertEqual(t, result, user)
+}
+
+func TestNamedArgNullValues(t *testing.T) {
+	type NamedUser struct {
+		gorm.Model
+		Name1 *string
+	}
+	DB.Migrator().DropTable(&NamedUser{})
+	DB.AutoMigrate(&NamedUser{})
+
+	DB.Create(&NamedUser{Name1: nil})
+
+	var count int64
+	if err := DB.Raw(`SELECT count(*) FROM "named_users" WHERE (:name IS NULL AND "name1" IS NULL)`,
+		sql.Named("name", nil)).Scan(&count).Error; err != nil {
+		t.Errorf("failed null param test: %v", err)
+	}
+	if count != 1 {
+		t.Errorf("expected 1 null record, got %d", count)
+	}
+}
+
+func TestNamedArgMixedNamedAndMapParams(t *testing.T) {
+	type NamedUser struct {
+		gorm.Model
+		Name1 string
+		Name2 string
+	}
+	DB.Migrator().DropTable(&NamedUser{})
+	DB.AutoMigrate(&NamedUser{})
+
+	user := NamedUser{Name1: "n1", Name2: "n2"}
+	DB.Create(&user)
+
+	var result NamedUser
+	if err := DB.Raw(`SELECT * FROM "named_users" WHERE "name1" = @name1 AND "name2" = @name2`,
+		sql.Named("name1", "n1"), map[string]interface{}{"name2": "n2"}).Scan(&result).Error; err != nil {
+		t.Errorf("failed mixed param test: %v", err)
+	}
+	tests.AssertEqual(t, result, user)
+}
+
+func TestNamedArgUnusedParameter(t *testing.T) {
+	type NamedUser struct {
+		gorm.Model
+		Name1 string
+	}
+	DB.Migrator().DropTable(&NamedUser{})
+	DB.AutoMigrate(&NamedUser{})
+
+	user := NamedUser{Name1: "unused"}
+	DB.Create(&user)
+
+	var result NamedUser
+	if err := DB.Raw(`SELECT * FROM "named_users" WHERE "name1" = @name1`,
+		sql.Named("name1", "unused"), sql.Named("extra", "notused")).Scan(&result).Error; err != nil {
+		t.Errorf("failed unused param test: %v", err)
+	}
+	tests.AssertEqual(t, result, user)
+}
+
+func TestNamedArgCaseSensitivity(t *testing.T) {
+	type NamedUser struct {
+		gorm.Model
+		Name1 string
+	}
+	DB.Migrator().DropTable(&NamedUser{})
+	DB.AutoMigrate(&NamedUser{})
+
+	user := NamedUser{Name1: "CaseTest"}
+	DB.Create(&user)
+
+	var result NamedUser
+	if err := DB.Raw(`SELECT * FROM "named_users" WHERE "name1" = @Name`,
+		sql.Named("Name", "CaseTest")).Scan(&result).Error; err != nil {
+		t.Errorf("failed case sensitivity test: %v", err)
+	}
+	tests.AssertEqual(t, result, user)
+}
+
+func TestNamedArgInClause(t *testing.T) {
+	type NamedUser struct {
+		gorm.Model
+		Name1 string
+	}
+	DB.Migrator().DropTable(&NamedUser{})
+	DB.AutoMigrate(&NamedUser{})
+
+	user1 := NamedUser{Name1: "in1"}
+	user2 := NamedUser{Name1: "in2"}
+	DB.Create(&user1)
+	DB.Create(&user2)
+
+	var results []NamedUser
+	if err := DB.Raw(`SELECT * FROM "named_users" WHERE "name1" IN (@n1, @n2)`,
+		sql.Named("n1", "in1"), sql.Named("n2", "in2")).Scan(&results).Error; err != nil {
+		t.Errorf("failed IN clause test: %v", err)
+	}
+	if len(results) != 2 {
+		t.Errorf("expected 2 results, got %d", len(results))
+	}
+}
+
+func TestNamedArgReservedWordParam(t *testing.T) {
+	type NamedUser struct {
+		gorm.Model
+		Name1 string
+	}
+	DB.Migrator().DropTable(&NamedUser{})
+	DB.AutoMigrate(&NamedUser{})
+
+	user := NamedUser{Name1: "reserved"}
+	DB.Create(&user)
+
+	var result NamedUser
+	if err := DB.Raw(`SELECT * FROM "named_users" WHERE "name1" = @order`,
+		sql.Named("order", "reserved")).Scan(&result).Error; err != nil {
+		t.Errorf("failed reserved word param test: %v", err)
+	}
+	tests.AssertEqual(t, result, user)
+}

tests/passed-tests.txt

@@ -68,7 +68,7 @@ TestCreateWithAutoIncrementCompositeKey
 TestCreateOnConflictWithDefaultNull
 TestCreateFromMapWithoutPK
 TestCreateFromMapWithTable
-#TestCustomizeColumn
+TestCustomizeColumn
 TestCustomColumnAndIgnoredFieldClash
 TestCustomizeField
 TestDefaultValue
@@ -142,7 +142,7 @@ TestJoinOn
 TestJoinsWithSelect
 TestJoinWithOmit
 TestJoinCount
-#TestJoinWithSoftDeleted
+TestJoinWithSoftDeleted
 TestInnerJoins
 TestJoinWithSameColumnName
 TestJoinArgsWithDB
@@ -186,6 +186,13 @@ TestMigrateExistingBoolColumnPG
 #TestManyToManyWithCustomizedForeignKeys2
 #TestCompositePrimaryKeysAssociations
 TestNamedArg
+TestNamedArgMultipleSameParamRefs
+TestNamedArgNullValues
+TestNamedArgMixedNamedAndMapParams
+TestNamedArgUnusedParameter
+TestNamedArgCaseSensitivity
+TestNamedArgInClause
+TestNamedArgReservedWordParam
 TestNamedPolymorphic
 TestNonStdPrimaryKeyAndDefaultValues
 TestNestedPreload1
@@ -212,15 +219,15 @@ TestNilPointerSlice
 TestNilPointerSlice2
 TestPrefixedPreloadDuplication
 TestPreloadManyToManyCallbacks
-#TestPreloadWithAssociations
-#TestNestedPreload
+TestPreloadWithAssociations
+TestNestedPreload
 TestNestedPreloadForSlice
 #TestPreloadWithConds
-#TestNestedPreloadWithConds
+TestNestedPreloadWithConds
 TestPreloadEmptyData
 TestPreloadGoroutine
-#TestPreloadWithDiffModel
-#TestNestedPreloadWithUnscoped
+TestPreloadWithDiffModel
+TestNestedPreloadWithUnscoped
 TestNestedPreloadWithNestedJoin
 #TestMergeNestedPreloadWithNestedJoin
 TestNestedPreloadWithPointerJoin
@@ -370,7 +377,7 @@ TestDistinctWithVaryingCase
 #TestDistinctWithAggregation
 TestUpsertWithSave
 TestFindOrInitialize
-#TestFindOrCreate
+TestFindOrCreate
 TestUpdateWithMissWhere
 BenchmarkCreate
 BenchmarkFind
@@ -379,3 +386,8 @@ BenchmarkScanSlice
 BenchmarkScanSlicePointer
 BenchmarkUpdate
 BenchmarkDelete
+TestRawQueryInjection
+TestWhereClauseInjection
+TestUpdateInjection
+TestFirstOrCreateInjection
+TestUserInsertScenarios