From f7a67099d45cae68964975ac7b60892fdc468d39 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 27 Jul 2019 11:45:56 +0200 Subject: Core/DBLayer: Prevent mixing databases with query holders (cherry picked from commit 13440434c34da28a5106af8419aabc8e5783faf0) # Conflicts: # src/server/game/Server/WorldSession.cpp # src/server/game/Server/WorldSession.h --- src/server/database/Database/QueryHolder.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/database/Database/QueryHolder.cpp') diff --git a/src/server/database/Database/QueryHolder.cpp b/src/server/database/Database/QueryHolder.cpp index e9012cc9a90..dacd12913da 100644 --- a/src/server/database/Database/QueryHolder.cpp +++ b/src/server/database/Database/QueryHolder.cpp @@ -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 (std::pair& query : m_queries) { @@ -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); -- cgit v1.2.3