From 4541982d39d9ba067f3e52b86bf5be7e0f608efd Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 26 May 2017 16:14:21 -0500 Subject: [PATCH 1/4] Fix roundid --- code/world.dm.rej | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 code/world.dm.rej diff --git a/code/world.dm.rej b/code/world.dm.rej new file mode 100644 index 0000000000..629d1b0eb1 --- /dev/null +++ b/code/world.dm.rej @@ -0,0 +1,10 @@ +diff a/code/world.dm b/code/world.dm (rejected hunks) +@@ -56,7 +56,7 @@ + if(config.sql_enabled) + if(SSdbcore.Connect()) + log_world("Database connection established.") +- var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), INET_ATON('[world.internet_address]'), '[world.port]')") ++ var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") + query_round_start.Execute() + var/datum/DBQuery/query_round_last_id = SSdbcore.NewQuery("SELECT LAST_INSERT_ID()") + query_round_last_id.Execute() From 01ab250772ae38c4e80958900ce1d6d5b583b644 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 31 May 2017 00:02:23 -0500 Subject: [PATCH 2/4] commit --- code/world.dm | 4 ++-- code/world.dm.rej | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 code/world.dm.rej diff --git a/code/world.dm b/code/world.dm index 566c9e213c..31eed923a0 100644 --- a/code/world.dm +++ b/code/world.dm @@ -18,7 +18,7 @@ SetupExternalRSC() - GLOB.config_error_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl + GLOB.config_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once) @@ -57,7 +57,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(), IFNULL(MAX(round_id),0)+1, \"server_ip\", 0, \"[world.internet_address]:[world.port]\" FROM [format_table_name("feedback")]") + var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") 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() diff --git a/code/world.dm.rej b/code/world.dm.rej deleted file mode 100644 index 629d1b0eb1..0000000000 --- a/code/world.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/world.dm b/code/world.dm (rejected hunks) -@@ -56,7 +56,7 @@ - if(config.sql_enabled) - if(SSdbcore.Connect()) - log_world("Database connection established.") -- var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), INET_ATON('[world.internet_address]'), '[world.port]')") -+ var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") - query_round_start.Execute() - var/datum/DBQuery/query_round_last_id = SSdbcore.NewQuery("SELECT LAST_INSERT_ID()") - query_round_last_id.Execute() From 4f0ee1cbb8268ea2f5026c70e6936c3bff54cc20 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 31 May 2017 01:57:46 -0500 Subject: [PATCH 3/4] Update world.dm --- code/world.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/world.dm b/code/world.dm index b0c67806e2..ec03102218 100644 --- a/code/world.dm +++ b/code/world.dm @@ -59,9 +59,9 @@ log_world("Database connection established.") var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") - query_feedback_create_round.Execute() + query_round_start.Execute() var/datum/DBQuery/query_feedback_max_id = SSdbcore.NewQuery("SELECT MAX(round_id) FROM [format_table_name("feedback")]") - query_feedback_max_id.Execute() + query_round_last_id.Execute() if(query_feedback_max_id.NextRow()) GLOB.round_id = query_feedback_max_id.item[1] else @@ -281,4 +281,4 @@ if (features) s += ": [jointext(features, ", ")]" - status = s \ No newline at end of file + status = s From fbedba7c3f2e7b6354af3a112b6e06da162ef2e1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 31 May 2017 02:10:31 -0500 Subject: [PATCH 4/4] Update world.dm --- code/world.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/world.dm b/code/world.dm index ec03102218..43401b0c42 100644 --- a/code/world.dm +++ b/code/world.dm @@ -60,10 +60,10 @@ log_world("Database connection established.") var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") query_round_start.Execute() - var/datum/DBQuery/query_feedback_max_id = SSdbcore.NewQuery("SELECT MAX(round_id) FROM [format_table_name("feedback")]") + var/datum/DBQuery/query_round_last_id = SSdbcore.NewQuery("SELECT LAST_INSERT_ID()") query_round_last_id.Execute() - if(query_feedback_max_id.NextRow()) - GLOB.round_id = query_feedback_max_id.item[1] + if(query_round_last_id.NextRow()) + GLOB.round_id = query_round_last_id.item[1] else log_world("Your server failed to establish a connection with the database.")