if no arguments, return error at once
This commit is contained in:
parent
ab703afe97
commit
0d54677e13
60
main.go
60
main.go
@ -44,40 +44,40 @@ func Open(dialect string, args ...interface{}) (*DB, error) {
|
|||||||
|
|
||||||
if len(args) == 0 {
|
if len(args) == 0 {
|
||||||
err = errors.New("invalid database source")
|
err = errors.New("invalid database source")
|
||||||
} else {
|
return nil, err
|
||||||
var source string
|
}
|
||||||
var dbSQL sqlCommon
|
var source string
|
||||||
|
var dbSQL sqlCommon
|
||||||
|
|
||||||
switch value := args[0].(type) {
|
switch value := args[0].(type) {
|
||||||
case string:
|
case string:
|
||||||
var driver = dialect
|
var driver = dialect
|
||||||
if len(args) == 1 {
|
if len(args) == 1 {
|
||||||
source = value
|
source = value
|
||||||
} else if len(args) >= 2 {
|
} else if len(args) >= 2 {
|
||||||
driver = value
|
driver = value
|
||||||
source = args[1].(string)
|
source = args[1].(string)
|
||||||
}
|
|
||||||
dbSQL, err = sql.Open(driver, source)
|
|
||||||
case sqlCommon:
|
|
||||||
source = reflect.Indirect(reflect.ValueOf(value)).FieldByName("dsn").String()
|
|
||||||
dbSQL = value
|
|
||||||
}
|
}
|
||||||
|
dbSQL, err = sql.Open(driver, source)
|
||||||
|
case sqlCommon:
|
||||||
|
source = reflect.Indirect(reflect.ValueOf(value)).FieldByName("dsn").String()
|
||||||
|
dbSQL = value
|
||||||
|
}
|
||||||
|
|
||||||
db = DB{
|
db = DB{
|
||||||
dialect: newDialect(dialect, dbSQL.(*sql.DB)),
|
dialect: newDialect(dialect, dbSQL.(*sql.DB)),
|
||||||
logger: defaultLogger,
|
logger: defaultLogger,
|
||||||
callbacks: DefaultCallback,
|
callbacks: DefaultCallback,
|
||||||
source: source,
|
source: source,
|
||||||
values: map[string]interface{}{},
|
values: map[string]interface{}{},
|
||||||
db: dbSQL,
|
db: dbSQL,
|
||||||
}
|
}
|
||||||
db.parent = &db
|
db.parent = &db
|
||||||
|
|
||||||
if err == nil {
|
if err == nil {
|
||||||
err = db.DB().Ping() // Send a ping to make sure the database connection is alive.
|
err = db.DB().Ping() // Send a ping to make sure the database connection is alive.
|
||||||
if err != nil {
|
if err != nil {
|
||||||
db.DB().Close()
|
db.DB().Close()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user