From 63c64a00f1ad983895137e7ada8cdc8979dd6577 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 21 May 2017 00:46:24 -0500 Subject: [PATCH 1/2] [MIRROR] >mysql (#987) * >mysql * Update dbcore.dm * Delete dbcore.dm.rej --- code/controllers/subsystem/dbcore.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 9c812192d8..ad4691564c 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -152,7 +152,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table sqlrowlist += "([row.Join(", ")])" sqlrowlist = " [sqlrowlist.Join(",\n ")]" - var/datum/DBQuery/Query = NewQuery("INSERT[ignore_errors][delayed] INTO [table]\n([columns.Join(", ")])\nVALUES\n[sqlrowlist]\n[duplicate_key]") + var/datum/DBQuery/Query = NewQuery("INSERT[delayed][ignore_errors] INTO [table]\n([columns.Join(", ")])\nVALUES\n[sqlrowlist]\n[duplicate_key]") if (warn) return Query.warn_execute() else From 883c5e034dd8845c48e816edbc09ef5e1d3ac49c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 21 May 2017 00:46:44 -0500 Subject: [PATCH 2/2] Fixes bootstrapping the feedback database (#1012) --- code/world.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/world.dm b/code/world.dm index 39d34dfd53..b8fbd4eddf 100644 --- a/code/world.dm +++ b/code/world.dm @@ -32,7 +32,7 @@ if(config.sql_enabled) if(SSdbcore.Connect()) log_world("Database connection established.") - var/datum/DBQuery/query_feedback_create_round = SSdbcore.NewQuery("INSERT INTO [format_table_name("feedback")] SELECT null, Now(), MAX(round_id)+1, \"server_ip\", 0, \"[world.internet_address]:[world.port]\" FROM [format_table_name("feedback")]") + var/datum/DBQuery/query_feedback_create_round = SSdbcore.NewQuery("INSERT INTO [format_table_name("feedback")] SELECT null, Now(), IFNULL(MAX(round_id),0)+1, \"server_ip\", 0, \"[world.internet_address]:[world.port]\" FROM [format_table_name("feedback")]") query_feedback_create_round.Execute() var/datum/DBQuery/query_feedback_max_id = SSdbcore.NewQuery("SELECT MAX(round_id) FROM [format_table_name("feedback")]") query_feedback_max_id.Execute()