From 7cd1778deaf205dbad82524fdfbeb56f10c60c20 Mon Sep 17 00:00:00 2001
From: Ayoub Aarrasse <ayoub.aarrasse@oracle.com>
Date: Tue, 19 Aug 2025 11:28:50 +0100
Subject: [PATCH 1/2] Fixed tests

---
 tests/preload_test.go | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tests/preload_test.go b/tests/preload_test.go
index 91b163f..545c40b 100644
--- a/tests/preload_test.go
+++ b/tests/preload_test.go
@@ -57,7 +57,6 @@ import (
 )
 
 func TestPreloadWithAssociations(t *testing.T) {
-	t.Skip()
 	user := *GetUser("preload_with_associations", Config{
 		Account:   true,
 		Pets:      2,
@@ -95,7 +94,6 @@ func TestPreloadWithAssociations(t *testing.T) {
 }
 
 func TestNestedPreload(t *testing.T) {
-	t.Skip()
 	user := *GetUser("nested_preload", Config{Pets: 2})
 
 	for idx, pet := range user.Pets {
@@ -209,7 +207,6 @@ func TestPreloadWithConds(t *testing.T) {
 }
 
 func TestNestedPreloadWithConds(t *testing.T) {
-	t.Skip()
 	users := []User{
 		*GetUser("slice_nested_preload_1", Config{Pets: 2}),
 		*GetUser("slice_nested_preload_2", Config{Pets: 0}),
@@ -300,7 +297,6 @@ func TestPreloadGoroutine(t *testing.T) {
 }
 
 func TestPreloadWithDiffModel(t *testing.T) {
-	t.Skip()
 	user := *GetUser("preload_with_diff_model", Config{Account: true})
 
 	if err := DB.Create(&user).Error; err != nil {
@@ -319,7 +315,6 @@ func TestPreloadWithDiffModel(t *testing.T) {
 }
 
 func TestNestedPreloadWithUnscoped(t *testing.T) {
-	t.Skip()
 	user := *GetUser("nested_preload", Config{Pets: 1})
 	pet := user.Pets[0]
 	pet.Toy = Toy{Name: "toy_nested_preload_" + strconv.Itoa(1)}
@@ -434,7 +429,6 @@ func TestNestedPreloadWithNestedJoin(t *testing.T) {
 }
 
 func TestMergeNestedPreloadWithNestedJoin(t *testing.T) {
-	t.Skip()
 	users := []User{
 		{
 			Name: "TestMergeNestedPreloadWithNestedJoin-1",
@@ -473,7 +467,7 @@ func TestMergeNestedPreloadWithNestedJoin(t *testing.T) {
 	err := sess.
 		Joins("Manager").
 		Preload("Manager.Tools").
-		Where("users.name Like ?", "TestMergeNestedPreloadWithNestedJoin%").
+		Where("\"users\".\"name\" Like ?", "TestMergeNestedPreloadWithNestedJoin%").
 		Find(&result).Error
 
 	if err != nil {
@@ -541,7 +535,6 @@ func TestNestedPreloadWithPointerJoin(t *testing.T) {
 }
 
 func TestEmbedPreload(t *testing.T) {
-	t.Skip()
 	type Country struct {
 		ID   int `gorm:"primaryKey"`
 		Name string
@@ -666,7 +659,7 @@ func TestEmbedPreload(t *testing.T) {
 	for _, test := range testList {
 		t.Run(test.name, func(t *testing.T) {
 			actual := Org{}
-			tx := DB.Where("id = ?", org.ID).Session(&gorm.Session{})
+			tx := DB.Where("\"id\" = ?", org.ID).Session(&gorm.Session{})
 			for name, args := range test.preloads {
 				tx = tx.Preload(name, args...)
 			}

From dc221a2540122b523bea9998d097c7e841b746ad Mon Sep 17 00:00:00 2001
From: Ayoub Aarrasse <ayoub.aarrasse@oracle.com>
Date: Tue, 19 Aug 2025 11:42:43 +0100
Subject: [PATCH 2/2] passed tests updated

---
 tests/passed-tests.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/passed-tests.txt b/tests/passed-tests.txt
index f74b330..71508e6 100644
--- a/tests/passed-tests.txt
+++ b/tests/passed-tests.txt
@@ -229,9 +229,9 @@ TestPreloadGoroutine
 TestPreloadWithDiffModel
 TestNestedPreloadWithUnscoped
 TestNestedPreloadWithNestedJoin
-#TestMergeNestedPreloadWithNestedJoin
+TestMergeNestedPreloadWithNestedJoin
 TestNestedPreloadWithPointerJoin
-#TestEmbedPreload
+TestEmbedPreload
 TestPreparedStmt
 TestPreparedStmtFromTransaction
 TestPreparedStmtLruFromTransaction