From b7fd3077d1e389611678e65f28e86f8eba7ef721 Mon Sep 17 00:00:00 2001 From: Abigail Walthall Date: Wed, 16 Jan 2013 15:38:45 -0500 Subject: [PATCH 1/2] Fix Bug when finalizing the migration table when calling `goose up` for the first time --- migrate.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migrate.go b/migrate.go index 59d6938..e1b73be 100644 --- a/migrate.go +++ b/migrate.go @@ -243,10 +243,12 @@ func createVersionTable(db *sql.DB) error { // create the table and insert an initial value of 0 create := `CREATE TABLE goose_db_version ( + id int unsigned NOT NULL AUTO_INCREMENT, version_id bigint NOT NULL, is_applied boolean NOT NULL, tstamp timestamp NULL default now(), - PRIMARY KEY(tstamp) + PRIMARY KEY(id), + UNIQUE KEY id_tstamp (id, tstamp) );` insert := "INSERT INTO goose_db_version (version_id, is_applied) VALUES (0, true);" From 7b2d93c72a4f338b44ab1c431187d53990596166 Mon Sep 17 00:00:00 2001 From: Abigail Walthall Date: Wed, 16 Jan 2013 17:25:03 -0500 Subject: [PATCH 2/2] Order the results by the guaranteed unique `id` instead of the potentially non-unique `tstamp` --- migrate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrate.go b/migrate.go index e1b73be..e689ac4 100644 --- a/migrate.go +++ b/migrate.go @@ -192,7 +192,7 @@ func numericComponent(name string) (int64, error) { // Create and initialize the DB version table if it doesn't exist. func ensureDBVersion(db *sql.DB) (int64, error) { - rows, err := db.Query("SELECT version_id, is_applied from goose_db_version ORDER BY tstamp DESC;") + rows, err := db.Query("SELECT version_id, is_applied from goose_db_version ORDER BY id DESC;") if err != nil { // XXX: cross platform method to detect failure reason // for now, assume it was because the table didn't exist, and try to create it