From fc36024eee5cef61adc11fb9ebfcf40f4dd9dba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Sun, 19 Jan 2025 15:49:31 +0100 Subject: [PATCH] Remove deprecated QSqlQuery usage --- database.cpp | 59 ++++++++++++++++++++++++------------------------ databaseview.cpp | 2 +- markedfiles.cpp | 2 +- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/database.cpp b/database.cpp index 427a36b..5822b99 100644 --- a/database.cpp +++ b/database.cpp @@ -15,32 +15,33 @@ bool Database::init(const QLatin1String &connectionName) QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); QDir dir(path); - QSqlDatabase m_database = QSqlDatabase::addDatabase("QSQLITE", connectionName); + QSqlDatabase database = QSqlDatabase::addDatabase("QSQLITE", connectionName); if(!dir.mkpath(".")) return false; - if(m_database.isValid()) + if(database.isValid()) { - m_database.setDatabaseName(dir.absoluteFilePath("database2.db")); - if(m_database.open()) + database.setDatabaseName(dir.absoluteFilePath("database2.db")); + if(database.open()) { - m_database.exec("PRAGMA foreign_keys = ON"); + QSqlQuery query(database); + query.exec("PRAGMA foreign_keys = ON"); int version = checkVersion(); if(version == 0) { - m_database.exec("PRAGMA user_version = 1"); - m_database.exec("CREATE TABLE IF NOT EXISTS files (id INTEGER PRIMARY KEY AUTOINCREMENT, file VARCHAR(255) UNIQUE)"); - m_database.exec("CREATE TABLE IF NOT EXISTS fits_files (id INTEGER PRIMARY KEY AUTOINCREMENT, file VARCHAR(255) UNIQUE, mtime DATETIME," + query.exec("PRAGMA user_version = 1"); + query.exec("CREATE TABLE IF NOT EXISTS files (id INTEGER PRIMARY KEY AUTOINCREMENT, file VARCHAR(255) UNIQUE)"); + query.exec("CREATE TABLE IF NOT EXISTS fits_files (id INTEGER PRIMARY KEY AUTOINCREMENT, file VARCHAR(255) UNIQUE, mtime DATETIME," " minRa REAL, maxRa REAL, minDec REAL, maxDec REAL, crVal1 REAL, crVal2 REAL)"); - m_database.exec("CREATE TABLE IF NOT EXISTS fits_headers (id INTEGER PRIMARY KEY AUTOINCREMENT, id_file INTEGER," + query.exec("CREATE TABLE IF NOT EXISTS fits_headers (id INTEGER PRIMARY KEY AUTOINCREMENT, id_file INTEGER," "key VARCHAR(81), value VARCHAR(81), comment VARCHAR(81), FOREIGN KEY(id_file) REFERENCES fits_files(id) ON DELETE CASCADE)"); - m_database.exec("CREATE INDEX IF NOT EXISTS key_value ON fits_headers(key, value)"); - m_database.exec("CREATE INDEX IF NOT EXISTS id_file ON fits_headers(id_file)"); - m_database.exec("CREATE INDEX IF NOT EXISTS minRa_idx ON fits_files(minRa)"); - m_database.exec("CREATE INDEX IF NOT EXISTS maxRa_idx ON fits_files(maxRa)"); - m_database.exec("CREATE INDEX IF NOT EXISTS minDec_idx ON fits_files(minDec)"); - m_database.exec("CREATE INDEX IF NOT EXISTS maxDec_idx ON fits_files(maxDec)"); + query.exec("CREATE INDEX IF NOT EXISTS key_value ON fits_headers(key, value)"); + query.exec("CREATE INDEX IF NOT EXISTS id_file ON fits_headers(id_file)"); + query.exec("CREATE INDEX IF NOT EXISTS minRa_idx ON fits_files(minRa)"); + query.exec("CREATE INDEX IF NOT EXISTS maxRa_idx ON fits_files(maxRa)"); + query.exec("CREATE INDEX IF NOT EXISTS minDec_idx ON fits_files(minDec)"); + query.exec("CREATE INDEX IF NOT EXISTS maxDec_idx ON fits_files(maxDec)"); } else if(version > 1) { @@ -48,28 +49,28 @@ bool Database::init(const QLatin1String &connectionName) return false; } - QSqlError error = m_database.lastError(); + QSqlError error = database.lastError(); if(error.type() == QSqlError::NoError) { - m_markQuery = QSqlQuery(m_database); + m_markQuery = QSqlQuery(database); m_markQuery.prepare("INSERT INTO files (file) VALUES (?)"); - m_unmarkQuery = QSqlQuery(m_database); + m_unmarkQuery = QSqlQuery(database); m_unmarkQuery.prepare("DELETE FROM files WHERE file = (?)"); - m_isMarkedQuery = QSqlQuery(m_database); + m_isMarkedQuery = QSqlQuery(database); m_isMarkedQuery.prepare("SELECT * FROM files WHERE file = (:name)"); - m_insertFile = QSqlQuery(m_database); + m_insertFile = QSqlQuery(database); m_insertFile.prepare("INSERT INTO fits_files (file, mtime) VALUES (?, ?)"); - m_insertFileWcs = QSqlQuery(m_database); + m_insertFileWcs = QSqlQuery(database); m_insertFileWcs.prepare("INSERT INTO fits_files (file, mtime, minRa, maxRa, minDec, maxDec, crVal1, crVal2) VALUES (?, ?, ?, ?, ?, ?, ?, ?)"); - m_insertFitsHeader = QSqlQuery(m_database); + m_insertFitsHeader = QSqlQuery(database); m_insertFitsHeader.prepare("INSERT INTO fits_headers (id_file, key, value, comment) VALUES (?, ?, ?, ?)"); - m_checkFile = QSqlQuery(m_database); + m_checkFile = QSqlQuery(database); m_checkFile.prepare("SELECT id,mtime FROM fits_files WHERE file=?"); - m_headerKeywords = QSqlQuery(m_database); + m_headerKeywords = QSqlQuery(database); m_headerKeywords.prepare("SELECT DISTINCT key FROM fits_headers ORDER BY key"); - m_deleteFile = QSqlQuery(m_database); + m_deleteFile = QSqlQuery(database); m_deleteFile.prepare("DELETE FROM fits_files WHERE id=?"); return true; } @@ -130,7 +131,7 @@ QStringList Database::getMarkedFiles() void Database::clearMarkedFiles() { - QSqlDatabase::database().exec("DELETE FROM files"); + QSqlQuery query("DELETE FROM files"); } bool Database::checkError(QSqlQuery &query) @@ -148,7 +149,7 @@ bool Database::checkError(QSqlQuery &query) int Database::checkVersion() { QSqlDatabase db = QSqlDatabase::database(); - QSqlQuery query = db.exec("PRAGMA user_version"); + QSqlQuery query("PRAGMA user_version"); if(query.next()) return query.value(0).toInt(); return -1; @@ -194,10 +195,10 @@ void Database::reindex(QProgressDialog *progress) QVariantList deleteids; QSqlDatabase database = QSqlDatabase::database(); database.transaction(); - QSqlQuery size = database.exec("SELECT COUNT(*) FROM fits_files"); + QSqlQuery size("SELECT COUNT(*) FROM fits_files", database); size.next(); progress->setMaximum(size.value(0).toInt()); - QSqlQuery files = database.exec("SELECT id,file,mtime FROM fits_files"); + QSqlQuery files("SELECT id,file,mtime FROM fits_files", database); int i = 0; while(files.next()) { diff --git a/databaseview.cpp b/databaseview.cpp index 244093c..7bea690 100644 --- a/databaseview.cpp +++ b/databaseview.cpp @@ -375,7 +375,7 @@ bool DataBaseView::exportCSV(const QString &path) if(!csv.open(QIODevice::WriteOnly | QIODevice::Text)) return false; - QSqlQuery sql = m_model->query(); + QSqlQuery sql(m_model->query().lastQuery()); int colCount = m_model->columnCount(); QStringList header; for(int i=0; iselect(); }