Ticket #4151: myth_dbcon_r14813.diff

libs/libmyth/mythdbcon.cpp

@@ -17 +17 @@
                "Unable to init db connection.");
         return;
     }
+
+    (void)getParams();
+
     m_lastDBKick = QDateTime::currentDateTime().addSecs(-60);
 }
 
@@ -34 +37 @@
 {
     if (m_db)
     {
-        if (!m_db->hostName().length())  // Bootstrapping without a database?
-            return true;                 // Pretend its open to reduce errors
+        if (!m_dbHostName.length())  // Bootstrapping without a database?
+            return true;           // Pretend its open to reduce errors
 
         if (m_db->isOpen())
             return true;
@@ -56 +59 @@
     
     if (!m_db->isOpen())
     {
-        DatabaseParams dbparms = gContext->GetDatabaseParams();
-        m_db->setDatabaseName(dbparms.dbName);
-        m_db->setUserName(dbparms.dbUserName);
-        m_db->setPassword(dbparms.dbPassword);
-        m_db->setHostName(dbparms.dbHostName);
+        DatabaseParams dbparms = getParams();
+        m_db->setDatabaseName(m_dbName);
+        m_db->setUserName(m_dbUserName);
+        m_db->setPassword(m_dbPassword);
+        m_db->setHostName(m_dbHostName);
 
-        if (!dbparms.dbHostName.length())  // Bootstrapping without a database?
+        if (!m_dbHostName.length())  // Bootstrapping without a database?
         {
             connected = true;              // Pretend to be connected
             return true;                   // to reduce errors
         }
 
-        if (dbparms.dbPort)
-            m_db->setPort(dbparms.dbPort);
+        if (m_dbPort)
+            m_db->setPort(m_dbPort);
 
-        if (dbparms.dbPort && dbparms.dbHostName == "localhost")
+        if (m_dbPort && m_dbHostName == "localhost")
             m_db->setHostName("127.0.0.1");
 
         connected = m_db->open();
@@ -100 +103 @@
         {
             VERBOSE(VB_GENERAL,
                     QString("Connected to database '%1' at host: %2")
-                            .arg(m_db->databaseName()).arg(m_db->hostName()));
+                            .arg(m_db->databaseName()).arg(m_dbHostName));
         }
     }
 
@@ -127 +130 @@
     // mdz, 2003/08/11
 
 
-    if (!m_db->hostName().length())  // Bootstrapping without a database?
-    {                                // Pretend we kicked, to reduce errors
+    if (!m_dbHostName.length())  // Bootstrapping without a database?
+    {                          // Pretend we kicked, to reduce errors
         m_lastDBKick = QDateTime::currentDateTime();
         return true;
     }
@@ -162 +165 @@
     return false;
 }
 
+DatabaseParams MSqlDatabase::getParams()
+{
+    DatabaseParams dbparms;
+
+    if (gContext)
+    {
+        dbparms = gContext->GetDatabaseParams();
+
+        m_dbName     = dbparms.dbName;
+        m_dbPort     = dbparms.dbPort;
+        m_dbUserName = dbparms.dbUserName;
+        m_dbPassword = dbparms.dbPassword;
+        m_dbHostName = dbparms.dbHostName;
+    }
+    else
+    {
+        m_dbName     = "";
+        m_dbPort     = 0;
+        m_dbUserName = "";
+        m_dbPassword = "";
+        m_dbHostName = "";
+
+        VERBOSE(VB_IMPORTANT, "MSqlDatabase::MSqlDatabase gContext null");
+    }
+
+    return dbparms;
+}
 
 // -----------------------------------------------------------------------
 
@@ -279 +309 @@
 {
     m_isConnected = false;
     m_db = qi.db;
+    m_dbHostName = m_db->m_db->hostName();
+
     m_returnConnection = qi.returnConnection;
 
     m_isConnected = m_db && m_db->isOpen();
@@ -381 +413 @@
 // by this one method.
 bool MSqlQuery::exec(const QString &query)
 {
-    if (!m_db->m_db->hostName().length())  // Bootstrapping without a database?
-        return true;                       // Pretend success, to reduce errors
+    if (!m_dbHostName.length())  // Bootstrapping without a database?
+        return true;             // Pretend success, to reduce errors
 
     bool result = QSqlQuery::exec(query);
 
@@ -407 +439 @@
 
 bool MSqlQuery::prepare(const QString& query)
 {
-    if (!m_db->m_db->hostName().length())  // Bootstrapping without a database?
-        return true;                       // Pretend success, to reduce errors
+    if (!m_dbHostName.length())  // Bootstrapping without a database?
+        return true;             // Pretend success, to reduce errors
 
     static QMutex prepareLock;
     QMutexLocker lock(&prepareLock);
@@ -432 +464 @@
 
 QVariant MSqlQuery::lastInsertId()
 {
-    if (!m_db->m_db->hostName().length())  // Bootstrapping without a database?
-        return value(0);                   // Pretend success, to reduce errors
+    if (!m_dbHostName.length())  // Bootstrapping without a database?
+        return value(0);       // Pretend success, to reduce errors
 
     exec("SELECT LAST_INSERT_ID();");
     if (!isActive() || size() < 1) 
@@ -498 +530 @@
                               result.driver()->formatValue(&f));
     }
 }
-

libs/libmyth/mythdbcon.h

@@ -25 +25 @@
     bool isOpen(void);
     bool OpenDatabase(void);
     bool KickDatabase(void);
+    DatabaseParams getParams(void);
     QSqlDatabase *db(void) { return m_db; }
 
   private:
     QString m_name;
+    QString m_dbName;
+    QString m_dbUserName;
+    QString m_dbPassword;
+    QString m_dbHostName;
+    int m_dbPort;
+
     QSqlDatabase *m_db;
     QDateTime m_lastDBKick;
 };
@@ -143 +150 @@
 
   private:
     MSqlDatabase *m_db;
+    QString m_dbHostName;
     bool m_isConnected;
     bool m_returnConnection;
 };