araxiaonline/mod-azerothshard
3
0
Fork 0
mirror of https://github.com/araxiaonline/mod-azerothshard.git synced 2026-06-13 01:32:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat(Common/Database): correct impl Extra DB" (#6)

Browse Source
This commit is contained in:
Francesco Borzì
2021-06-29 14:21:40 +02:00
committed by GitHub
parent 61770eac04
commit fd814d5aa3
2 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/mod-as-common/src/game/ExtraDatabase.cpp
View File

@@ -19,6 +19,11 @@
#include "MySQLPreparedStatement.h"
#include "DatabaseLoader.h"
class DatabaseLoader;
template class AC_DATABASE_API DatabaseWorkerPool<ExtraDatabaseConnection>;
DatabaseWorkerPool<ExtraDatabaseConnection> ExtraDatabase;
void ExtraDatabaseConnection::DoPrepareStatements()
{
if (!m_reconnecting)
@@ -31,15 +36,5 @@ void ExtraDatabaseConnection::DoPrepareStatements()
PrepareStatement(EXTRA_DEL_EXTERNAL_MAIL, "DELETE FROM mail_external WHERE id = ?", CONNECTION_ASYNC);
}
ExtraDatabaseConnection::ExtraDatabaseConnection(MySQLConnectionInfo& connInfo) :
MySQLConnection(connInfo) { }
ExtraDatabaseConnection::ExtraDatabaseConnection(ProducerConsumerQueue<SQLOperation*>* q, MySQLConnectionInfo& connInfo) :
MySQLConnection(q, connInfo) { }
ExtraDatabaseConnection::~ExtraDatabaseConnection() { }
DatabaseWorkerPool<ExtraDatabaseConnection> ExtraDatabase;
template AC_DATABASE_API
DatabaseLoader& DatabaseLoader::AddDatabase<ExtraDatabaseConnection>(DatabaseWorkerPool<ExtraDatabaseConnection>&, std::string const&);
// template AC_DATABASE_API
// DatabaseLoader& DatabaseLoader::AddDatabase<ExtraDatabaseConnection>(DatabaseWorkerPool<ExtraDatabaseConnection>&, std::string const&);

22
modules/mod-as-common/src/game/ExtraDatabase.h
View File

@@ -21,7 +21,7 @@
#include "MySQLConnection.h"
#include "DatabaseEnv.h"
enum ExtraDatabaseStatements : uint32
enum ExtraDatabaseStatements
{
/* Naming standard for defines:
{DB}_{SET/DEL/ADD/REP}_{Summary of data changed}
@@ -36,24 +36,18 @@ enum ExtraDatabaseStatements : uint32
class AC_DATABASE_API ExtraDatabaseConnection : public MySQLConnection
{
public:
typedef ExtraDatabaseStatements Statements;
public:
typedef ExtraDatabaseStatements Statements;
//- Constructors for sync and async connections
ExtraDatabaseConnection(MySQLConnectionInfo& connInfo);
ExtraDatabaseConnection(ProducerConsumerQueue<SQLOperation*>* q, MySQLConnectionInfo& connInfo);
~ExtraDatabaseConnection();
//- Constructors for sync and async connections
ExtraDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {}
ExtraDatabaseConnection(ProducerConsumerQueue<SQLOperation*>* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {}
//- Loads databasetype specific prepared statements
void DoPrepareStatements() override;
//- Loads databasetype specific prepared statements
void DoPrepareStatements();
};
/// Accessor to the extra database
AC_DATABASE_API extern DatabaseWorkerPool<ExtraDatabaseConnection> ExtraDatabase;
using ExtraDatabasePreparedStatement = PreparedStatement<ExtraDatabaseConnection>;
using ExtraDatabaseTransaction = SQLTransaction<ExtraDatabaseConnection>;
using ExtraDatabaseQueryHolder = SQLQueryHolder<ExtraDatabaseConnection>;
#endif