From d038551fbdf3d5bb57dc5e82a6765b872560753c Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 29 Jan 2018 16:32:43 -0500 Subject: [PATCH] Revert "Removes unused consts from dbcore (#34711)" This reverts commit 1dc1bfcfef364feb3381ac0f54f489d38cc06fc9. --- code/controllers/subsystem/dbcore.dm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 5949b4b6508..00924538609 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -1,14 +1,26 @@ -#define FAILED_DB_CONNECTION_CUTOFF 5 -#define DM_DEFAULT_CURSOR 0 - SUBSYSTEM_DEF(dbcore) name = "Database" flags = SS_NO_FIRE init_order = INIT_ORDER_DBCORE + var/const/FAILED_DB_CONNECTION_CUTOFF = 5 + var/const/Default_Cursor = 0 + var/const/Client_Cursor = 1 + var/const/Server_Cursor = 2 + //conversions + var/const/TEXT_CONV = 1 + var/const/RSC_FILE_CONV = 2 + var/const/NUMBER_CONV = 3 + //column flag values: + var/const/IS_NUMERIC = 1 + var/const/IS_BINARY = 2 + var/const/IS_NOT_NULL = 4 + var/const/IS_PRIMARY_KEY = 8 + var/const/IS_UNSIGNED = 16 var/schema_mismatch = 0 var/db_minor = 0 var/db_major = 0 +// TODO: Investigate more recent type additions and see if I can handle them. - Nadrew var/_db_con// This variable contains a reference to the actual database connection. var/failed_connections = 0 @@ -64,7 +76,7 @@ SUBSYSTEM_DEF(dbcore) var/address = CONFIG_GET(string/address) var/port = CONFIG_GET(number/port) - _dm_db_connect(_db_con, "dbi:mysql:[db]:[address]:[port]", user, pass, DM_DEFAULT_CURSOR, null) + _dm_db_connect(_db_con, "dbi:mysql:[db]:[address]:[port]", user, pass, Default_Cursor, null) . = IsConnected() if (!.) log_sql("Connect() failed | [ErrorMsg()]") @@ -117,7 +129,7 @@ SUBSYSTEM_DEF(dbcore) return "Database disabled by configuration" return _dm_db_error_msg(_db_con) -/datum/controller/subsystem/dbcore/proc/NewQuery(sql_query, cursor_handler = DM_DEFAULT_CURSOR) +/datum/controller/subsystem/dbcore/proc/NewQuery(sql_query, cursor_handler = Default_Cursor) if(IsAdminAdvancedProcCall()) log_admin_private("ERROR: Advanced admin proc call led to sql query: [sql_query]. Query has been blocked") message_admins("ERROR: Advanced admin proc call led to sql query. Query has been blocked")