Skip to content

Commit fabf3ff

Browse files
committed
Fix test script, close #751
1 parent 4f84925 commit fabf3ff

File tree

3 files changed

+48
-34
lines changed

3 files changed

+48
-34
lines changed

gen.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
"gorm.io/gen"
5-
"gorm.io/gen/examples/dal"
5+
// "gorm.io/gen/examples/dal"
66
)
77

88
func generate() {
@@ -12,9 +12,9 @@ func generate() {
1212

1313
WithUnitTest: true,
1414
})
15-
g.UseDB(dal.DB)
15+
// g.UseDB(dal.DB)
1616

17-
g.ApplyBasic(Company{}, Language{}) // Associations
17+
// g.ApplyBasic(Company{}, Language{}) // Associations
1818
g.ApplyBasic(g.GenerateModel("user"), g.GenerateModelAs("account", "AccountInfo"))
1919

2020
g.Execute()

go.mod

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
11
module gorm.io/playground
22

3-
go 1.20
3+
go 1.22.0
4+
5+
toolchain go1.23.3
46

57
require (
6-
gorm.io/driver/mysql v1.5.2
7-
gorm.io/driver/postgres v1.5.2
8-
gorm.io/driver/sqlite v1.5.3
9-
gorm.io/driver/sqlserver v1.5.1
10-
gorm.io/gen v0.3.25
11-
gorm.io/gorm v1.25.4
8+
gorm.io/driver/mysql v1.5.7
9+
gorm.io/driver/postgres v1.5.10
10+
gorm.io/driver/sqlite v1.5.6
11+
gorm.io/driver/sqlserver v1.5.4
12+
gorm.io/gen v0.3.26
13+
gorm.io/gorm v1.25.12
1214
)
1315

1416
require (
15-
github.com/go-sql-driver/mysql v1.7.1 // indirect
17+
filippo.io/edwards25519 v1.1.0 // indirect
18+
github.com/go-sql-driver/mysql v1.8.1 // indirect
1619
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
1720
github.com/golang-sql/sqlexp v0.1.0 // indirect
21+
github.com/google/uuid v1.6.0 // indirect
1822
github.com/jackc/pgpassfile v1.0.0 // indirect
19-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
20-
github.com/jackc/pgx/v5 v5.4.3 // indirect
23+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
24+
github.com/jackc/pgx/v5 v5.7.1 // indirect
25+
github.com/jackc/puddle/v2 v2.2.2 // indirect
2126
github.com/jinzhu/inflection v1.0.0 // indirect
2227
github.com/jinzhu/now v1.1.5 // indirect
23-
github.com/mattn/go-sqlite3 v1.14.17 // indirect
24-
github.com/microsoft/go-mssqldb v1.5.0 // indirect
25-
golang.org/x/crypto v0.14.0 // indirect
26-
golang.org/x/mod v0.14.0 // indirect
27-
golang.org/x/sys v0.14.0 // indirect
28-
golang.org/x/text v0.13.0 // indirect
29-
golang.org/x/tools v0.15.0 // indirect
30-
gorm.io/datatypes v1.1.1-0.20230130040222-c43177d3cf8c // indirect
31-
gorm.io/hints v1.1.0 // indirect
32-
gorm.io/plugin/dbresolver v1.5.0 // indirect
28+
github.com/mattn/go-sqlite3 v1.14.24 // indirect
29+
github.com/microsoft/go-mssqldb v1.7.2 // indirect
30+
golang.org/x/crypto v0.29.0 // indirect
31+
golang.org/x/mod v0.22.0 // indirect
32+
golang.org/x/sync v0.9.0 // indirect
33+
golang.org/x/sys v0.27.0 // indirect
34+
golang.org/x/text v0.20.0 // indirect
35+
golang.org/x/tools v0.27.0 // indirect
36+
gorm.io/datatypes v1.2.4 // indirect
37+
gorm.io/hints v1.1.2 // indirect
38+
gorm.io/plugin/dbresolver v1.5.3 // indirect
3339
)
3440

3541
replace gorm.io/gorm => ./gorm

test.sh

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,30 @@ then
77
rm -rf gorm
88
fi
99

10-
[ -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}'))
10+
[ -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}'))
1111

1212
go get -u -t ./...
1313

14+
1415
# SqlServer for Mac M1
1516
if [[ -z $GITHUB_ACTION ]]; then
16-
if [[ $(uname -a) == *" arm64" ]]; then
17-
MSSQL_IMAGE=mcr.microsoft.com/azure-sql-edge docker-compose up --detach --quiet-pull || true
18-
echo "starting"
19-
go install github.com/microsoft/go-sqlcmd/cmd/sqlcmd@latest || true
20-
SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "IF DB_ID('gorm') IS NULL CREATE DATABASE gorm" > /dev/null || true
21-
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
22-
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
23-
else
24-
docker-compose up --detach --quiet-pull
25-
echo "starting..."
17+
if [ -d tests ]
18+
then
19+
cd tests
20+
if [[ $(uname -a) == *" arm64" ]]; then
21+
MSSQL_IMAGE=mcr.microsoft.com/azure-sql-edge docker compose up -d --wait
22+
go install github.com/microsoft/go-sqlcmd/cmd/sqlcmd@latest
23+
for query in \
24+
"IF DB_ID('gorm') IS NULL CREATE DATABASE gorm" \
25+
"IF SUSER_ID (N'gorm') IS NULL CREATE LOGIN gorm WITH PASSWORD = '${SQLCMDPASSWORD}';" \
26+
"IF USER_ID (N'gorm') IS NULL CREATE USER gorm FROM LOGIN gorm; ALTER SERVER ROLE sysadmin ADD MEMBER [gorm];"
27+
do
28+
SQLCMDPASSWORD=LoremIpsum86 sqlcmd -U sa -S localhost:9930 -Q "$query" > /dev/null
29+
done
30+
else
31+
MSSQL_IMAGE=mcr.microsoft.com/mssql/server docker compose up -d --wait
32+
fi
33+
cd ..
2634
fi
2735
fi
2836

0 commit comments

Comments
 (0)