removes gender, adds round_id and splits up coord columns

silicons · Jun 8, 2017 · 689dc51 · 689dc51
1 parent 17bbe25
commit 689dc51
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt
@@ -1,3 +1,19 @@
+8 June 2017, by Jordie0608
+
+Modified table 'death', adding column 'round_id', removing column 'gender' and replacing column 'coord' with the columns 'x_coord', 'y_coord' and 'z_coord'.
+
+START TRANSACTION;
+ALTER TABLE `feedback`.`death` DROP COLUMN `gender`, ADD COLUMN `x_coord` SMALLINT(5) UNSIGNED NOT NULL AFTER `coord`, ADD COLUMN `y_coord` SMALLINT(5) UNSIGNED NOT NULL AFTER `x_coord`, ADD COLUMN `z_coord` SMALLINT(5) UNSIGNED NOT NULL AFTER `y_coord`, ADD COLUMN `round_id` INT(11) NOT NULL AFTER `server_port`;
+SET SQL_SAFE_UPDATES = 0;
+UPDATE `feedback`.`death` SET `x_coord` = SUBSTRING_INDEX(`coord`, ',', 1), `y_coord` = SUBSTRING_INDEX(SUBSTRING_INDEX(`coord`, ',', 2), ',', -1), `z_coord` = SUBSTRING_INDEX(`coord`, ',', -1);
+SET SQL_SAFE_UPDATES = 1;
+ALTER TABLE `feedback`.`death` DROP COLUMN `coord`;
+COMMIT;
+
+Remember to add a prefix to the table name if you use them.
+
+---------------------------------------------------
+
 30 May 2017, by MrStonedOne
 
 Z levels changed, this query allows you to convert old ss13 death records:

diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql
@@ -130,18 +130,20 @@ DROP TABLE IF EXISTS `death`;
 CREATE TABLE `death` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `pod` varchar(50) NOT NULL,
-  `coord` varchar(32) NOT NULL,
+  `x_coord` smallint(5) unsigned NOT NULL,
+  `y_coord` smallint(5) unsigned NOT NULL,
+  `z_coord` smallint(5) unsigned NOT NULL,
   `mapname` varchar(32) NOT NULL,
   `server_ip` int(10) unsigned NOT NULL,
   `server_port` smallint(5) unsigned NOT NULL,
+  `round_id` int(11) NOT NULL
   `tod` datetime NOT NULL COMMENT 'Time of death',
   `job` varchar(32) NOT NULL,
   `special` varchar(32) DEFAULT NULL,
   `name` varchar(96) NOT NULL,
   `byondkey` varchar(32) NOT NULL,
   `laname` varchar(96) DEFAULT NULL,
   `lakey` varchar(32) DEFAULT NULL,
-  `gender` enum('neuter','male','female','plural') NOT NULL,
   `bruteloss` smallint(5) unsigned NOT NULL,
   `brainloss` smallint(5) unsigned NOT NULL,
   `fireloss` smallint(5) unsigned NOT NULL,

diff --git a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql
@@ -130,18 +130,20 @@ DROP TABLE IF EXISTS `SS13_death`;
 CREATE TABLE `SS13_death` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `pod` varchar(50) NOT NULL,
-  `coord` varchar(32) NOT NULL,
+  `x_coord` smallint(5) unsigned NOT NULL,
+  `y_coord` smallint(5) unsigned NOT NULL,
+  `z_coord` smallint(5) unsigned NOT NULL,
   `mapname` varchar(32) NOT NULL,
   `server_ip` int(10) unsigned NOT NULL,
   `server_port` smallint(5) unsigned NOT NULL,
+  `round_id` int(11) NOT NULL
   `tod` datetime NOT NULL COMMENT 'Time of death',
   `job` varchar(32) NOT NULL,
   `special` varchar(32) DEFAULT NULL,
   `name` varchar(96) NOT NULL,
   `byondkey` varchar(32) NOT NULL,
   `laname` varchar(96) DEFAULT NULL,
   `lakey` varchar(32) DEFAULT NULL,
-  `gender` enum('neuter','male','female','plural') NOT NULL,
   `bruteloss` smallint(5) unsigned NOT NULL,
   `brainloss` smallint(5) unsigned NOT NULL,
   `fireloss` smallint(5) unsigned NOT NULL,

diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
@@ -168,17 +168,18 @@ SUBSYSTEM_DEF(blackbox)
 		var/mob/LA = L.lastattacker
 		laname = sanitizeSQL(LA.real_name)
 		lakey = sanitizeSQL(LA.key)
-	var/sqlgender = sanitizeSQL(L.gender)
 	var/sqlbrute = sanitizeSQL(L.getBruteLoss())
 	var/sqlfire = sanitizeSQL(L.getFireLoss())
 	var/sqlbrain = sanitizeSQL(L.getBrainLoss())
 	var/sqloxy = sanitizeSQL(L.getOxyLoss())
 	var/sqltox = sanitizeSQL(L.getStaminaLoss())
 	var/sqlclone = sanitizeSQL(L.getStaminaLoss())
 	var/sqlstamina = sanitizeSQL(L.getStaminaLoss())
-	var/coord = sanitizeSQL("[L.x], [L.y], [L.z]")
+	var/x_coord = sanitizeSQL(L.x)
+	var/y_coord = sanitizeSQL(L.y)
+	var/z_coord = sanitizeSQL(L.z)
 	var/map = sanitizeSQL(SSmapping.config.map_name)
-	var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')")
+	var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss) VALUES ('[sqlpod]', '[x_coord]', '[y_coord]', '[z_coord]', '[map]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', [GLOB.round_id], '[SQLtime()]', '[sqljob]', '[sqlspecial]', '[sqlname]', '[sqlkey]', '[laname]', '[lakey]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina])")
 	query_report_death.Execute()