tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reafactor: add nil detection when sqldb return (#6373)

Browse Source 
* reafactor: add null detection when sqldb return

* refactor: Detecting nil in dbConnector.GetDBConn()

* refactor: Revert partial code from c1ea73036715018a1bb55cdb8690441044e13a76

* fix: fix if statement
This commit is contained in:
KantaHasegawa 2023-06-05 17:24:00 +09:00 committed by GitHub
parent 7a76c042e6
commit 5eaccaa624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gorm.go
View File

@ -181,7 +181,7 @@ func Open(dialector Dialector, opts ...Option) (db *DB, err error) {
err = config.Dialector.Initialize(db) err = config.Dialector.Initialize(db)
if err != nil { if err != nil {
if db, _ := db.DB(); db != nil { if db, err := db.DB(); err == nil {
_ = db.Close() _ = db.Close()
} }
} }
@ -376,10 +376,12 @@ func (db *DB) DB() (*sql.DB, error) {
connPool := db.ConnPool connPool := db.ConnPool
if dbConnector, ok := connPool.(GetDBConnector); ok && dbConnector != nil { if dbConnector, ok := connPool.(GetDBConnector); ok && dbConnector != nil {
return dbConnector.GetDBConn() if sqldb, err := dbConnector.GetDBConn(); sqldb != nil || err != nil {
return sqldb, err
}
} }
if sqldb, ok := connPool.(*sql.DB); ok { if sqldb, ok := connPool.(*sql.DB); ok && sqldb != nil {
return sqldb, nil return sqldb, nil
} }