diff --git a/sql/migration1.sql b/sql/migration1.sql index f51f128..acafb4d 100644 --- a/sql/migration1.sql +++ b/sql/migration1.sql @@ -1,8 +1,8 @@ BEGIN TRANSACTION; -- New Columns ALTER TABLE Accounts ADD BanReason TEXT DEFAULT '' NOT NULL; -ALTER TABLE RaceResults ADD RingCount INTEGER NOT NULL; -ALTER TABLE RaceResults ADD Time INTEGER NOT NULL; +ALTER TABLE RaceResults ADD RingCount INTEGER DEFAULT 0 NOT NULL; +ALTER TABLE RaceResults ADD Time INTEGER DEFAULT 0 NOT NULL; -- Fix timestamps in Meta INSERT INTO Meta (Key, Value) VALUES ('Created', 0); INSERT INTO Meta (Key, Value) VALUES ('LastMigration', strftime('%s', 'now')); @@ -11,7 +11,7 @@ UPDATE Meta SET Value = (SELECT Created FROM Meta WHERE Key = 'ProtocolVersion') CREATE TABLE Temp(Key TEXT NOT NULL UNIQUE, Value INTEGER NOT NULL); INSERT INTO Temp SELECT Key, Value FROM Meta; DROP TABLE Meta; -ALTER TABLE Temp Rename TO Meta; +ALTER TABLE Temp RENAME TO Meta; -- Update DB Version UPDATE Meta SET Value = 2 WHERE Key = 'DatabaseVersion'; UPDATE Meta SET Value = strftime('%s', 'now') WHERE Key = 'LastMigration'; diff --git a/src/Database.cpp b/src/Database.cpp index 2047a5a..a7cdca8 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -162,7 +162,7 @@ void Database::checkMetaTable() { int rc = sqlite3_exec(db, sql.c_str(), NULL, NULL, NULL); if (rc != SQLITE_OK) { - std::cout << "[FATAL] Failed to migrate database" << std::endl; + std::cout << "[FATAL] Failed to migrate database: " << sqlite3_errmsg(db) << std::endl; exit(1); } @@ -179,8 +179,7 @@ void Database::createMetaTable() { const char* sql = R"( CREATE TABLE Meta( Key TEXT NOT NULL UNIQUE, - Value INTEGER NOT NULL, - Created INTEGER DEFAULT (strftime('%s', 'now')) + Value INTEGER NOT NULL ); )"; sqlite3_stmt* stmt;