From 7e538980a2b4fc6c74bde7bd456633d954272708 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 12 May 2017 18:49:51 +0200
Subject: Core/Database: Include cleanup

---
 src/server/database/Database/DatabaseEnv.h | 32 ++++++++++++------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'src/server/database/Database/DatabaseEnv.h')

diff --git a/src/server/database/Database/DatabaseEnv.h b/src/server/database/Database/DatabaseEnv.h
index 317db0fce36..123d780ae3b 100644
--- a/src/server/database/Database/DatabaseEnv.h
+++ b/src/server/database/Database/DatabaseEnv.h
@@ -19,33 +19,27 @@
 #ifndef DATABASEENV_H
 #define DATABASEENV_H
 
-#include "Common.h"
-#include "Errors.h"
-#include "Log.h"
+#include "Define.h"
+#include "DatabaseWorkerPool.h"
+
+#include "Implementation/WorldDatabase.h"
+#include "Implementation/CharacterDatabase.h"
+#include "Implementation/LoginDatabase.h"
+#include "Implementation/HotfixDatabase.h"
 
 #include "Field.h"
+#include "PreparedStatement.h"
+#include "QueryCallback.h"
 #include "QueryResult.h"
-
-#include "MySQLThreading.h"
 #include "Transaction.h"
 
-#define _LIKE_           "LIKE"
-#define _TABLE_SIM_      "`"
-#define _CONCAT3_(A, B, C) "CONCAT( " A ", " B ", " C " )"
-#define _OFFSET_         "LIMIT %d, 1"
-
-#include "Implementation/LoginDatabase.h"
-#include "Implementation/CharacterDatabase.h"
-#include "Implementation/WorldDatabase.h"
-#include "Implementation/HotfixDatabase.h"
-
 /// Accessor to the world database
-TC_DATABASE_API extern WorldDatabaseWorkerPool WorldDatabase;
+TC_DATABASE_API extern DatabaseWorkerPool<WorldDatabaseConnection> WorldDatabase;
 /// Accessor to the character database
-TC_DATABASE_API extern CharacterDatabaseWorkerPool CharacterDatabase;
+TC_DATABASE_API extern DatabaseWorkerPool<CharacterDatabaseConnection> CharacterDatabase;
 /// Accessor to the realm/login database
-TC_DATABASE_API extern LoginDatabaseWorkerPool LoginDatabase;
+TC_DATABASE_API extern DatabaseWorkerPool<LoginDatabaseConnection> LoginDatabase;
 /// Accessor to the hotfix database
-TC_DATABASE_API extern HotfixDatabaseWorkerPool HotfixDatabase;
+TC_DATABASE_API extern DatabaseWorkerPool<HotfixDatabaseConnection> HotfixDatabase;
 
 #endif
-- 
cgit v1.2.3