From 49810598c677ab0b267f3e4800d02e1c80e1e823 Mon Sep 17 00:00:00 2001 From: Ambal Date: Sat, 22 Jan 2011 02:25:40 +0200 Subject: [PATCH] [11063] Convert Database::DirectExecute() method to more effective form due to change [11061]. Signed-off-by: Ambal --- src/shared/Database/Database.cpp | 12 ------------ src/shared/Database/Database.h | 10 +++++++++- src/shared/revision_nr.h | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp index 68f6b1e58..4e951e17a 100644 --- a/src/shared/Database/Database.cpp +++ b/src/shared/Database/Database.cpp @@ -309,18 +309,6 @@ bool Database::PExecute(const char * format,...) return Execute(szQuery); } -bool Database::DirectExecute(const char* sql) -{ - if(!m_pAsyncConn) - return false; - - SqlTransaction trans; - trans.DelayExecute(sql); - - trans.Execute(m_pAsyncConn); - return true; -} - bool Database::DirectPExecute(const char * format,...) { if (!format) diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index 011cce923..1b51329e1 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -102,7 +102,15 @@ class MANGOS_DLL_SPEC Database QueryResult* PQuery(const char *format,...) ATTR_PRINTF(2,3); QueryNamedResult* PQueryNamed(const char *format,...) ATTR_PRINTF(2,3); - bool DirectExecute(const char* sql); + inline bool DirectExecute(const char* sql) + { + if(!m_pAsyncConn) + return false; + + SqlConnection::Lock guard(m_pAsyncConn); + return guard->Execute(sql); + } + bool DirectPExecute(const char *format,...) ATTR_PRINTF(2,3); /// Async queries and query holders, implemented in DatabaseImpl.h diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 824dc2280..9c5c2d229 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11062" + #define REVISION_NR "11063" #endif // __REVISION_NR_H__