cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream-merge-16484 [MDB IGNORE] (#9289)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Selis
2024-10-25 21:39:18 +02:00
committed by GitHub
parent b32c1ed032
commit 026253a175
277 changed files with 471452 additions and 36179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/defines/procs/dbcore.dm
View File

@@ -56,7 +56,7 @@ var/DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is
_db_con = _dm_db_new_con()
/DBConnection/proc/Connect(dbi_handler=src.dbi,user_handler=src.user,password_handler=src.password,cursor_handler)
if(!config.sql_enabled)
if(!CONFIG_GET(flag/sql_enabled))
return 0
if(!src) return 0
cursor_handler = src.default_cursor
@@ -66,7 +66,7 @@ var/DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is
/DBConnection/proc/Disconnect() return _dm_db_close(_db_con)
/DBConnection/proc/IsConnected()
if(!config.sql_enabled) return 0
if(!CONFIG_GET(flag/sql_enabled)) return 0
var/success = _dm_db_is_connected(_db_con)
return success
@@ -76,8 +76,8 @@ var/DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is
/DBConnection/proc/SelectDB(database_name,dbi)
if(IsConnected()) Disconnect()
//return Connect("[dbi?"[dbi]":"dbi:mysql:[database_name]:[DB_SERVER]:[DB_PORT]"]",user,password)
return Connect("[dbi?"[dbi]":"dbi:mysql:[database_name]:[sqladdress]:[sqlport]"]",user,password)
/DBConnection/proc/NewQuery(sql_query,cursor_handler=src.default_cursor) return new/datum/db_query(sql_query,src,cursor_handler)
return Connect("[dbi?"[dbi]":"dbi:mysql:[database_name]:[CONFIG_GET(string/address)]:[CONFIG_GET(number/port)]"]",user,password)
/DBConnection/proc/NewQuery(sql_query,cursor_handler=src.default_cursor) return new/DBQuery(sql_query,src,cursor_handler)
/datum/db_query/New(sql_query,DBConnection/connection_handler,cursor_handler)

12
code/defines/procs/statistics.dm
View File

@@ -1,5 +1,5 @@
/proc/sql_poll_population()
if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit
if(!CONFIG_GET(flag/enable_stat_tracking))
return
var/admincount = GLOB.admins.len
var/playercount = 0
@@ -19,15 +19,15 @@
/proc/sql_report_round_start()
// TODO
if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit
if(!CONFIG_GET(flag/enable_stat_tracking))
return
/proc/sql_report_round_end()
// TODO
if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit
if(!CONFIG_GET(flag/enable_stat_tracking))
return
/proc/sql_report_death(var/mob/living/carbon/human/H)
if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit
if(!CONFIG_GET(flag/enable_stat_tracking))
return
if(!H)
return
@@ -62,7 +62,7 @@
/proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H)
if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit
if(!CONFIG_GET(flag/enable_stat_tracking))
return
if(!H)
return
@@ -98,7 +98,7 @@
/proc/statistic_cycle()
set waitfor = 0
if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit
if(!CONFIG_GET(flag/enable_stat_tracking))
return
while(1)
sql_poll_population()