re
/
gorm
forked from mirror/gorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1423 from emil2k/open-tx 

Allow open to take transaction.
This commit is contained in:
Jinzhu 2017-04-18 22:22:24 +08:00 committed by GitHub
parent 88a47176f3 5ed4c3f290
commit 33aa952d07
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.go
View File

@ -71,11 +71,13 @@ func Open(dialect string, args ...interface{}) (db *DB, err error) {
dialect: newDialect(dialect, dbSQL), dialect: newDialect(dialect, dbSQL),
} }
db.parent = db db.parent = db
if err != nil {
if err == nil { return
}
// Send a ping to make sure the database connection is alive. // Send a ping to make sure the database connection is alive.
if err = db.DB().Ping(); err != nil { if d, ok := dbSQL.(*sql.DB); ok {
db.DB().Close() if err = d.Ping(); err != nil {
d.Close()
} }
} }
return return