From 76ed21c40f824115dd64215eb8b70bc82e582179 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Mon, 10 Mar 2014 11:30:39 +0700 Subject: [PATCH] Cleanup some leftover Don't have to import mattn/go-sqlite3 at pkg/database/migrate/sqlite.go Remove unused DriverFunction declaration at migrate.go --- pkg/database/migrate/api.go | 3 +-- pkg/database/migrate/migrate.go | 3 +-- pkg/database/migrate/sqlite.go | 2 -- pkg/database/migrate/sqlite_test.go | 1 + 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/database/migrate/api.go b/pkg/database/migrate/api.go index 6b98ab846..c000bfccc 100644 --- a/pkg/database/migrate/api.go +++ b/pkg/database/migrate/api.go @@ -24,7 +24,7 @@ type Operation interface { AddIndex(tableName string, columns []string, flag string) (sql.Result, error) - DropIndex(tableName string, columns[]string) (sql.Result, error) + DropIndex(tableName string, columns []string) (sql.Result, error) } type MigrationDriver struct { @@ -33,4 +33,3 @@ type MigrationDriver struct { } type DriverBuilder func(tx *sql.Tx) *MigrationDriver - diff --git a/pkg/database/migrate/migrate.go b/pkg/database/migrate/migrate.go index f67e71297..d6487a22a 100644 --- a/pkg/database/migrate/migrate.go +++ b/pkg/database/migrate/migrate.go @@ -48,6 +48,7 @@ INSERT INTO migration (revision) VALUES (?) const deleteRevisionStmt = ` DELETE FROM migration where revision = ? ` + type Revision interface { Up(mg *MigrationDriver) error Down(mg *MigrationDriver) error @@ -59,8 +60,6 @@ type Migration struct { revs []Revision } -type DriverFunction func(tx *sql.Tx) *MigrationDriver - var Driver DriverBuilder func New(db *sql.DB) *Migration { diff --git a/pkg/database/migrate/sqlite.go b/pkg/database/migrate/sqlite.go index c0fdce75b..dbba4d6ab 100644 --- a/pkg/database/migrate/sqlite.go +++ b/pkg/database/migrate/sqlite.go @@ -4,8 +4,6 @@ import ( "database/sql" "fmt" "strings" - - _ "github.com/mattn/go-sqlite3" ) type sqliteDriver struct { diff --git a/pkg/database/migrate/sqlite_test.go b/pkg/database/migrate/sqlite_test.go index bccc2e5b6..2a31754b4 100644 --- a/pkg/database/migrate/sqlite_test.go +++ b/pkg/database/migrate/sqlite_test.go @@ -6,6 +6,7 @@ import ( "strings" "testing" + _ "github.com/mattn/go-sqlite3" "github.com/russross/meddler" )