Merge branch 'master' into upstream-merge-37665

SQL/database_changelog.txt

@@ -1,25 +1,15 @@
 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.
 
-<<<<<<< HEAD
-The latest database version is 4.1; The query to update the schema revision table is:
-
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (4, 1);
-or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (4, 1);
-=======
 The latest database version is 4.4; The query to update the schema revision table is:
 
 INSERT INTO `schema_revision` (`major`, `minor`) VALUES (4, 4);
 or
 INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (4, 4);
->>>>>>> 37854a5... Splits up round table initialize, start, end and shutdown (#37665)
 
 In any query remember to add a prefix to the table names if you use one.
 
 ----------------------------------------------------
 
-<<<<<<< HEAD
-=======
 Version 4.4, 9 May 2018, by Jordie0608
 Modified table `round`, renaming column `start_datetime` to `initialize_datetime` and `end_datetime` to `shutdown_datetime` and adding columns to replace both under the same name in preparation for changes to TGS server initialization.
 
@@ -60,7 +50,6 @@ ALTER TABLE `admin_log`
 
 ----------------------------------------------------
 
->>>>>>> 37854a5... Splits up round table initialize, start, end and shutdown (#37665)
 Version 4.1, 3 February 2018, by Jordie0608
 Modified tables 'admin', 'admin_log' and 'admin_rank', removing unnecessary columns and adding support for excluding rights flags from admin ranks.
 This change was made to enable use of sql-based admin loading.
@@ -92,7 +81,6 @@ ALTER TABLE `admin_ranks`
 	DROP PRIMARY KEY,
 	ADD PRIMARY KEY (`rank`);
 
-
 ----------------------------------------------------
 
 Version 4.0, 12 November 2017, by Jordie0608

SQL/tgstation_schema.sql

@@ -33,9 +33,11 @@ DROP TABLE IF EXISTS `admin_log`;
 CREATE TABLE `admin_log` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `datetime` datetime NOT NULL,
+  `round_id` int(11) unsigned NOT NULL,
   `adminckey` varchar(32) NOT NULL,
   `adminip` int(10) unsigned NOT NULL,
   `operation` enum('add admin','remove admin','change admin rank','add rank','remove rank','change rank flags') NOT NULL,
+  `target` varchar(32) NOT NULL,
   `log` varchar(1000) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;

SQL/tgstation_schema_prefixed.sql

@@ -33,9 +33,11 @@ DROP TABLE IF EXISTS `SS13_admin_log`;
 CREATE TABLE `SS13_admin_log` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `datetime` datetime NOT NULL,
+  `round_id` int(11) unsigned NOT NULL,
   `adminckey` varchar(32) NOT NULL,
   `adminip` int(10) unsigned NOT NULL,
   `operation` enum('add admin','remove admin','change admin rank','add rank','remove rank','change rank flags') NOT NULL,
+  `target` varchar(32) NOT NULL,
   `log` varchar(1000) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;