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

1 files changed, 5 insertions, 7 deletions

diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index 8a53daa8278..fac696546d1 100644
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@@ -27,8 +27,6 @@
 #include "Util.h"
 #include "SHA1.h"
 
-extern DatabaseType LoginDatabase;
-
 AccountMgr::AccountMgr()
 {}
 
@@ -86,13 +84,13 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
     CharacterDatabase.PExecute("DELETE FROM character_tutorial WHERE account = '%u'",accid);
     CharacterDatabase.PExecute("DELETE FROM account_data WHERE account = '%u'",accid);
 
-    LoginDatabase.BeginTransaction();
+    SQLTransaction trans = LoginDatabase.BeginTransaction();
 
-    LoginDatabase.PExecute("DELETE FROM account WHERE id='%d'", accid);
-    LoginDatabase.PExecute("DELETE FROM account_access WHERE id ='%d'", accid);
-    LoginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid='%d'", accid);
+    trans->PAppend("DELETE FROM account WHERE id='%d'", accid);
+    trans->PAppend("DELETE FROM account_access WHERE id ='%d'", accid);
+    trans->PAppend("DELETE FROM realmcharacters WHERE acctid='%d'", accid);
 
-    LoginDatabase.CommitTransaction();
+    LoginDatabase.CommitTransaction(trans);
 
     return AOR_OK;
 }