shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2213 from Citadel-Station-13/upstream-merge-29606

Browse Source 
[MIRROR] Fixes the fruity pebbles in the code
This commit is contained in:
LetterJay
2017-08-14 22:18:28 -05:00
committed by GitHub
parent 62eee8804e 0c72b3ec53
commit 04a273eb8e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/world.dm
+3 -4
View File
@@ -58,12 +58,11 @@
/world/proc/CheckSchemaVersion()
if(config.sql_enabled)
if(SSdbcore.Connect())
log_world("Database connection established.")
var/datum/DBQuery/query_db_version = SSdbcore.NewQuery("SELECT major, minor FROM [format_table_name("schema_version")] ORDER BY date DESC LIMIT 1")
var/datum/DBQuery/query_db_version = SSdbcore.NewQuery("SELECT major, minor FROM [format_table_name("schema_revision")] ORDER BY date DESC LIMIT 1")
query_db_version.Execute()
if(query_db_version.NextRow())
var/db_major = query_db_version.item[1]
var/db_minor = query_db_version.item[2]
var/db_major = text2num(query_db_version.item[1])
var/db_minor = text2num(query_db_version.item[2])
if(db_major < DB_MAJOR_VERSION || db_minor < DB_MINOR_VERSION)
message_admins("Database schema ([db_major].[db_minor]) is behind latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
log_sql("Database schema ([db_major].[db_minor]) is behind latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
code/world.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/world.dm b/code/world.dm (rejected hunks)
@@ -59,7 +59,7 @@
if(config.sql_enabled)
if(SSdbcore.Connect())
log_world("Database connection established.")
- var/datum/DBQuery/query_db_version = SSdbcore.NewQuery("SELECT major, minor FROM [format_table_name("schema_version")] ORDER BY date DESC LIMIT 1")
+ var/datum/DBQuery/query_db_version = SSdbcore.NewQuery("SELECT major, minor FROM [format_table_name("schema_revision")] ORDER BY date DESC LIMIT 1")
query_db_version.Execute()
if(query_db_version.NextRow())
var/db_major = query_db_version.item[1]