edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add print functionality to SQLite

Browse source
This commit is contained in:
Zwelf 2020-09-06 23:34:18 +02:00
parent 46b0ff354e
commit 88dc1c1a9c
5 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/server/databases/connection.h
View file

@ -58,6 +58,8 @@ public:
virtual void BindInt(int Idx, int Value) = 0; virtual void BindInt(int Idx, int Value) = 0;
virtual void BindFloat(int Idx, float Value) = 0; virtual void BindFloat(int Idx, float Value) = 0;
// Print expanded sql statement
virtual void Print() = 0;
// executes the query and returns if a result row exists and selects it // executes the query and returns if a result row exists and selects it
// when called multiple times the next row is selected // when called multiple times the next row is selected
virtual bool Step() = 0; virtual bool Step() = 0;

1
src/engine/server/databases/mysql.h
View file

@ -48,6 +48,7 @@ public:
virtual void BindInt(int Idx, int Value); virtual void BindInt(int Idx, int Value);
virtual void BindFloat(int Idx, float Value); virtual void BindFloat(int Idx, float Value);
virtual void Print() {}
virtual bool Step(); virtual bool Step();
virtual bool IsNull(int Col) const; virtual bool IsNull(int Col) const;

8
src/engine/server/databases/sqlite.cpp
View file

@ -26,7 +26,6 @@ CSqliteConnection::~CSqliteConnection()
m_pDb = nullptr; m_pDb = nullptr;
} }
void CSqliteConnection::Print(IConsole *pConsole, const char *Mode) void CSqliteConnection::Print(IConsole *pConsole, const char *Mode)
{ {
char aBuf[512]; char aBuf[512];
@ -36,7 +35,6 @@ void CSqliteConnection::Print(IConsole *pConsole, const char *Mode)
pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf); pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
} }
void CSqliteConnection::ToUnixTimestamp(const char *pTimestamp, char *aBuf, unsigned int BufferSize) void CSqliteConnection::ToUnixTimestamp(const char *pTimestamp, char *aBuf, unsigned int BufferSize)
{ {
str_format(aBuf, BufferSize, "strftime('%%s', %s)", pTimestamp); str_format(aBuf, BufferSize, "strftime('%%s', %s)", pTimestamp);
@ -156,6 +154,12 @@ void CSqliteConnection::BindFloat(int Idx, float Value)
m_Done = false; m_Done = false;
} }
void CSqliteConnection::Print()
{
if(m_pStmt != nullptr)
dbg_msg("sql", "SQLite statement: %s", sqlite3_expanded_sql(m_pStmt));
}
bool CSqliteConnection::Step() bool CSqliteConnection::Step()
{ {
if(m_Done) if(m_Done)

1
src/engine/server/databases/sqlite.h
View file

@ -35,6 +35,7 @@ public:
virtual void BindInt(int Idx, int Value); virtual void BindInt(int Idx, int Value);
virtual void BindFloat(int Idx, float Value); virtual void BindFloat(int Idx, float Value);
virtual void Print();
virtual bool Step(); virtual bool Step();
virtual bool IsNull(int Col) const; virtual bool IsNull(int Col) const;

5
src/game/server/score.cpp
View file

@ -535,6 +535,7 @@ bool CScore::SaveScoreThread(IDbConnection *pSqlServer, const ISqlData *pGameDat
pSqlServer->BindString(3, pData->m_aTimestamp); pSqlServer->BindString(3, pData->m_aTimestamp);
pSqlServer->BindString(4, g_Config.m_SvSqlServerName); pSqlServer->BindString(4, g_Config.m_SvSqlServerName);
pSqlServer->BindString(5, pData->m_GameUuid); pSqlServer->BindString(5, pData->m_GameUuid);
pSqlServer->Print();
pSqlServer->Step(); pSqlServer->Step();
pData->m_pResult->m_Done = true; pData->m_pResult->m_Done = true;
@ -617,6 +618,7 @@ bool CScore::SaveTeamScoreThread(IDbConnection *pSqlServer, const ISqlData *pGam
pSqlServer->BindString(1, pData->m_aTimestamp); pSqlServer->BindString(1, pData->m_aTimestamp);
pSqlServer->BindString(2, pData->m_GameUuid); pSqlServer->BindString(2, pData->m_GameUuid);
pSqlServer->BindBlob(3, Teamrank.m_TeamID.m_aData, sizeof(Teamrank.m_TeamID.m_aData)); pSqlServer->BindBlob(3, Teamrank.m_TeamID.m_aData, sizeof(Teamrank.m_TeamID.m_aData));
pSqlServer->Print();
pSqlServer->Step(); pSqlServer->Step();
} }
} }
@ -637,6 +639,7 @@ bool CScore::SaveTeamScoreThread(IDbConnection *pSqlServer, const ISqlData *pGam
pSqlServer->BindString(3, pData->m_aTimestamp); pSqlServer->BindString(3, pData->m_aTimestamp);
pSqlServer->BindBlob(4, GameID.m_aData, sizeof(GameID.m_aData)); pSqlServer->BindBlob(4, GameID.m_aData, sizeof(GameID.m_aData));
pSqlServer->BindString(5, pData->m_GameUuid); pSqlServer->BindString(5, pData->m_GameUuid);
pSqlServer->Print();
pSqlServer->Step(); pSqlServer->Step();
} }
} }
@ -1324,6 +1327,7 @@ bool CScore::SaveTeamThread(IDbConnection *pSqlServer, const ISqlData *pGameData
pSqlServer->BindString(3, Code); pSqlServer->BindString(3, Code);
pSqlServer->BindString(4, pData->m_Server); pSqlServer->BindString(4, pData->m_Server);
pSqlServer->BindString(5, aSaveID); pSqlServer->BindString(5, aSaveID);
pSqlServer->Print();
pSqlServer->Step(); pSqlServer->Step();
if(!Failure) if(!Failure)
@ -1498,6 +1502,7 @@ bool CScore::LoadTeamThread(IDbConnection *pSqlServer, const ISqlData *pGameData
pSqlServer->PrepareStatement(aBuf); pSqlServer->PrepareStatement(aBuf);
pSqlServer->BindString(1, pData->m_Code); pSqlServer->BindString(1, pData->m_Code);
pSqlServer->BindString(2, pData->m_Map); pSqlServer->BindString(2, pData->m_Map);
pSqlServer->Print();
pSqlServer->Step(); pSqlServer->Step();
pData->m_pResult->m_Status = CScoreSaveResult::LOAD_SUCCESS; pData->m_pResult->m_Status = CScoreSaveResult::LOAD_SUCCESS;