Delete database_changelog.txt.rej

This commit is contained in:
LetterJay
2017-09-06 09:17:02 -05:00
committed by GitHub
parent 3862fb5d5e
commit 31f7b42935

View File

@@ -1,36 +0,0 @@
diff a/SQL/database_changelog.txt b/SQL/database_changelog.txt (rejected hunks)
@@ -1,26 +1,20 @@
Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
-The latest database version is 3.2; The query to update the schema revision table is:
+The latest database version is 3.1; The query to update the schema revision table is:
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (3, 2);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (3, 1);
or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (3, 2);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (3, 1);
----------------------------------------------------
-18 August 2017, by nfreader, bump to 3.2
+18 August 2017, by Cyberboss and nfreader, bump to 3.1
-Modified table 'death', adding the column 'suicide'.
+Modified table 'death', adding the columns `last_words` and 'suicide'.
-ALTER TABLE `death` ADD COLUMN `suicide` tinyint(0) NOT NULL DEFAULT '0' AFTER `last_words`
-
-----------------------------------------------------
-
-16 August 2017, by Cyberboss, bump to 3.1
-
-Modified table 'death', adding the column 'last_words'.
-
-ALTER TABLE `death` ADD COLUMN `last_words` varchar(255) DEFAULT NULL AFTER `staminaloss`
+ALTER TABLE `death`
+ADD COLUMN `last_words` varchar(255) DEFAULT NULL AFTER `staminaloss`,
+ADD COLUMN `suicide` tinyint(0) NOT NULL DEFAULT '0' AFTER `last_words`;
----------------------------------------------------