summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-06-17 15:25:18 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-06-17 15:25:18 -0500
commitfec21e10a08d70a3489174c3901eacb2535e17dd (patch)
treeefd7a2cc8fdb4a058b0ffd5df30208adcd1a8982
parentd51e381215368873405d3e61dabcd67726c6c490 (diff)
downloadkbarcode-fec21e10.tar.gz
kbarcode-fec21e10.zip
Fix database failures with TQt3
-rw-r--r--kbarcode/sqltables.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp
index 62e8a2d..9c4aec7 100644
--- a/kbarcode/sqltables.cpp
+++ b/kbarcode/sqltables.cpp
@@ -79,6 +79,12 @@ SqlTables::SqlTables( TQObject* parent )
drivers.insert( "QSQLITE", new SQLiteDescription() );
drivers.insert( "QODBC3", new SQLiteDescription() );
+ drivers.insert( "TQMYSQL3", new MySqlDescription() );
+ drivers.insert( "TQPSQL7", new PostgreSQLDescription() );
+ /* The same driver plugin is used for TQDBC and SQLite */
+ drivers.insert( "TQSQLITE", new SQLiteDescription() );
+ drivers.insert( "TQODBC3", new SQLiteDescription() );
+
db = NULL;
connected = false;
loadConfig();
@@ -152,7 +158,7 @@ bool SqlTables::newTables( const TQString & username, const TQString & password,
if(dbase->open()) {
- if (driver != "QSQLITE")
+ if ((driver != "QSQLITE") && (driver != "TQSQLITE"))
{
bool found = false;
TQSqlQuery existing("SHOW DATABASES LIKE '" + database + "';");
@@ -349,7 +355,7 @@ void SqlTables::loadConfig()
sqldata.password = config->readEntry("password", "" );
sqldata.hostname = config->readEntry("hostname", "localhost" );
sqldata.database = config->readEntry("database", "kbarcode" );
- sqldata.driver = config->readEntry("driver", "QMYSQL3" );
+ sqldata.driver = config->readEntry("driver", "TQMYSQL3" );
sqldata.autoconnect = config->readBoolEntry("autoconnect", false );
}
@@ -376,7 +382,7 @@ void SqlTables::updateTables()
* as they have already been created with the most
* recent database structures.
*/
- if( sqldata.driver != "QMYSQL3" )
+ if ((sqldata.driver != "QMYSQL3") && (sqldata.driver != "TQMYSQL3"))
return;
bool changed = false;