Fixed SQL error on new setups.

This commit is contained in:
shavit 2018-05-13 21:14:10 +03:00
parent 1ba79fcc09
commit a1a318b007
2 changed files with 11 additions and 5 deletions

View File

@ -41,6 +41,7 @@ Handle gH_OnWorstRecord = null;
// database handle // database handle
Database gH_SQL = null; Database gH_SQL = null;
bool gB_Connected = false;
bool gB_MySQL = false; bool gB_MySQL = false;
// cache // cache
@ -301,7 +302,7 @@ public void OnLibraryRemoved(const char[] name)
public void OnMapStart() public void OnMapStart()
{ {
if(gH_SQL == null) if(gH_SQL == null || !gB_Connected)
{ {
return; return;
} }
@ -1979,7 +1980,7 @@ public void SQL_CreateTable_Callback(Database db, DBResultSet results, const cha
gH_SQL.Query(SQL_TableMigration4_Callback, sQuery); gH_SQL.Query(SQL_TableMigration4_Callback, sQuery);
FormatEx(sQuery, 64, "SELECT perfs FROM %splayertimes LIMIT 1;", gS_MySQLPrefix); FormatEx(sQuery, 64, "SELECT perfs FROM %splayertimes LIMIT 1;", gS_MySQLPrefix);
gH_SQL.Query(SQL_TableMigration5_Callback, sQuery); gH_SQL.Query(SQL_TableMigration5_Callback, sQuery, 0, DBPrio_Low);
} }
public void SQL_TableMigration1_Callback(Database db, DBResultSet results, const char[] error, any data) public void SQL_TableMigration1_Callback(Database db, DBResultSet results, const char[] error, any data)
@ -2078,6 +2079,7 @@ public void SQL_TableMigration5_Callback(Database db, DBResultSet results, const
return; return;
} }
gB_Connected = true;
OnMapStart(); OnMapStart();
} }
@ -2090,6 +2092,7 @@ public void SQL_AlterTable5_Callback(Database db, DBResultSet results, const cha
return; return;
} }
gB_Connected = true;
OnMapStart(); OnMapStart();
} }

View File

@ -37,6 +37,7 @@
EngineVersion gEV_Type = Engine_Unknown; EngineVersion gEV_Type = Engine_Unknown;
Database gH_SQL = null; Database gH_SQL = null;
bool gB_Connected = false;
bool gB_MySQL = false; bool gB_MySQL = false;
char gS_Map[160]; char gS_Map[160];
@ -553,7 +554,7 @@ void LoadZoneSettings()
public void OnMapStart() public void OnMapStart()
{ {
if(gH_SQL == null) if(gH_SQL == null || !gB_Connected)
{ {
return; return;
} }
@ -2005,7 +2006,7 @@ public Action Timer_DrawEverything(Handle Timer)
} }
static int iCycle = 0; static int iCycle = 0;
int iMaxZonesPerFrame = (gB_FlatZones)? 16:5; static int iMaxZonesPerFrame = 5;
if(iCycle >= gI_MapZones) if(iCycle >= gI_MapZones)
{ {
@ -2307,7 +2308,7 @@ public void SQL_CreateTable_Callback(Database db, DBResultSet results, const cha
gH_SQL.Query(SQL_TableMigration1_Callback, sQuery); gH_SQL.Query(SQL_TableMigration1_Callback, sQuery);
FormatEx(sQuery, 64, "SELECT track FROM %smapzones LIMIT 1;", gS_MySQLPrefix); FormatEx(sQuery, 64, "SELECT track FROM %smapzones LIMIT 1;", gS_MySQLPrefix);
gH_SQL.Query(SQL_TableMigration2_Callback, sQuery); gH_SQL.Query(SQL_TableMigration2_Callback, sQuery, 0, DBPrio_Low);
} }
public void SQL_TableMigration1_Callback(Database db, DBResultSet results, const char[] error, any data) public void SQL_TableMigration1_Callback(Database db, DBResultSet results, const char[] error, any data)
@ -2367,6 +2368,7 @@ public void SQL_TableMigration2_Callback(Database db, DBResultSet results, const
return; return;
} }
gB_Connected = true;
OnMapStart(); OnMapStart();
} }
@ -2380,6 +2382,7 @@ public void SQL_AlterTable2_Callback(Database db, DBResultSet results, const cha
return; return;
} }
gB_Connected = true;
OnMapStart(); OnMapStart();
} }