From bf72fa749ff3beef2ba226862e2a5af7c170fc49 Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Wed, 29 Sep 2010 08:48:06 +0200
Subject: Core/DBLayer: Store MySQL connection details in a struct and print
 relevant data in sql driver messages

--HG--
branch : trunk
---
 src/server/shared/Database/Implementation/CharacterDatabase.cpp | 4 ++--
 src/server/shared/Database/Implementation/CharacterDatabase.h   | 2 +-
 src/server/shared/Database/Implementation/LoginDatabase.cpp     | 4 ++--
 src/server/shared/Database/Implementation/LoginDatabase.h       | 2 +-
 src/server/shared/Database/Implementation/WorldDatabase.cpp     | 4 ++--
 src/server/shared/Database/Implementation/WorldDatabase.h       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/server/shared/Database/Implementation')

diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
index 3e6f1f5c74a..fe48a1564ff 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 std::string& infoString)
+bool CharacterDatabaseConnection::Open(const MySQLConnectionInfo& connInfo)
 {
-    if (!MySQLConnection::Open(infoString))
+    if (!MySQLConnection::Open(connInfo))
         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 27aa20b9a13..387f35ba36b 100644
--- a/src/server/shared/Database/Implementation/CharacterDatabase.h
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.h
@@ -30,7 +30,7 @@ class CharacterDatabaseConnection : public MySQLConnection
         CharacterDatabaseConnection(ACE_Activation_Queue* q) : MySQLConnection(q) {}
 
         //- Loads databasetype specific prepared statements
-        bool Open(const std::string& infoString);
+        bool Open(const MySQLConnectionInfo& connInfo);
 };
 
 typedef DatabaseWorkerPool<CharacterDatabaseConnection> CharacterDatabaseWorkerPool;
diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/src/server/shared/Database/Implementation/LoginDatabase.cpp
index 5a662af7882..47530598027 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 std::string& infoString)
+bool LoginDatabaseConnection::Open(const MySQLConnectionInfo& connInfo)
 {
-    if (!MySQLConnection::Open(infoString))
+    if (!MySQLConnection::Open(connInfo))
         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 69674b2e354..a74669a2f71 100644
--- a/src/server/shared/Database/Implementation/LoginDatabase.h
+++ b/src/server/shared/Database/Implementation/LoginDatabase.h
@@ -30,7 +30,7 @@ class LoginDatabaseConnection : public MySQLConnection
         LoginDatabaseConnection(ACE_Activation_Queue* q) : MySQLConnection(q) {}
 
         //- Loads databasetype specific prepared statements
-        bool Open(const std::string& infoString);
+        bool Open(const MySQLConnectionInfo& connInfo);
 };
 
 typedef DatabaseWorkerPool<LoginDatabaseConnection> LoginDatabaseWorkerPool;
diff --git a/src/server/shared/Database/Implementation/WorldDatabase.cpp b/src/server/shared/Database/Implementation/WorldDatabase.cpp
index 019473cee89..ebd40451d71 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 std::string& infoString)
+bool WorldDatabaseConnection::Open(const MySQLConnectionInfo& connInfo)
 {
-    if (!MySQLConnection::Open(infoString))
+    if (!MySQLConnection::Open(connInfo))
         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 c45fdd6eac6..5495048b02c 100644
--- a/src/server/shared/Database/Implementation/WorldDatabase.h
+++ b/src/server/shared/Database/Implementation/WorldDatabase.h
@@ -30,7 +30,7 @@ class WorldDatabaseConnection : public MySQLConnection
         WorldDatabaseConnection(ACE_Activation_Queue* q) : MySQLConnection(q) {}
 
         //- Loads databasetype specific prepared statements
-        bool Open(const std::string& infoString);
+        bool Open(const MySQLConnectionInfo& connInfo);
 };
 
 typedef DatabaseWorkerPool<WorldDatabaseConnection> WorldDatabaseWorkerPool;
-- 
cgit v1.2.3