Various Cleanups (shared/Database/)

This commit is contained in:
Schmoozerd 2012-07-19 21:57:32 +02:00
parent 9753625fd1
commit c334cd5ea4
25 changed files with 508 additions and 508 deletions

View file

@ -37,7 +37,7 @@ class SqlOperation
{
public:
virtual void OnRemove() { delete this; }
virtual bool Execute(SqlConnection *conn) = 0;
virtual bool Execute(SqlConnection* conn) = 0;
virtual ~SqlOperation() {}
};
@ -46,38 +46,38 @@ class SqlOperation
class SqlPlainRequest : public SqlOperation
{
private:
const char *m_sql;
const char* m_sql;
public:
SqlPlainRequest(const char *sql) : m_sql(mangos_strdup(sql)){}
SqlPlainRequest(const char* sql) : m_sql(mangos_strdup(sql)) {}
~SqlPlainRequest() { char* tofree = const_cast<char*>(m_sql); delete [] tofree; }
bool Execute(SqlConnection *conn);
bool Execute(SqlConnection* conn);
};
class SqlTransaction : public SqlOperation
{
private:
std::vector<SqlOperation * > m_queue;
std::vector<SqlOperation* > m_queue;
public:
SqlTransaction() {}
~SqlTransaction();
void DelayExecute(SqlOperation * sql) { m_queue.push_back(sql); }
void DelayExecute(SqlOperation* sql) { m_queue.push_back(sql); }
bool Execute(SqlConnection *conn);
bool Execute(SqlConnection* conn);
};
class SqlPreparedRequest : public SqlOperation
{
public:
SqlPreparedRequest(int nIndex, SqlStmtParameters * arg);
SqlPreparedRequest(int nIndex, SqlStmtParameters* arg);
~SqlPreparedRequest();
bool Execute(SqlConnection *conn);
bool Execute(SqlConnection* conn);
private:
const int m_nIndex;
SqlStmtParameters * m_param;
SqlStmtParameters* m_param;
};
/// ---- ASYNC QUERIES ----
@ -98,42 +98,42 @@ class SqlResultQueue : public ACE_Based::LockedQueue<MaNGOS::IQueryCallback* , A
class SqlQuery : public SqlOperation
{
private:
const char *m_sql;
MaNGOS::IQueryCallback * m_callback;
SqlResultQueue * m_queue;
const char* m_sql;
MaNGOS::IQueryCallback* m_callback;
SqlResultQueue* m_queue;
public:
SqlQuery(const char *sql, MaNGOS::IQueryCallback * callback, SqlResultQueue * queue)
SqlQuery(const char* sql, MaNGOS::IQueryCallback* callback, SqlResultQueue* queue)
: m_sql(mangos_strdup(sql)), m_callback(callback), m_queue(queue) {}
~SqlQuery() { char* tofree = const_cast<char*>(m_sql); delete [] tofree; }
bool Execute(SqlConnection *conn);
bool Execute(SqlConnection* conn);
};
class SqlQueryHolder
{
friend class SqlQueryHolderEx;
friend class SqlQueryHolderEx;
private:
typedef std::pair<const char*, QueryResult*> SqlResultPair;
std::vector<SqlResultPair> m_queries;
public:
SqlQueryHolder() {}
~SqlQueryHolder();
bool SetQuery(size_t index, const char *sql);
bool SetPQuery(size_t index, const char *format, ...) ATTR_PRINTF(3,4);
bool SetQuery(size_t index, const char* sql);
bool SetPQuery(size_t index, const char* format, ...) ATTR_PRINTF(3,4);
void SetSize(size_t size);
QueryResult* GetResult(size_t index);
void SetResult(size_t index, QueryResult *result);
bool Execute(MaNGOS::IQueryCallback * callback, SqlDelayThread *thread, SqlResultQueue *queue);
void SetResult(size_t index, QueryResult* result);
bool Execute(MaNGOS::IQueryCallback* callback, SqlDelayThread* thread, SqlResultQueue* queue);
};
class SqlQueryHolderEx : public SqlOperation
{
private:
SqlQueryHolder * m_holder;
MaNGOS::IQueryCallback * m_callback;
SqlResultQueue * m_queue;
SqlQueryHolder* m_holder;
MaNGOS::IQueryCallback* m_callback;
SqlResultQueue* m_queue;
public:
SqlQueryHolderEx(SqlQueryHolder *holder, MaNGOS::IQueryCallback * callback, SqlResultQueue * queue)
SqlQueryHolderEx(SqlQueryHolder* holder, MaNGOS::IQueryCallback* callback, SqlResultQueue* queue)
: m_holder(holder), m_callback(callback), m_queue(queue) {}
bool Execute(SqlConnection *conn);
bool Execute(SqlConnection* conn);
};
#endif //__SQLOPERATIONS_H