diff --git a/dialect.go b/dialect.go index f4441b5..488f5e0 100644 --- a/dialect.go +++ b/dialect.go @@ -54,15 +54,15 @@ func (pg PostgresDialect) createVersionTableSQL() string { is_applied boolean NOT NULL, tstamp timestamp NULL default now(), PRIMARY KEY(id) - );`, GetDBVersionTableName()) + );`, TableName()) } func (pg PostgresDialect) insertVersionSQL() string { - return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES ($1, $2);", GetDBVersionTableName()) + return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES ($1, $2);", TableName()) } func (pg PostgresDialect) dbVersionQuery(db *sql.DB) (*sql.Rows, error) { - rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", GetDBVersionTableName())) + rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", TableName())) if err != nil { return nil, err } @@ -84,15 +84,15 @@ func (m MySQLDialect) createVersionTableSQL() string { is_applied boolean NOT NULL, tstamp timestamp NULL default now(), PRIMARY KEY(id) - );`, GetDBVersionTableName()) + );`, TableName()) } func (m MySQLDialect) insertVersionSQL() string { - return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES (?, ?);", GetDBVersionTableName()) + return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES (?, ?);", TableName()) } func (m MySQLDialect) dbVersionQuery(db *sql.DB) (*sql.Rows, error) { - rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", GetDBVersionTableName())) + rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", TableName())) if err != nil { return nil, err } @@ -113,15 +113,15 @@ func (m Sqlite3Dialect) createVersionTableSQL() string { version_id INTEGER NOT NULL, is_applied INTEGER NOT NULL, tstamp TIMESTAMP DEFAULT (datetime('now')) - );`, GetDBVersionTableName()) + );`, TableName()) } func (m Sqlite3Dialect) insertVersionSQL() string { - return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES (?, ?);", GetDBVersionTableName()) + return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES (?, ?);", TableName()) } func (m Sqlite3Dialect) dbVersionQuery(db *sql.DB) (*sql.Rows, error) { - rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", GetDBVersionTableName())) + rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", TableName())) if err != nil { return nil, err } @@ -143,15 +143,15 @@ func (rs RedshiftDialect) createVersionTableSQL() string { is_applied boolean NOT NULL, tstamp timestamp NULL default sysdate, PRIMARY KEY(id) - );`, GetDBVersionTableName()) + );`, TableName()) } func (rs RedshiftDialect) insertVersionSQL() string { - return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES ($1, $2);", GetDBVersionTableName()) + return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES ($1, $2);", TableName()) } func (rs RedshiftDialect) dbVersionQuery(db *sql.DB) (*sql.Rows, error) { - rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", GetDBVersionTableName())) + rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", TableName())) if err != nil { return nil, err } @@ -173,15 +173,15 @@ func (m TiDBDialect) createVersionTableSQL() string { is_applied boolean NOT NULL, tstamp timestamp NULL default now(), PRIMARY KEY(id) - );`, GetDBVersionTableName()) + );`, TableName()) } func (m TiDBDialect) insertVersionSQL() string { - return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES (?, ?);", GetDBVersionTableName()) + return fmt.Sprintf("INSERT INTO %s (version_id, is_applied) VALUES (?, ?);", TableName()) } func (m TiDBDialect) dbVersionQuery(db *sql.DB) (*sql.Rows, error) { - rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", GetDBVersionTableName())) + rows, err := db.Query(fmt.Sprintf("SELECT version_id, is_applied from %s ORDER BY id DESC", TableName())) if err != nil { return nil, err } diff --git a/status.go b/status.go index c1713fe..5ecda4e 100644 --- a/status.go +++ b/status.go @@ -32,7 +32,7 @@ func Status(db *sql.DB, dir string) error { func printMigrationStatus(db *sql.DB, version int64, script string) { var row MigrationRecord - q := fmt.Sprintf("SELECT tstamp, is_applied FROM %s WHERE version_id=%d ORDER BY tstamp DESC LIMIT 1", GetDBVersionTableName(), version) + q := fmt.Sprintf("SELECT tstamp, is_applied FROM %s WHERE version_id=%d ORDER BY tstamp DESC LIMIT 1", TableName(), version) e := db.QueryRow(q).Scan(&row.TStamp, &row.IsApplied) if e != nil && e != sql.ErrNoRows { diff --git a/version.go b/version.go index 37bb4c2..d257693 100644 --- a/version.go +++ b/version.go @@ -16,14 +16,14 @@ func Version(db *sql.DB, dir string) error { return nil } -var dbVersionTableName = "goose_db_version" +var tableName = "goose_db_version" -// GetDBVersionTableName returns goose db version table name -func GetDBVersionTableName() string { - return dbVersionTableName +// TableName returns goose db version table name +func TableName() string { + return tableName } -// SetDBVersionTableName set goose db version table name -func SetDBVersionTableName(n string) { - dbVersionTableName = n +// SetTableName set goose db version table name +func SetTableName(n string) { + tableName = n }