edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 17:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "More SQL fixes"

Browse source 
This reverts commit a58ade137d.
This commit is contained in:
def 2019-01-06 10:59:29 +01:00
parent afbb741910
commit da2fe3cbbc
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/engine/server/sql_server.cpp
View file

@ -36,15 +36,7 @@ CSqlServer::~CSqlServer()
try try
{ {
if (m_pResults) if (m_pResults)
{
delete m_pResults; delete m_pResults;
m_pResults = 0;
}
if (m_pStatement)
{
delete m_pStatement;
m_pStatement = 0;
}
if (m_pConnection) if (m_pConnection)
{ {
delete m_pConnection; delete m_pConnection;
@ -128,7 +120,7 @@ bool CSqlServer::Connect()
} }
m_pConnection = m_pDriver->connect(connection_properties); m_pConnection = m_pDriver->connect(connection_properties);
// Create statement // Create Statement
m_pStatement = m_pConnection->createStatement(); m_pStatement = m_pConnection->createStatement();
if (m_SetUpDB) if (m_SetUpDB)
@ -208,20 +200,16 @@ void CSqlServer::CreateTables()
void CSqlServer::executeSql(const char *pCommand) void CSqlServer::executeSql(const char *pCommand)
{ {
scope_lock LockScope(&m_SqlLock);
m_pStatement->execute(pCommand); m_pStatement->execute(pCommand);
} }
void CSqlServer::executeSqlQuery(const char *pQuery) void CSqlServer::executeSqlQuery(const char *pQuery)
{ {
scope_lock LockScope(&m_SqlLock);
if (m_pResults) if (m_pResults)
{
delete m_pResults; delete m_pResults;
// set it to 0, so exceptions raised from executeQuery can not make m_pResults point to invalid memory // set it to 0, so exceptions raised from executeQuery can not make m_pResults point to invalid memory
m_pResults = 0; m_pResults = 0;
}
m_pResults = m_pStatement->executeQuery(pQuery); m_pResults = m_pStatement->executeQuery(pQuery);
} }