Rename goose db version table name to tableName

pull/104/head
Maxim Krasilnikov 2018-05-02 14:24:15 +03:00
parent 0639337e0b
commit 3676559dc0
3 changed files with 23 additions and 23 deletions

View File

@ -54,15 +54,15 @@ func (pg PostgresDialect) createVersionTableSQL() string {
is_applied boolean NOT NULL, is_applied boolean NOT NULL,
tstamp timestamp NULL default now(), tstamp timestamp NULL default now(),
PRIMARY KEY(id) PRIMARY KEY(id)
);`, GetDBVersionTableName()) );`, TableName())
} }
func (pg PostgresDialect) insertVersionSQL() string { 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) { 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 { if err != nil {
return nil, err return nil, err
} }
@ -84,15 +84,15 @@ func (m MySQLDialect) createVersionTableSQL() string {
is_applied boolean NOT NULL, is_applied boolean NOT NULL,
tstamp timestamp NULL default now(), tstamp timestamp NULL default now(),
PRIMARY KEY(id) PRIMARY KEY(id)
);`, GetDBVersionTableName()) );`, TableName())
} }
func (m MySQLDialect) insertVersionSQL() string { 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) { 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 { if err != nil {
return nil, err return nil, err
} }
@ -113,15 +113,15 @@ func (m Sqlite3Dialect) createVersionTableSQL() string {
version_id INTEGER NOT NULL, version_id INTEGER NOT NULL,
is_applied INTEGER NOT NULL, is_applied INTEGER NOT NULL,
tstamp TIMESTAMP DEFAULT (datetime('now')) tstamp TIMESTAMP DEFAULT (datetime('now'))
);`, GetDBVersionTableName()) );`, TableName())
} }
func (m Sqlite3Dialect) insertVersionSQL() string { 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) { 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 { if err != nil {
return nil, err return nil, err
} }
@ -143,15 +143,15 @@ func (rs RedshiftDialect) createVersionTableSQL() string {
is_applied boolean NOT NULL, is_applied boolean NOT NULL,
tstamp timestamp NULL default sysdate, tstamp timestamp NULL default sysdate,
PRIMARY KEY(id) PRIMARY KEY(id)
);`, GetDBVersionTableName()) );`, TableName())
} }
func (rs RedshiftDialect) insertVersionSQL() string { 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) { 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 { if err != nil {
return nil, err return nil, err
} }
@ -173,15 +173,15 @@ func (m TiDBDialect) createVersionTableSQL() string {
is_applied boolean NOT NULL, is_applied boolean NOT NULL,
tstamp timestamp NULL default now(), tstamp timestamp NULL default now(),
PRIMARY KEY(id) PRIMARY KEY(id)
);`, GetDBVersionTableName()) );`, TableName())
} }
func (m TiDBDialect) insertVersionSQL() string { 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) { 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 { if err != nil {
return nil, err return nil, err
} }

View File

@ -32,7 +32,7 @@ func Status(db *sql.DB, dir string) error {
func printMigrationStatus(db *sql.DB, version int64, script string) { func printMigrationStatus(db *sql.DB, version int64, script string) {
var row MigrationRecord 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) e := db.QueryRow(q).Scan(&row.TStamp, &row.IsApplied)
if e != nil && e != sql.ErrNoRows { if e != nil && e != sql.ErrNoRows {

View File

@ -16,14 +16,14 @@ func Version(db *sql.DB, dir string) error {
return nil return nil
} }
var dbVersionTableName = "goose_db_version" var tableName = "goose_db_version"
// GetDBVersionTableName returns goose db version table name // TableName returns goose db version table name
func GetDBVersionTableName() string { func TableName() string {
return dbVersionTableName return tableName
} }
// SetDBVersionTableName set goose db version table name // SetTableName set goose db version table name
func SetDBVersionTableName(n string) { func SetTableName(n string) {
dbVersionTableName = n tableName = n
} }