Use driver to open SQL connection in tests

This commit is contained in:
Adrian Macneil 2015-12-01 00:16:28 -08:00
parent 8cb676158e
commit 98a4911ff7
2 changed files with 14 additions and 4 deletions

View file

@ -1,9 +1,9 @@
package main_test
import (
"database/sql"
"flag"
"github.com/adrianmacneil/dbmate"
"github.com/adrianmacneil/dbmate/driver"
"github.com/codegangsta/cli"
"github.com/stretchr/testify/require"
"io"
@ -92,7 +92,7 @@ func testMigrateCommandURL(t *testing.T, u *url.URL) {
require.Nil(t, err)
// verify results
db, err := sql.Open(u.Scheme, u.String())
db, err := driver.Open(u)
require.Nil(t, err)
defer mustClose(db)
@ -125,7 +125,7 @@ func testUpCommandURL(t *testing.T, u *url.URL) {
require.Nil(t, err)
// verify results
db, err := sql.Open(u.Scheme, u.String())
db, err := driver.Open(u)
require.Nil(t, err)
defer mustClose(db)
@ -158,7 +158,7 @@ func testRollbackCommandURL(t *testing.T, u *url.URL) {
require.Nil(t, err)
// verify migration
db, err := sql.Open(u.Scheme, u.String())
db, err := driver.Open(u)
require.Nil(t, err)
defer mustClose(db)

View file

@ -29,3 +29,13 @@ func Get(name string) (Driver, error) {
return nil, fmt.Errorf("Unknown driver: %s", name)
}
}
// Open is a shortcut for driver.Get(u.Scheme).Open(u)
func Open(u *url.URL) (*sql.DB, error) {
drv, err := Get(u.Scheme)
if err != nil {
return nil, err
}
return drv.Open(u)
}