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

Impove code quality

Browse Source
This commit is contained in:
fwhez 2018-11-12 11:10:47 +08:00
parent 8355eb2fc2
commit 300b6d385c
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.go
View File

@ -113,9 +113,8 @@ func (s *DB) DataSource() string {
func (s *DB) CopyDB() (*sql.DB, error) { func (s *DB) CopyDB() (*sql.DB, error) {
if s.copyDB != nil { if s.copyDB != nil {
return s.copyDB, nil return s.copyDB, nil
} else {
return sql.Open(s.Dialect().GetName(), s.DataSource())
} }
return sql.Open(s.Dialect().GetName(), s.DataSource())
} }
type closer interface { type closer interface {

23
main_test.go
View File

@ -1061,15 +1061,24 @@ func TestBlockGlobalUpdate(t *testing.T) {
func TestDB_DataSource(t *testing.T) { func TestDB_DataSource(t *testing.T) {
source := "user=gorm password=gorm DB.name=gorm port=9920 sslmode=disable" source := "user=gorm password=gorm DB.name=gorm port=9920 sslmode=disable"
if DB.DataSource() != source { db,er := gorm.Open("postgres", source)
t.Fatal(fmt.Sprintf("want '%s', but got '%s'", source, DB.DataSource())) if er!=nil {
panic(fmt.Sprintf("No error should happen when connecting to test database, but got err=%+v", er))
}
if db.DataSource() != source {
t.Fatal(fmt.Sprintf("want '%s', but got '%s'", source, db.DataSource()))
} }
} }
func TestDB_CopyIn(t *testing.T) { func TestDB_CopyIn(t *testing.T) {
e:=DB.Exec("create table if not exists example(name varchar, age integer)").Error source := "user=gorm password=gorm DB.name=gorm port=9920 sslmode=disable"
db,er := gorm.Open("postgres", source)
if er!=nil {
panic(fmt.Sprintf("No error should happen when connecting to test database, but got err=%+v", er))
}
e:=db.Exec("create table if not exists example(name varchar, age integer)").Error
defer func(){ defer func(){
er := DB.Exec("drop table if exists example").Error er := db.Exec("drop table if exists example").Error
if er != nil { if er != nil {
t.Fatal(e.Error()) t.Fatal(e.Error())
} }
@ -1077,7 +1086,7 @@ func TestDB_CopyIn(t *testing.T) {
if e != nil { if e != nil {
t.Fatal(e.Error()) t.Fatal(e.Error())
} }
defer DB.Exec("drop table") defer db.Exec("drop table")
var args = make([][]interface{}, 0) var args = make([][]interface{}, 0)
args = append(args, []interface{}{ args = append(args, []interface{}{
"tom", 9, "tom", 9,
@ -1086,7 +1095,7 @@ func TestDB_CopyIn(t *testing.T) {
}, []interface{}{ }, []interface{}{
"jim", 11, "jim", 11,
}) })
e = DB.CopyIn(true, "example", args, "name", "age") e = db.CopyIn(true, "example", args, "name", "age")
if e != nil { if e != nil {
t.Fatal(e.Error()) t.Fatal(e.Error())
} }
@ -1095,7 +1104,7 @@ func TestDB_CopyIn(t *testing.T) {
Age int Age int
} }
var examples = make([]Example, 0) var examples = make([]Example, 0)
e = DB.Raw("select * from example").Find(&examples).Error e = db.Raw("select * from example").Find(&examples).Error
if e != nil { if e != nil {
t.Fatal(e.Error()) t.Fatal(e.Error())
} }