sql test

Author: vode-code

cev_eris.dme

@@ -30,6 +30,7 @@
 #include "code\__DEFINES\craft.dm"
 #include "code\__DEFINES\cyborg_traits.dm"
 #include "code\__DEFINES\damage_organs.dm"
+#include "code\__DEFINES\database.dm"
 #include "code\__DEFINES\economy.dm"
 #include "code\__DEFINES\error_handler.dm"
 #include "code\__DEFINES\flags.dm"
@@ -226,6 +227,7 @@
 #include "code\controllers\subsystems\chemistry.dm"
 #include "code\controllers\subsystems\chunks.dm"
 #include "code\controllers\subsystems\craft.dm"
+#include "code\controllers\subsystems\database.dm"
 #include "code\controllers\subsystems\dcs.dm"
 #include "code\controllers\subsystems\economy.dm"
 #include "code\controllers\subsystems\evac.dm"
@@ -527,7 +529,6 @@
 #include "code\defines\obj.dm"
 #include "code\defines\procs\announce.dm"
 #include "code\defines\procs\AStar.dm"
-#include "code\defines\procs\dbcore.dm"
 #include "code\defines\procs\hud.dm"
 #include "code\defines\procs\radio.dm"
 #include "code\defines\procs\sd_Alert.dm"
@@ -1425,6 +1426,7 @@
 #include "code\modules\admin\verbs\possess.dm"
 #include "code\modules\admin\verbs\pray.dm"
 #include "code\modules\admin\verbs\randomverbs.dm"
+#include "code\modules\admin\verbs\reestablish_db_connection.dm"
 #include "code\modules\admin\verbs\ticklag.dm"
 #include "code\modules\admin\verbs\tripAI.dm"
 #include "code\modules\admin\verbs\SDQL_2\SDQL_2.dm"

code/__DEFINES/subsystems-priority.dm

@@ -16,7 +16,8 @@ var/list/bitflags = list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096
 #define SS_PRIORITY_TICKER			200	// Gameticker processing.
 #define FIRE_PRIORITY_TGUI 110
 #define FIRE_PRIORITY_EXPLOSIONS 105 // Explosions!
-#define FIRE_PRIORITY_THROWING 106 // Throwing! after explosions since they influence throw direction
+#define FIRE_PRIORITY_DATABASE 104
+#define FIRE_PRIORITY_THROWING 103 // Throwing! after explosions since they influence throw direction
 #define SS_PRIORITY_HUMAN			101	// Human Life().
 #define SS_PRIORITY_MOB				100	// Non-human Mob Life().
 #define SS_PRIORITY_CHAT			100 // Chat subsystem.

code/__DEFINES/subsystems.dm

@@ -1,4 +1,13 @@
 
+//! ## DB defines
+/**
+ * DB schema version
+ *
+ * Update this whenever the db schema changes
+ */
+#define DB_SCHEMA_VERSION 1
+
+
 //! ## Timing subsystem
 /**
  * Don't run if there is an identical unique timer active
@@ -88,6 +97,7 @@
 // The numbers just define the ordering, they are meaningless otherwise.
 
 #define INIT_ORDER_GARBAGE 99
+#define INIT_ORDER_DBCORE 98
 #define INIT_ORDER_EXPLOSIONS 97
 #define INIT_ORDER_STATPANELS 96
 #define INIT_ORDER_MAPPING 15

code/__HELPERS/text.dm

@@ -13,10 +13,8 @@
  * SQL sanitization
  */
 
-// Run all strings to be used in an SQL query through this proc first to properly escape out injection attempts.
-/proc/sanitizeSQL(var/t as text)
-	var/sqltext = dbcon.Quote(t);
-	return copytext(sqltext, 2, length(sqltext));//Quote() adds quotes around input, we already do that
+/proc/format_table_name(table as text)
+	return sql_tableprefix + table
 
 /*
  * Text sanitization

code/controllers/configuration.dm

@@ -807,13 +807,25 @@ GLOBAL_LIST_EMPTY(storyteller_cache)
 			if ("address")
 				sqladdress = value
 			if ("port")
-				sqlport = value
+				sqlport = text2num(value)
 			if ("database")
 				sqldb = value
 			if ("login")
 				sqllogin = value
 			if ("password")
 				sqlpass = value
+			if ("sql_tableprefix")
+				sql_tableprefix = value
+			if ("async_query_timeout")
+				sql_async_query_timeout = text2num(value)
+			if ("blocking_query_timeout")
+				sql_blocking_query_timeout = text2num(value)
+			if ("pooling_min_sql_connections")
+				sql_pooling_min_sql_connections = text2num(value)
+			if ("pooling_max_sql_connections")
+				sql_pooling_max_sql_connections = text2num(value)
+			if ("max_concurrent_queries")
+				sql_max_concurrent_queries = text2num(value)
 			else
 				log_misc("Unknown setting in configuration: '[name]'")
 

code/datums/topic/admin.dm

@@ -1353,6 +1353,24 @@
 	else
 		error_viewer.showTo(usr, null, input["viewruntime_linear"])
 
+/datum/admin_topic/slowquery
+	keyword = "slowquery"
+	require_perms = list(R_ADMIN)
+
+/datum/admin_topic/viewruntime/Run(list/input)
+	if(!check_rights(R_ADMIN))
+		return
+
+	var/data = list("key" = usr.key)
+	var/answer = input["slowquery"]
+	if(answer == "yes")
+		if(alert(usr, "Did you just press any admin buttons?", "Query server hang report", list("Yes", "No")) == "Yes")
+			var/response = input(usr,"What were you just doing?","Query server hang report") as null|text
+			if(response)
+				data["response"] = response
+		log_misc("SQL: server hang - [json_encode(data)]")
+	else if(answer == "no")
+		log_misc("SQL: no server hang - [json_encode(data)]")
 
 /datum/admin_topic/admincaster
 	keyword = "admincaster"