From b50c931d6eddb9493c494bc09900c79893b0bf1a Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sun, 19 Sep 2010 12:36:48 +0200 Subject: Core/DBLayer: Move QueryHolder and BasicStatement operations to their own file and remove SQLOperation.cpp from revision control --HG-- branch : trunk --- src/server/shared/Database/SQLOperation.h | 57 +------------------------------ 1 file changed, 1 insertion(+), 56 deletions(-) (limited to 'src/server/shared/Database/SQLOperation.h') diff --git a/src/server/shared/Database/SQLOperation.h b/src/server/shared/Database/SQLOperation.h index e5d7f7c7180..77f73a95a82 100644 --- a/src/server/shared/Database/SQLOperation.h +++ b/src/server/shared/Database/SQLOperation.h @@ -22,8 +22,7 @@ #include #include -#include "Common.h" -#include "Callback.h" +#include "QueryResult.h" //- Forward declare (don't include header to prevent circular includes) class PreparedStatement; @@ -73,58 +72,4 @@ class SQLOperation : public ACE_Method_Request MySQLConnection* m_conn; }; -typedef ACE_Future QueryResultFuture; -/*! Raw, ad-hoc query. */ -class BasicStatementTask : public SQLOperation -{ - public: - BasicStatementTask(const char* sql); - BasicStatementTask(const char* sql, QueryResultFuture result); - ~BasicStatementTask(); - - bool Execute(); - - private: - const char* m_sql; //- Raw query to be executed - bool m_has_result; - QueryResultFuture m_result; -}; - - - -class SQLQueryHolder -{ - friend class SQLQueryHolderTask; - private: - typedef std::pair SQLResultPair; - std::vector 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 SetPreparedQuery(size_t index, PreparedStatement* stmt); - void SetSize(size_t size); - QueryResult GetResult(size_t index); - PreparedQueryResult GetPreparedResult(size_t index); - void SetResult(size_t index, ResultSet* result); - void SetPreparedResult(size_t index, PreparedResultSet* result); -}; - -typedef ACE_Future QueryResultHolderFuture; - -class SQLQueryHolderTask : public SQLOperation -{ - private: - SQLQueryHolder * m_holder; - QueryResultHolderFuture m_result; - - public: - SQLQueryHolderTask(SQLQueryHolder *holder, QueryResultHolderFuture res) - : m_holder(holder), m_result(res){}; - bool Execute(); - -}; - - #endif -- cgit v1.2.3