Lubuntu/ci-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also use exponential backoff for a locked db in the initial database schema, and support passing a QString to exec()

Browse Source
This commit is contained in:
Simon Quigley 2025-01-25 15:18:34 -06:00
parent 8b6ff0a865
commit 296f37262d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cpp/db_common.cpp
View File

@ -56,11 +56,13 @@ QSqlDatabase get_thread_connection() {
return thread_db;
}
bool ci_query_exec(QSqlQuery* query) {
bool ci_query_exec(QSqlQuery* query, const QString query_string) {
bool passed = false;
int attempt = 0;
while (!passed) {
passed = query->exec();
if (query_string.isEmpty()) passed = query->exec();
else passed = query->exec(query_string);
if (passed) return true;
attempt++;
@ -79,9 +81,9 @@ bool init_database(const QString& database_path) {
// Apply PRAGMAs
{
QSqlQuery pragma_query(get_thread_connection());
pragma_query.exec("PRAGMA journal_mode = WAL;");
pragma_query.exec("PRAGMA synchronous = NORMAL;");
pragma_query.exec("PRAGMA foreign_keys = ON;");
ci_query_exec(&pragma_query, "PRAGMA journal_mode = WAL;");
ci_query_exec(&pragma_query, "PRAGMA synchronous = NORMAL;");
ci_query_exec(&pragma_query, "PRAGMA foreign_keys = ON;");
}
// Run the schema creation (or migration) statements
@ -200,7 +202,7 @@ bool init_database(const QString& database_path) {
for (const QString &statement : sql_statements) {
QSqlQuery query(get_thread_connection());
QString trimmed = statement.trimmed();
if (!trimmed.isEmpty() && !query.exec(trimmed)) {
if (!trimmed.isEmpty() && !ci_query_exec(&query, trimmed)) {
qDebug() << "Failed to execute SQL: " << trimmed
<< "\nError: " << query.lastError().text();
return false;

3
cpp/db_common.h
View File

@ -18,9 +18,10 @@
#include <QSqlDatabase>
#include <QSqlQuery>
#include <QString>
QSqlDatabase get_thread_connection();
bool ci_query_exec(QSqlQuery* query);
bool ci_query_exec(QSqlQuery* query, const QString query_string = "");
bool init_database(const QString& database_path);
#endif // DB_COMMON_H