← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/rutabaga:fix-migrate-db into rutabaga:master

 

Colin Watson has proposed merging ~cjwatson/rutabaga:fix-migrate-db into rutabaga:master.

Commit message:
db: Don't fail migration if Token table already exists

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/rutabaga/+git/rutabaga/+merge/441591

The database migration handling in this project is very crude and needs to be entirely rewritten, but this should fix a problem that's blocking deployments for the moment.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/rutabaga:fix-migrate-db into rutabaga:master.
diff --git a/db/rutabaga.schema b/db/rutabaga.schema
index d7cdd77..7cd04ff 100644
--- a/db/rutabaga.schema
+++ b/db/rutabaga.schema
@@ -1,5 +1,5 @@
 BEGIN TRANSACTION;
-CREATE TABLE Token
+CREATE TABLE IF NOT EXISTS Token
 (
 id INTEGER PRIMARY KEY AUTOINCREMENT,
 secret VARCHAR(255),
@@ -7,4 +7,4 @@ username VARCHAR(255) UNIQUE,
 timestamp TEXT,
 valid INTEGER DEFAULT 1
 );
-COMMIT;
\ No newline at end of file
+COMMIT;