diff -rup mythtv.old/libs/libmyth/mythdbcon.cpp mythtv/libs/libmyth/mythdbcon.cpp
old
|
new
|
MSqlDatabase::MSqlDatabase(const QString |
17 | 17 | "Unable to init db connection."); |
18 | 18 | return; |
19 | 19 | } |
| 20 | |
| 21 | (void)getParams(); |
| 22 | |
20 | 23 | m_lastDBKick = QDateTime::currentDateTime().addSecs(-60); |
21 | 24 | } |
22 | 25 | |
… |
… |
bool MSqlDatabase::isOpen() |
34 | 37 | { |
35 | 38 | if (m_db) |
36 | 39 | { |
37 | | if (!m_db->hostName().length()) // Bootstrapping without a database? |
38 | | return true; // Pretend its open to reduce errors |
| 40 | if (!m_dbHostName.length()) // Bootstrapping without a database? |
| 41 | return true; // Pretend its open to reduce errors |
39 | 42 | |
40 | 43 | if (m_db->isOpen()) |
41 | 44 | return true; |
… |
… |
bool MSqlDatabase::OpenDatabase() |
56 | 59 | |
57 | 60 | if (!m_db->isOpen()) |
58 | 61 | { |
59 | | DatabaseParams dbparms = gContext->GetDatabaseParams(); |
60 | | m_db->setDatabaseName(dbparms.dbName); |
61 | | m_db->setUserName(dbparms.dbUserName); |
62 | | m_db->setPassword(dbparms.dbPassword); |
63 | | m_db->setHostName(dbparms.dbHostName); |
| 62 | DatabaseParams dbparms = getParams(); |
| 63 | m_db->setDatabaseName(m_dbName); |
| 64 | m_db->setUserName(m_dbUserName); |
| 65 | m_db->setPassword(m_dbPassword); |
| 66 | m_db->setHostName(m_dbHostName); |
64 | 67 | |
65 | | if (!dbparms.dbHostName.length()) // Bootstrapping without a database? |
| 68 | if (!m_dbHostName.length()) // Bootstrapping without a database? |
66 | 69 | { |
67 | 70 | connected = true; // Pretend to be connected |
68 | 71 | return true; // to reduce errors |
69 | 72 | } |
70 | 73 | |
71 | | if (dbparms.dbPort) |
72 | | m_db->setPort(dbparms.dbPort); |
| 74 | if (m_dbPort) |
| 75 | m_db->setPort(m_dbPort); |
73 | 76 | |
74 | | if (dbparms.dbPort && dbparms.dbHostName == "localhost") |
| 77 | if (m_dbPort && m_dbHostName == "localhost") |
75 | 78 | m_db->setHostName("127.0.0.1"); |
76 | 79 | |
77 | 80 | connected = m_db->open(); |
… |
… |
bool MSqlDatabase::OpenDatabase() |
100 | 103 | { |
101 | 104 | VERBOSE(VB_GENERAL, |
102 | 105 | QString("Connected to database '%1' at host: %2") |
103 | | .arg(m_db->databaseName()).arg(m_db->hostName())); |
| 106 | .arg(m_db->databaseName()).arg(m_dbHostName)); |
104 | 107 | } |
105 | 108 | } |
106 | 109 | |
… |
… |
bool MSqlDatabase::KickDatabase() |
127 | 130 | // mdz, 2003/08/11 |
128 | 131 | |
129 | 132 | |
130 | | if (!m_db->hostName().length()) // Bootstrapping without a database? |
131 | | { // Pretend we kicked, to reduce errors |
| 133 | if (!m_dbHostName.length()) // Bootstrapping without a database? |
| 134 | { // Pretend we kicked, to reduce errors |
132 | 135 | m_lastDBKick = QDateTime::currentDateTime(); |
133 | 136 | return true; |
134 | 137 | } |
… |
… |
bool MSqlDatabase::KickDatabase() |
162 | 165 | return false; |
163 | 166 | } |
164 | 167 | |
| 168 | DatabaseParams MSqlDatabase::getParams() |
| 169 | { |
| 170 | DatabaseParams dbparms; |
| 171 | |
| 172 | if (gContext) |
| 173 | { |
| 174 | dbparms = gContext->GetDatabaseParams(); |
| 175 | |
| 176 | m_dbName = dbparms.dbName; |
| 177 | m_dbPort = dbparms.dbPort; |
| 178 | m_dbUserName = dbparms.dbUserName; |
| 179 | m_dbPassword = dbparms.dbPassword; |
| 180 | m_dbHostName = dbparms.dbHostName; |
| 181 | } |
| 182 | else |
| 183 | { |
| 184 | m_dbName = ""; |
| 185 | m_dbPort = 0; |
| 186 | m_dbUserName = ""; |
| 187 | m_dbPassword = ""; |
| 188 | m_dbHostName = ""; |
| 189 | |
| 190 | VERBOSE(VB_IMPORTANT, "MSqlDatabase::MSqlDatabase gContext null"); |
| 191 | } |
| 192 | |
| 193 | return dbparms; |
| 194 | } |
165 | 195 | |
166 | 196 | // ----------------------------------------------------------------------- |
167 | 197 | |
… |
… |
MSqlQuery::MSqlQuery(const MSqlQueryInfo |
279 | 309 | { |
280 | 310 | m_isConnected = false; |
281 | 311 | m_db = qi.db; |
| 312 | m_dbHostName = m_db->m_db->hostName(); |
| 313 | |
282 | 314 | m_returnConnection = qi.returnConnection; |
283 | 315 | |
284 | 316 | m_isConnected = m_db && m_db->isOpen(); |
… |
… |
MSqlQueryInfo MSqlQuery::DDCon() |
381 | 413 | // by this one method. |
382 | 414 | bool MSqlQuery::exec(const QString &query) |
383 | 415 | { |
384 | | if (!m_db->m_db->hostName().length()) // Bootstrapping without a database? |
385 | | return true; // Pretend success, to reduce errors |
| 416 | if (!m_dbHostName.length()) // Bootstrapping without a database? |
| 417 | return true; // Pretend success, to reduce errors |
386 | 418 | |
387 | 419 | bool result = QSqlQuery::exec(query); |
388 | 420 | |
… |
… |
bool MSqlQuery::exec(const QString &quer |
407 | 439 | |
408 | 440 | bool MSqlQuery::prepare(const QString& query) |
409 | 441 | { |
410 | | if (!m_db->m_db->hostName().length()) // Bootstrapping without a database? |
411 | | return true; // Pretend success, to reduce errors |
| 442 | if (!m_dbHostName.length()) // Bootstrapping without a database? |
| 443 | return true; // Pretend success, to reduce errors |
412 | 444 | |
413 | 445 | static QMutex prepareLock; |
414 | 446 | QMutexLocker lock(&prepareLock); |
… |
… |
void MSqlQuery::bindValues(MSqlBindings |
432 | 464 | |
433 | 465 | QVariant MSqlQuery::lastInsertId() |
434 | 466 | { |
435 | | if (!m_db->m_db->hostName().length()) // Bootstrapping without a database? |
436 | | return value(0); // Pretend success, to reduce errors |
| 467 | if (!m_dbHostName.length()) // Bootstrapping without a database? |
| 468 | return value(0); // Pretend success, to reduce errors |
437 | 469 | |
438 | 470 | exec("SELECT LAST_INSERT_ID();"); |
439 | 471 | if (!isActive() || size() < 1) |
… |
… |
void MSqlEscapeAsAQuery(QString &query, |
498 | 530 | result.driver()->formatValue(&f)); |
499 | 531 | } |
500 | 532 | } |
501 | | |
diff -rup mythtv.old/libs/libmyth/mythdbcon.h mythtv/libs/libmyth/mythdbcon.h
old
|
new
|
class MPUBLIC MSqlDatabase |
25 | 25 | bool isOpen(void); |
26 | 26 | bool OpenDatabase(void); |
27 | 27 | bool KickDatabase(void); |
| 28 | DatabaseParams getParams(void); |
28 | 29 | QSqlDatabase *db(void) { return m_db; } |
29 | 30 | |
30 | 31 | private: |
31 | 32 | QString m_name; |
| 33 | QString m_dbName; |
| 34 | QString m_dbUserName; |
| 35 | QString m_dbPassword; |
| 36 | QString m_dbHostName; |
| 37 | int m_dbPort; |
| 38 | |
32 | 39 | QSqlDatabase *m_db; |
33 | 40 | QDateTime m_lastDBKick; |
34 | 41 | }; |
… |
… |
class MPUBLIC MSqlQuery : public QSqlQue |
143 | 150 | |
144 | 151 | private: |
145 | 152 | MSqlDatabase *m_db; |
| 153 | QString m_dbHostName; |
146 | 154 | bool m_isConnected; |
147 | 155 | bool m_returnConnection; |
148 | 156 | }; |