From 0982719f5fa3266adf655dc7e1541177e40c3b93 Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Sun, 19 Sep 2010 12:16:29 +0200
Subject: Core/DBLayer: - Declare the datatypes used to determine transaction
 element data (prepared statement/adhoc query string) on a generic level in
 SQLOperation.h - Implement variable SQL element data for SQLQueryHolder class
 so it can execute both prepared statements and adhoc queries - Make
 MySQLConnection::Query for adhoc queries return pointer to type instead of an
 autopointer, the autopointer is now applied on higher level code just like
 the function for querying prepared statements

--HG--
branch : trunk
---
 src/server/shared/Database/Transaction.h | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'src/server/shared/Database/Transaction.h')

diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h
index 8d824c297d4..fa6cfeba747 100644
--- a/src/server/shared/Database/Transaction.h
+++ b/src/server/shared/Database/Transaction.h
@@ -24,27 +24,6 @@
 //- Forward declare (don't include header to prevent circular includes)
 class PreparedStatement;
 
-//- Union that holds element data
-union TransactionElementUnion
-{
-    PreparedStatement* stmt;
-    const char* query;
-};
-
-//- Type specifier of our element data
-enum TransactionElementDataType
-{
-    TRANSACTION_ELEMENT_RAW,
-    TRANSACTION_ELEMENT_PREPARED,
-};
-
-//- The transaction element
-struct TransactionElementData
-{
-    TransactionElementUnion element;
-    TransactionElementDataType type;
-};
-
 /*! Transactions, high level class. */
 class Transaction
 {
@@ -60,7 +39,7 @@ class Transaction
 
     protected:
         void Cleanup();
-        std::queue<TransactionElementData> m_queries;
+        std::queue<SQLElementData> m_queries;
 
     private:
         bool m_actioned;
-- 
cgit v1.2.3