Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DBLayer: Prevent mixing databases with query holders

Browse Source
This commit is contained in:
Shauren
2019-07-27 11:45:56 +02:00
parent f6e2b8cdc1
commit 13440434c3
10 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/database/Database/QueryHolder.cpp
View File

@@ -21,7 +21,7 @@
#include "Log.h"
#include "QueryResult.h"
bool SQLQueryHolder::SetPreparedQuery(size_t index, PreparedStatementBase* stmt)
bool SQLQueryHolderBase::SetPreparedQueryImpl(size_t index, PreparedStatementBase* stmt)
{
if (m_queries.size() <= index)
{
@@ -33,7 +33,7 @@ bool SQLQueryHolder::SetPreparedQuery(size_t index, PreparedStatementBase* stmt)
return true;
}
PreparedQueryResult SQLQueryHolder::GetPreparedResult(size_t index)
PreparedQueryResult SQLQueryHolderBase::GetPreparedResult(size_t index)
{
// Don't call to this function if the index is of a prepared statement
if (index < m_queries.size())
@@ -42,7 +42,7 @@ PreparedQueryResult SQLQueryHolder::GetPreparedResult(size_t index)
return PreparedQueryResult(nullptr);
}
void SQLQueryHolder::SetPreparedResult(size_t index, PreparedResultSet* result)
void SQLQueryHolderBase::SetPreparedResult(size_t index, PreparedResultSet* result)
{
if (result && !result->GetRowCount())
{
@@ -55,7 +55,7 @@ void SQLQueryHolder::SetPreparedResult(size_t index, PreparedResultSet* result)
m_queries[index].second = PreparedQueryResult(result);
}
SQLQueryHolder::~SQLQueryHolder()
SQLQueryHolderBase::~SQLQueryHolderBase()
{
for (size_t i = 0; i < m_queries.size(); i++)
{
@@ -65,7 +65,7 @@ SQLQueryHolder::~SQLQueryHolder()
}
}
void SQLQueryHolder::SetSize(size_t size)
void SQLQueryHolderBase::SetSize(size_t size)
{
/// to optimize push_back, reserve the number of queries about to be executed
m_queries.resize(size);