From fabf3ff55d22689e340f50ff5eda40c92d62a61e Mon Sep 17 00:00:00 2001
From: Jinzhu <wosmvp@gmail.com>
Date: Thu, 21 Nov 2024 16:54:35 +0800
Subject: [PATCH] Fix test script, close #751

---
 gen.go  |  6 +++---
 go.mod  | 46 ++++++++++++++++++++++++++--------------------
 test.sh | 30 +++++++++++++++++++-----------
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/gen.go b/gen.go
index 3127d5d6..c0f87398 100644
--- a/gen.go
+++ b/gen.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"gorm.io/gen"
-	"gorm.io/gen/examples/dal"
+	// "gorm.io/gen/examples/dal"
 )
 
 func generate() {
@@ -12,9 +12,9 @@ func generate() {
 
 		WithUnitTest: true,
 	})
-	g.UseDB(dal.DB)
+	// g.UseDB(dal.DB)
 
-	g.ApplyBasic(Company{}, Language{}) // Associations
+	// g.ApplyBasic(Company{}, Language{}) // Associations
 	g.ApplyBasic(g.GenerateModel("user"), g.GenerateModelAs("account", "AccountInfo"))
 
 	g.Execute()
diff --git a/go.mod b/go.mod
index 159394d4..f194634f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,35 +1,41 @@
 module gorm.io/playground
 
-go 1.20
+go 1.22.0
+
+toolchain go1.23.3
 
 require (
-	gorm.io/driver/mysql v1.5.2
-	gorm.io/driver/postgres v1.5.2
-	gorm.io/driver/sqlite v1.5.3
-	gorm.io/driver/sqlserver v1.5.1
-	gorm.io/gen v0.3.25
-	gorm.io/gorm v1.25.4
+	gorm.io/driver/mysql v1.5.7
+	gorm.io/driver/postgres v1.5.10
+	gorm.io/driver/sqlite v1.5.6
+	gorm.io/driver/sqlserver v1.5.4
+	gorm.io/gen v0.3.26
+	gorm.io/gorm v1.25.12
 )
 
 require (
-	github.com/go-sql-driver/mysql v1.7.1 // indirect
+	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.4.3 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgx/v5 v5.7.1 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/mattn/go-sqlite3 v1.14.17 // indirect
-	github.com/microsoft/go-mssqldb v1.5.0 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.15.0 // indirect
-	gorm.io/datatypes v1.1.1-0.20230130040222-c43177d3cf8c // indirect
-	gorm.io/hints v1.1.0 // indirect
-	gorm.io/plugin/dbresolver v1.5.0 // indirect
+	github.com/mattn/go-sqlite3 v1.14.24 // indirect
+	github.com/microsoft/go-mssqldb v1.7.2 // indirect
+	golang.org/x/crypto v0.29.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
+	golang.org/x/tools v0.27.0 // indirect
+	gorm.io/datatypes v1.2.4 // indirect
+	gorm.io/hints v1.1.2 // indirect
+	gorm.io/plugin/dbresolver v1.5.3 // indirect
 )
 
 replace gorm.io/gorm => ./gorm
diff --git a/test.sh b/test.sh
index 7df9088e..65dddba4 100755
--- a/test.sh
+++ b/test.sh
@@ -7,22 +7,30 @@ then
 rm -rf gorm
 fi
 
-[ -d gorm ] || (echo "git clone --depth 1 -b $(cat main_test.go | grep GORM_BRANCH | awk '{print $3}') $(cat main_test.go | grep GORM_REPO | awk '{print $3}')"; git clone --depth 1 -b $(cat main_test.go | grep GORM_BRANCH | awk '{print $3}') $(cat main_test.go | grep GORM_REPO | awk '{print $3}'))
+[ -d gorm ] || (echo "git clone --depth 1 -b $(grep GORM_BRANCH main_test.go | awk '{print $3}') $(grep GORM_REPO main_test.go | awk '{print $3}')"; git clone --depth 1 -b $(grep GORM_BRANCH main_test.go | awk '{print $3}') $(grep GORM_REPO main_test.go | awk '{print $3}'))
 
 go get -u -t ./...
 
+
 # SqlServer for Mac M1
 if [[ -z $GITHUB_ACTION ]]; then
-  if [[ $(uname -a) == *" arm64" ]]; then
-    MSSQL_IMAGE=mcr.microsoft.com/azure-sql-edge docker-compose up --detach --quiet-pull || true
-    echo "starting"
-    go install github.com/microsoft/go-sqlcmd/cmd/sqlcmd@latest || true
-    SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "IF DB_ID('gorm') IS NULL CREATE DATABASE gorm" > /dev/null || true
-    SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "IF SUSER_ID (N'gorm') IS NULL CREATE LOGIN gorm WITH PASSWORD = 'LoremIpsum86';" > /dev/null || true
-    SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "IF USER_ID (N'gorm') IS NULL CREATE USER gorm FROM LOGIN gorm; ALTER SERVER ROLE sysadmin ADD MEMBER [gorm];" > /dev/null || true
-  else
-    docker-compose up --detach --quiet-pull
-    echo "starting..."
+  if [ -d tests ]
+  then
+    cd tests
+    if [[ $(uname -a) == *" arm64" ]]; then
+      MSSQL_IMAGE=mcr.microsoft.com/azure-sql-edge docker compose up -d --wait
+      go install github.com/microsoft/go-sqlcmd/cmd/sqlcmd@latest
+      for query in \
+        "IF DB_ID('gorm') IS NULL CREATE DATABASE gorm" \
+        "IF SUSER_ID (N'gorm') IS NULL CREATE LOGIN gorm WITH PASSWORD = '${SQLCMDPASSWORD}';" \
+        "IF USER_ID (N'gorm') IS NULL CREATE USER gorm FROM LOGIN gorm; ALTER SERVER ROLE sysadmin ADD MEMBER [gorm];"
+      do
+        SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "$query" > /dev/null
+      done
+    else
+      MSSQL_IMAGE=mcr.microsoft.com/mssql/server docker compose up -d --wait
+    fi
+    cd ..
   fi
 fi