From 994186f2672547761392c71ed15ded2a83e8c20d Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sat, 21 Aug 2010 03:19:25 +0200 Subject: DB Layer: - Make SQL Transactions actual objects used in code. (Thanks to Derex for the idea) * Uncommitted transactions will be automatically rolled back and cleaned up using ACE_Refcounted_Auto_Ptr, so no need to call Rollback() in the code. * Prevents recursive transactions and makes developers aware of transactions going on. * Gets rid of unneccesary overhead iterating over a concurrent map. - Some cleanups in affected code, including better usage of transaction control in AH / mail related code to prevent data loss. *** Experimental, use at own risk, recommended to backup your DBs. *** --HG-- branch : trunk --- src/server/shared/Database/SQLOperation.cpp | 49 +---------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) (limited to 'src/server/shared/Database/SQLOperation.cpp') diff --git a/src/server/shared/Database/SQLOperation.cpp b/src/server/shared/Database/SQLOperation.cpp index 1cd45a4c0b6..a3eda4b7239 100644 --- a/src/server/shared/Database/SQLOperation.cpp +++ b/src/server/shared/Database/SQLOperation.cpp @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "DatabaseEnv.h" #include "SQLOperation.h" #include "MySQLConnection.h" +#include "Log.h" /*! Basic, ad-hoc queries. */ BasicStatementTask::BasicStatementTask(const char* sql) : @@ -53,53 +53,6 @@ bool BasicStatementTask::Execute() return m_conn->Execute(m_sql); } -/*! Transactions. */ -TransactionTask::TransactionTask() -{ -} - -TransactionTask::~TransactionTask() -{ - -} - -void TransactionTask::ForcefulDelete() -{ - while (!m_queries.empty()) - { - free((void*)const_cast(m_queries.front())); - m_queries.pop(); - } -} - -bool TransactionTask::Execute() -{ - if (m_queries.empty()) - return false; - - const char* sql; - - m_conn->BeginTransaction(); - while (!m_queries.empty()) - { - sql = m_queries.front(); - if (!m_conn->Execute(sql)) - { - free((void*)const_cast(sql)); - m_queries.pop(); - m_conn->RollbackTransaction(); - ForcefulDelete(); - return false; - } - - free((void*)const_cast(sql)); - m_queries.pop(); - } - - m_conn->CommitTransaction(); - return true; -} - bool SQLQueryHolder::SetQuery(size_t index, const char *sql) { if (m_queries.size() <= index) -- cgit v1.2.3