Skip to content

Commit 6bfccf8

Browse files
committed
Refactor all tests script
1 parent 49bbaa6 commit 6bfccf8

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ go 1.18
55
require (
66
github.com/jinzhu/inflection v1.0.0
77
github.com/jinzhu/now v1.1.5
8-
golang.org/x/text v0.14.0
8+
golang.org/x/text v0.20.0
99
)

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
22
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
33
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
44
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
5-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
6-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
5+
golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
6+
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=

gorm.go

-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ func Open(dialector Dialector, opts ...Option) (db *DB, err error) {
183183

184184
if config.Dialector != nil {
185185
err = config.Dialector.Initialize(db)
186-
187186
if err != nil {
188187
if db, _ := db.DB(); db != nil {
189188
_ = db.Close()

tests/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/lib/pq v1.10.9
99
github.com/stretchr/testify v1.9.0
1010
gorm.io/driver/mysql v1.5.7
11-
gorm.io/driver/postgres v1.5.9
11+
gorm.io/driver/postgres v1.5.10
1212
gorm.io/driver/sqlite v1.5.6
1313
gorm.io/driver/sqlserver v1.5.4
1414
gorm.io/gorm v1.25.12
@@ -25,12 +25,12 @@ require (
2525
github.com/jackc/pgx/v5 v5.7.1 // indirect
2626
github.com/jinzhu/inflection v1.0.0 // indirect
2727
github.com/kr/text v0.2.0 // indirect
28-
github.com/mattn/go-sqlite3 v1.14.23 // indirect
28+
github.com/mattn/go-sqlite3 v1.14.24 // indirect
2929
github.com/microsoft/go-mssqldb v1.7.2 // indirect
3030
github.com/pmezard/go-difflib v1.0.0 // indirect
3131
github.com/rogpeppe/go-internal v1.12.0 // indirect
32-
golang.org/x/crypto v0.27.0 // indirect
33-
golang.org/x/text v0.18.0 // indirect
32+
golang.org/x/crypto v0.29.0 // indirect
33+
golang.org/x/text v0.20.0 // indirect
3434
gopkg.in/yaml.v3 v3.0.1 // indirect
3535
)
3636

tests/tests_all.sh

+15-14
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@ then
1616
fi
1717

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

3637

0 commit comments

Comments
 (0)