diff --git a/.editorconfig b/.editorconfig index 8297856..9b7386a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,23 +1,23 @@ -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# 4 space indentation -[*.cpp,*.hpp] -indent_style = space -indent_size = 4 - -# Tabs in makefile -[Makefile] -indent_style = tab - -# Don't enforce anything in vendored code -[/vendor/**] -end_of_line = unset -insert_final_newline = unset -indent_style = unset -indent_style = unset \ No newline at end of file +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true + +# 4 space indentation +[*.cpp,*.hpp] +indent_style = space +indent_size = 4 + +# Tabs in makefile +[Makefile] +indent_style = tab + +# Don't enforce anything in vendored code +[/vendor/**] +end_of_line = unset +insert_final_newline = unset +indent_style = unset +indent_style = unset diff --git a/.gitattributes b/.gitattributes index da55d7f..304d9e9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ -vendor/* linguist-vendored - -# Always checkout source with LF line endings -src/*.c text eol=lf -src/*.h text eol=lf +vendor/* linguist-vendored + +# Always checkout source with LF line endings +src/*.c text eol=lf +src/*.h text eol=lf diff --git a/sql/migration2.sql b/sql/migration2.sql index b39d01e..e84a26a 100644 --- a/sql/migration2.sql +++ b/sql/migration2.sql @@ -1,37 +1,37 @@ -/* - It is recommended in the SQLite manual to turn off - foreign keys when making schema changes that involve them -*/ -PRAGMA foreign_keys=OFF; -BEGIN TRANSACTION; --- New table to store code items -CREATE TABLE RedeemedCodes( - PlayerID INTEGER NOT NULL, - Code TEXT NOT NULL, - FOREIGN KEY(PlayerID) REFERENCES Players(PlayerID) ON DELETE CASCADE, - UNIQUE (PlayerID, Code) -); --- Change Coordinates in Players table to non-plural form -ALTER TABLE Players RENAME COLUMN XCoordinates TO XCoordinate; -ALTER TABLE Players RENAME COLUMN YCoordinates TO YCoordinate; -ALTER TABLE Players RENAME COLUMN ZCoordinates TO ZCoordinate; --- Fix email attachments not being unique enough -CREATE TABLE Temp ( - PlayerID INTEGER NOT NULL, - MsgIndex INTEGER NOT NULL, - Slot INTEGER NOT NULL, - ID INTEGER NOT NULL, - Type INTEGER NOT NULL, - Opt INTEGER NOT NULL, - TimeLimit INTEGER NOT NULL, - FOREIGN KEY(PlayerID) REFERENCES Players(PlayerID) ON DELETE CASCADE, - UNIQUE (PlayerID, MsgIndex, Slot) -); -INSERT INTO Temp SELECT * FROM EmailItems; -DROP TABLE EmailItems; -ALTER TABLE Temp RENAME TO EmailItems; --- Update DB Version -UPDATE Meta SET Value = 3 WHERE Key = 'DatabaseVersion'; -UPDATE Meta SET Value = strftime('%s', 'now') WHERE Key = 'LastMigration'; -COMMIT; -PRAGMA foreign_keys=ON; +/* + It is recommended in the SQLite manual to turn off + foreign keys when making schema changes that involve them +*/ +PRAGMA foreign_keys=OFF; +BEGIN TRANSACTION; +-- New table to store code items +CREATE TABLE RedeemedCodes( + PlayerID INTEGER NOT NULL, + Code TEXT NOT NULL, + FOREIGN KEY(PlayerID) REFERENCES Players(PlayerID) ON DELETE CASCADE, + UNIQUE (PlayerID, Code) +); +-- Change Coordinates in Players table to non-plural form +ALTER TABLE Players RENAME COLUMN XCoordinates TO XCoordinate; +ALTER TABLE Players RENAME COLUMN YCoordinates TO YCoordinate; +ALTER TABLE Players RENAME COLUMN ZCoordinates TO ZCoordinate; +-- Fix email attachments not being unique enough +CREATE TABLE Temp ( + PlayerID INTEGER NOT NULL, + MsgIndex INTEGER NOT NULL, + Slot INTEGER NOT NULL, + ID INTEGER NOT NULL, + Type INTEGER NOT NULL, + Opt INTEGER NOT NULL, + TimeLimit INTEGER NOT NULL, + FOREIGN KEY(PlayerID) REFERENCES Players(PlayerID) ON DELETE CASCADE, + UNIQUE (PlayerID, MsgIndex, Slot) +); +INSERT INTO Temp SELECT * FROM EmailItems; +DROP TABLE EmailItems; +ALTER TABLE Temp RENAME TO EmailItems; +-- Update DB Version +UPDATE Meta SET Value = 3 WHERE Key = 'DatabaseVersion'; +UPDATE Meta SET Value = strftime('%s', 'now') WHERE Key = 'LastMigration'; +COMMIT; +PRAGMA foreign_keys=ON;