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/Database: Replace union with std::variant in Transaction

Browse Source
This commit is contained in:
Shauren
2023-12-27 00:14:12 +01:00
parent 13dc139742
commit 3a9cbd217a
4 changed files with 28 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/database/Database/Transaction.cpp
View File

@@ -16,6 +16,7 @@
*/
#include "Transaction.h"
#include "Errors.h"
#include "Log.h"
#include "MySQLConnection.h"
#include "PreparedStatement.h"
@@ -32,19 +33,15 @@ std::mutex TransactionTask::_deadlockLock;
//- Append a raw ad-hoc query to the transaction
void TransactionBase::Append(char const* sql)
{
SQLElementData data;
data.type = SQL_ELEMENT_RAW;
data.element.query = strdup(sql);
m_queries.push_back(data);
ASSERT(sql);
m_queries.emplace_back(std::in_place_type<std::string>, sql);
}
//- Append a prepared statement to the transaction
void TransactionBase::AppendPreparedStatement(PreparedStatementBase* stmt)
{
SQLElementData data;
data.type = SQL_ELEMENT_PREPARED;
data.element.stmt = stmt;
m_queries.push_back(data);
ASSERT(stmt);
m_queries.emplace_back(std::in_place_type<std::unique_ptr<PreparedStatementBase>>, stmt);
}
void TransactionBase::Cleanup()
@@ -53,19 +50,6 @@ void TransactionBase::Cleanup()
if (_cleanedUp)
return;
for (SQLElementData const& data : m_queries)
{
switch (data.type)
{
case SQL_ELEMENT_PREPARED:
delete data.element.stmt;
break;
case SQL_ELEMENT_RAW:
free((void*)(data.element.query));
break;
}
}
m_queries.clear();
_cleanedUp = true;
}