diff --git a/go.mod b/go.mod index 9b30a0e7..3060fc8f 100644 --- a/go.mod +++ b/go.mod @@ -5,5 +5,5 @@ go 1.18 require ( github.com/jinzhu/inflection v1.0.0 github.com/jinzhu/now v1.1.5 - golang.org/x/text v0.14.0 + golang.org/x/text v0.20.0 ) diff --git a/go.sum b/go.sum index e3e29009..9af11572 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,5 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= diff --git a/gorm.go b/gorm.go index 84ff8ee3..bc6d6db3 100644 --- a/gorm.go +++ b/gorm.go @@ -183,7 +183,6 @@ func Open(dialector Dialector, opts ...Option) (db *DB, err error) { if config.Dialector != nil { err = config.Dialector.Initialize(db) - if err != nil { if db, _ := db.DB(); db != nil { _ = db.Close() diff --git a/tests/go.mod b/tests/go.mod index 37286110..30143433 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -8,7 +8,7 @@ require ( github.com/lib/pq v1.10.9 github.com/stretchr/testify v1.9.0 gorm.io/driver/mysql v1.5.7 - gorm.io/driver/postgres v1.5.9 + gorm.io/driver/postgres v1.5.10 gorm.io/driver/sqlite v1.5.6 gorm.io/driver/sqlserver v1.5.4 gorm.io/gorm v1.25.12 @@ -25,12 +25,12 @@ require ( github.com/jackc/pgx/v5 v5.7.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/kr/text v0.2.0 // indirect - github.com/mattn/go-sqlite3 v1.14.23 // indirect + github.com/mattn/go-sqlite3 v1.14.24 // indirect github.com/microsoft/go-mssqldb v1.7.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect - golang.org/x/crypto v0.27.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/crypto v0.29.0 // indirect + golang.org/x/text v0.20.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/tests/tests_all.sh b/tests/tests_all.sh index 67c6938e..b221a7d8 100755 --- a/tests/tests_all.sh +++ b/tests/tests_all.sh @@ -16,21 +16,22 @@ then fi # SqlServer for Mac M1 -if [[ -z $GITHUB_ACTION ]]; then - if [ -d tests ] - then - cd tests - if [[ $(uname -a) == *" arm64" ]]; then - MSSQL_IMAGE=mcr.microsoft.com/azure-sql-edge docker compose up -d || true - 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 - MSSQL_IMAGE=mcr.microsoft.com/mssql/server docker compose up -d - fi - cd .. +if [[ -z $GITHUB_ACTION && -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 || true + for query in \ + "IF DB_ID('gorm') IS NULL CREATE DATABASE gorm" \ + "IF SUSER_ID (N'gorm') IS NULL CREATE LOGIN gorm WITH PASSWORD = 'LoremIpsum86';" \ + "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 || true + done + else + MSSQL_IMAGE=mcr.microsoft.com/mssql/server docker compose up -d --wait fi + cd .. fi