Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/DBLayer: Prevent using prepared statements on wrong database

Browse Source
This commit is contained in:
Shauren authored and Ovahlord committed 2020-04-15 19:18:58 +02:00
1 parent eaee7b3cfa
commit d003ebd8e4
98 files changed
+569 -541
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/database/Database/DatabaseWorkerPool.cpp
+7 -7
View File
@@ -184,7 +184,7 @@ QueryResult DatabaseWorkerPool<T>::Query(char const* sql, T* connection /*= null
}
template <class T>
PreparedQueryResult DatabaseWorkerPool<T>::Query(PreparedStatement* stmt)
PreparedQueryResult DatabaseWorkerPool<T>::Query(PreparedStatement<T>* stmt)
{
auto connection = GetFreeConnection();
PreparedResultSet* ret = connection->Query(stmt);
@@ -213,7 +213,7 @@ QueryCallback DatabaseWorkerPool<T>::AsyncQuery(char const* sql)
}
template <class T>
QueryCallback DatabaseWorkerPool<T>::AsyncQuery(PreparedStatement* stmt)
QueryCallback DatabaseWorkerPool<T>::AsyncQuery(PreparedStatement<T>* stmt)
{
PreparedStatementTask* task = new PreparedStatementTask(stmt, true);
// Store future result before enqueueing - task might get already processed and deleted before returning from this method
@@ -292,9 +292,9 @@ void DatabaseWorkerPool<T>::DirectCommitTransaction(SQLTransaction& transaction)
}
template <class T>
PreparedStatement* DatabaseWorkerPool<T>::GetPreparedStatement(PreparedStatementIndex index)
PreparedStatement<T>* DatabaseWorkerPool<T>::GetPreparedStatement(PreparedStatementIndex index)
{
return new PreparedStatement(index, _preparedStatementSize[index]);
return new PreparedStatement<T>(index, _preparedStatementSize[index]);
}
template <class T>
@@ -419,7 +419,7 @@ void DatabaseWorkerPool<T>::Execute(char const* sql)
}
template <class T>
void DatabaseWorkerPool<T>::Execute(PreparedStatement* stmt)
void DatabaseWorkerPool<T>::Execute(PreparedStatement<T>* stmt)
{
PreparedStatementTask* task = new PreparedStatementTask(stmt);
Enqueue(task);
@@ -437,7 +437,7 @@ void DatabaseWorkerPool<T>::DirectExecute(char const* sql)
}
template <class T>
void DatabaseWorkerPool<T>::DirectExecute(PreparedStatement* stmt)
void DatabaseWorkerPool<T>::DirectExecute(PreparedStatement<T>* stmt)
{
T* connection = GetFreeConnection();
connection->Execute(stmt);
@@ -457,7 +457,7 @@ void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, char const* s
}
template <class T>
void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, PreparedStatement* stmt)
void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, PreparedStatement<T>* stmt)
{
if (!trans)
Execute(stmt);