Core/DBLayer: Pass connection info down to lower level class MySQLConnection and use relevant data in logging messages in its methods

--HG--
branch : trunk

6 files changed, 15 insertions, 15 deletions

diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
index fe48a1564ff..08eee391fd8 100644
--- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
@@ -18,9 +18,9 @@
 
 #include "CharacterDatabase.h"
 
-bool CharacterDatabaseConnection::Open(const MySQLConnectionInfo& connInfo)
+bool CharacterDatabaseConnection::Open()
 {
-    if (!MySQLConnection::Open(connInfo))
+    if (!MySQLConnection::Open())
         return false;
 
     m_stmts.resize(MAX_CHARACTERDATABASE_STATEMENTS);
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h
index 387f35ba36b..b2f26fc7f05 100644
--- a/src/server/shared/Database/Implementation/CharacterDatabase.h
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.h
@@ -26,11 +26,11 @@ class CharacterDatabaseConnection : public MySQLConnection
 {
     public:
         //- Constructors for sync and async connections
-        CharacterDatabaseConnection() : MySQLConnection() {}
-        CharacterDatabaseConnection(ACE_Activation_Queue* q) : MySQLConnection(q) {}
+        CharacterDatabaseConnection(const MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {}
+        CharacterDatabaseConnection(ACE_Activation_Queue* q, const MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {}
 
         //- Loads databasetype specific prepared statements
-        bool Open(const MySQLConnectionInfo& connInfo);
+        bool Open();
 };
 
 typedef DatabaseWorkerPool<CharacterDatabaseConnection> CharacterDatabaseWorkerPool;
diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/src/server/shared/Database/Implementation/LoginDatabase.cpp
index 47530598027..86546588ee4 100644
--- a/src/server/shared/Database/Implementation/LoginDatabase.cpp
+++ b/src/server/shared/Database/Implementation/LoginDatabase.cpp
@@ -18,9 +18,9 @@
 
 #include "LoginDatabase.h"
 
-bool LoginDatabaseConnection::Open(const MySQLConnectionInfo& connInfo)
+bool LoginDatabaseConnection::Open()
 {
-    if (!MySQLConnection::Open(connInfo))
+    if (!MySQLConnection::Open())
         return false;
 
     m_stmts.resize(MAX_LOGINDATABASE_STATEMENTS);
diff --git a/src/server/shared/Database/Implementation/LoginDatabase.h b/src/server/shared/Database/Implementation/LoginDatabase.h
index a74669a2f71..6daa53baebe 100644
--- a/src/server/shared/Database/Implementation/LoginDatabase.h
+++ b/src/server/shared/Database/Implementation/LoginDatabase.h
@@ -26,11 +26,11 @@ class LoginDatabaseConnection : public MySQLConnection
 {
     public:
         //- Constructors for sync and async connections
-        LoginDatabaseConnection() : MySQLConnection() {}
-        LoginDatabaseConnection(ACE_Activation_Queue* q) : MySQLConnection(q) {}
+        LoginDatabaseConnection(const MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {}
+        LoginDatabaseConnection(ACE_Activation_Queue* q, const MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {}
 
         //- Loads databasetype specific prepared statements
-        bool Open(const MySQLConnectionInfo& connInfo);
+        bool Open();
 };
 
 typedef DatabaseWorkerPool<LoginDatabaseConnection> LoginDatabaseWorkerPool;
diff --git a/src/server/shared/Database/Implementation/WorldDatabase.cpp b/src/server/shared/Database/Implementation/WorldDatabase.cpp
index ebd40451d71..a1ccaa18aa8 100644
--- a/src/server/shared/Database/Implementation/WorldDatabase.cpp
+++ b/src/server/shared/Database/Implementation/WorldDatabase.cpp
@@ -18,9 +18,9 @@
 
 #include "WorldDatabase.h"
 
-bool WorldDatabaseConnection::Open(const MySQLConnectionInfo& connInfo)
+bool WorldDatabaseConnection::Open()
 {
-    if (!MySQLConnection::Open(connInfo))
+    if (!MySQLConnection::Open())
         return false;
 
     m_stmts.resize(MAX_WORLDDATABASE_STATEMENTS);
diff --git a/src/server/shared/Database/Implementation/WorldDatabase.h b/src/server/shared/Database/Implementation/WorldDatabase.h
index 5495048b02c..981ff906fc4 100644
--- a/src/server/shared/Database/Implementation/WorldDatabase.h
+++ b/src/server/shared/Database/Implementation/WorldDatabase.h
@@ -26,11 +26,11 @@ class WorldDatabaseConnection : public MySQLConnection
 {
     public:
         //- Constructors for sync and async connections
-        WorldDatabaseConnection() : MySQLConnection() {}
-        WorldDatabaseConnection(ACE_Activation_Queue* q) : MySQLConnection(q) {}
+        WorldDatabaseConnection(const MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {}
+        WorldDatabaseConnection(ACE_Activation_Queue* q, const MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {}
 
         //- Loads databasetype specific prepared statements
-        bool Open(const MySQLConnectionInfo& connInfo);
+        bool Open();
 };
 
 typedef DatabaseWorkerPool<WorldDatabaseConnection> WorldDatabaseWorkerPool;