mirror
/
gorm
mirror of https://github.com/go-gorm/gorm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1210 from baijum/error-zero-args 

If no arguments, return error at once
This commit is contained in:
Jinzhu 2016-10-23 22:58:23 +08:00 committed by GitHub
parent 89b7cbe89c bd513dd580
commit c1b9cf186e
2 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.go
View File

@ -44,7 +44,8 @@ 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 source string
var dbSQL sqlCommon var dbSQL sqlCommon
@ -79,7 +80,6 @@ func Open(dialect string, args ...interface{}) (*DB, error) {
db.DB().Close() db.DB().Close()
} }
} }
}
return &db, err return &db, err
} }

10
main_test.go
View File

@ -761,6 +761,16 @@ func TestDdlErrors(t *testing.T) {
} }
} }
func TestOpenWithOneParameter(t *testing.T) {
db, err := gorm.Open("dialect")
if db != nil {
t.Error("Open with one parameter returned non nil for db")
}
if err == nil {
t.Error("Open with one parameter returned err as nil")
}
}
func BenchmarkGorm(b *testing.B) { func BenchmarkGorm(b *testing.B) {
b.N = 2000 b.N = 2000
for x := 0; x < b.N; x++ { for x := 0; x < b.N; x++ {