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

19
src/server/database/Database/Transaction.h
View File

@@ -20,14 +20,25 @@
#include "Define.h"
#include "DatabaseEnvFwd.h"
#include "SQLOperation.h"
#include "StringFormat.h"
#include <functional>
#include <mutex>
#include <variant>
#include <vector>
class MySQLConnection;
struct TransactionData
{
std::variant<std::unique_ptr<PreparedStatementBase>, std::string> query;
template<typename... Args>
TransactionData(Args&&... args) : query(std::forward<Args>(args)...) { }
static PreparedStatementBase* ToExecutable(std::unique_ptr<PreparedStatementBase> const& stmt) { return stmt.get(); }
static char const* ToExecutable(std::string const& sql) { return sql.c_str(); }
};
/*! Transactions, high level class. */
class TC_DATABASE_API TransactionBase
{
@@ -39,6 +50,10 @@ class TC_DATABASE_API TransactionBase
public:
TransactionBase() : _cleanedUp(false) { }
TransactionBase(TransactionBase const&) = delete;
TransactionBase(TransactionBase &&) noexcept = default;
TransactionBase& operator=(TransactionBase const&) = delete;
TransactionBase& operator=(TransactionBase &&) noexcept = default;
virtual ~TransactionBase() { Cleanup(); }
void Append(char const* sql);
@@ -53,7 +68,7 @@ class TC_DATABASE_API TransactionBase
protected:
void AppendPreparedStatement(PreparedStatementBase* statement);
void Cleanup();
std::vector<SQLElementData> m_queries;
std::vector<TransactionData> m_queries;
private:
bool _cleanedUp;