Use proper SQL connection in SqlWorker

Bionus · Sep 23, 2020 · 57e6817 · 57e6817
1 parent 15de3dd
commit 57e6817
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/lib/src/commands/sql-worker.cpp b/src/lib/src/commands/sql-worker.cpp
@@ -23,21 +23,21 @@ bool SqlWorker::connect()
 		return true;
 	}
 
-	QSqlDatabase db = QSqlDatabase::addDatabase(m_driver, "SQL worker - " + m_database);
-	db.setDatabaseName(m_database);
-	db.setUserName(m_user);
-	db.setPassword(m_password);
+	m_db = QSqlDatabase::addDatabase(m_driver, "SQL worker - " + m_database);
+	m_db.setDatabaseName(m_database);
+	m_db.setUserName(m_user);
+	m_db.setPassword(m_password);
 
 	const int portSeparator = m_host.lastIndexOf(':');
 	if (portSeparator > 0) {
-		db.setHostName(m_host.left(portSeparator));
-		db.setPort(m_host.midRef(portSeparator + 1).toInt());
+		m_db.setHostName(m_host.left(portSeparator));
+		m_db.setPort(m_host.midRef(portSeparator + 1).toInt());
 	} else {
-		db.setHostName(m_host);
+		m_db.setHostName(m_host);
 	}
 
-	if (!db.open()) {
-		log(QStringLiteral("Error initializing commands: %1").arg(db.lastError().text()), Logger::Error);
+	if (!m_db.open()) {
+		log(QStringLiteral("Error initializing commands: %1").arg(m_db.lastError().text()), Logger::Error);
 		return false;
 	}
 
@@ -68,6 +68,6 @@ bool SqlWorker::execute(const QString &sql)
 	log(QStringLiteral("SQL execution of \"%1\"").arg(sql));
 	Logger::getInstance().logCommandSql(sql);
 
-	QSqlQuery query;
+	QSqlQuery query(m_db);
 	return query.exec(sql);
 }
diff --git a/src/lib/src/commands/sql-worker.h b/src/lib/src/commands/sql-worker.h
@@ -3,6 +3,7 @@
 
 #include <QString>
 #include <QThread>
+#include <QtSql/QSqlDatabase>
 
 
 class QVariant;
@@ -26,6 +27,7 @@ class SqlWorker : public QThread
 		QString m_password;
 		QString m_database;
 
+		QSqlDatabase m_db;
 		bool m_enabled;
 		bool m_started;
 };