diff options
Diffstat (limited to 'src/server/shared/Database')
| -rw-r--r-- | src/server/shared/Database/Database.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Database/PreparedStatements.cpp | 10 | ||||
| -rw-r--r-- | src/server/shared/Database/PreparedStatements.h | 8 | ||||
| -rw-r--r-- | src/server/shared/Database/SqlOperations.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Database/SqlOperations.h | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp index e2bfc58d96d..83a9849a075 100644 --- a/src/server/shared/Database/Database.cpp +++ b/src/server/shared/Database/Database.cpp @@ -38,7 +38,7 @@ size_t Database::db_count = 0; -Database::Database() : mMysql(NULL) +Database::Database() : mMysql(NULL) { // before first connection if (db_count++ == 0) diff --git a/src/server/shared/Database/PreparedStatements.cpp b/src/server/shared/Database/PreparedStatements.cpp index 40a910acf9e..ec57a0f90e8 100644 --- a/src/server/shared/Database/PreparedStatements.cpp +++ b/src/server/shared/Database/PreparedStatements.cpp @@ -11,12 +11,12 @@ void PreparedStatementHolder::_prepareStatement(const char* name, const char* sq strcat(query, "'"); strcat(query, sql); strcat(query, "'"); - + DEBUG_LOG("Preparing statement: %s", query); db->Execute(query); - + delete[] query; - ++count; + ++count; } void PreparedStatementHolder::LoadAuthserver(Database *db, uint32 &count) @@ -41,7 +41,7 @@ void PreparedStatementHolder::PExecute(Database *db, const char *name, const cha { // NOTE: if args == NULL, we're crashing here. No need to waste performance on checking; // devs must make sure they use PExecute for args and Execute for no args. - + const char prefix[] = "EXECUTE "; size_t querySize = 8 + strlen(name) + 7 + strlen(args) + 1; char* query = new char[querySize]; @@ -49,7 +49,7 @@ void PreparedStatementHolder::PExecute(Database *db, const char *name, const cha strcat(query, name); strcat(query, " USING "); strcat(query, args); - + DEBUG_LOG("Prepared statement (parsed args): %s", query); db->Execute(query); delete[] query; diff --git a/src/server/shared/Database/PreparedStatements.h b/src/server/shared/Database/PreparedStatements.h index c19119dcb3d..277d2b833ec 100644 --- a/src/server/shared/Database/PreparedStatements.h +++ b/src/server/shared/Database/PreparedStatements.h @@ -10,18 +10,18 @@ class PreparedStatementHolder void LoadCharacters(Database *db, uint32 &count); void LoadAuthserver(Database *db, uint32 &count); void LoadWorldserver(Database *db, uint32 &count); - + ///- Executes prepared statement that doesn't require feedback with name $name on database $db void Execute(Database *db, const char* name); - ///- Executes prepared statement that doesn't require feedback with name $name and args $args + ///- Executes prepared statement that doesn't require feedback with name $name and args $args ///- on database $db void PExecute(Database *db, const char* name, const char* args); - + ///- Executes a prepared statement without args on db $db with name $name and puts the result set in a pointer. QueryResult_AutoPtr Query(Database* db, const char* name); ///- Executes a prepared statement with args $args on db $db with name $name and put the result set in a pointer. QueryResult_AutoPtr PQuery(Database* db, const char* name, const char* args); - + private: void _prepareStatement(const char* name, const char* sql, Database *db, uint32 &count); diff --git a/src/server/shared/Database/SqlOperations.cpp b/src/server/shared/Database/SqlOperations.cpp index 785c5cb84e7..33b96a30533 100644 --- a/src/server/shared/Database/SqlOperations.cpp +++ b/src/server/shared/Database/SqlOperations.cpp @@ -41,12 +41,12 @@ void SqlTransaction::Execute(Database *db) m_Mutex.release(); return; } - + db->DirectExecute("START TRANSACTION"); while (!m_queue.empty()) { sql = m_queue.front(); - + if (!db->DirectExecute(sql)) { free((void*)const_cast<char*>(sql)); diff --git a/src/server/shared/Database/SqlOperations.h b/src/server/shared/Database/SqlOperations.h index eb28a2c0790..337790e4c72 100644 --- a/src/server/shared/Database/SqlOperations.h +++ b/src/server/shared/Database/SqlOperations.h @@ -135,10 +135,10 @@ class SqlAsyncTask : public ACE_Method_Request public: SqlAsyncTask(Database * db, SqlOperation * op) : m_db(db), m_op(op){} ~SqlAsyncTask() - { + { if (!m_op) - return; - + return; + delete m_op; m_op = NULL; } |