Enhance database handling, GUI stability, and testing support

AGENTS.md

@@ -33,7 +33,7 @@ implementation details. If you introduce a new domain term, add it to
   run SQL, it goes through the seam. The seam owns query construction.
 - **No widget pointers in non-GUI modules.** A module that takes a
   `QWidget*` is a presenter, not a domain module. Presenters are thin.
-- **No SQL string concatenation in non-database modules.** `dbquery.h`
+- **No SQL string concatenation in non-database modules.** `QueryExecutor`
   splitting-by-`;` lives in the database module, not in `mainwindow.cpp` or
   the CLI.
 

CONTEXT.md

@@ -22,7 +22,7 @@ architecture, the modules, and the tests all refer to the same things.
 
 ## User-facing actions
 
-- **Query** — a single SQL statement the user wrote and wants executed.
+- **Query** — a single SQL statement the user wrote and wants to execute.
 - **Script** — a sequence of Queries loaded from a `.sql` file.
 - **Export** — a one-shot transformation of Database content into a different
   representation. Two formats: **CSV** (one file per table) and **SQL**
@@ -52,8 +52,9 @@ architecture, the modules, and the tests all refer to the same things.
 - **IDatabase** — abstract Database. Production adapter is `SqliteDatabase`;
   test adapter is `InMemoryDatabase`. Anything that takes a Database takes
   `IDatabase*`. `QSqlDatabase` does not leak across this seam.
-- **ExportStrategy** — abstract DataExporter workflow (`SqlExportStrategy`,
-  `CsvExportStrategy`). Two adapters = real seam.
+- **ExportOrchestrator** — runs a DataExporter in the background, marshals
+  progress to the GUI thread, surfaces cancel and completion via exportToSql()
+  and exportToCsv().
 
 ## Out of scope (do not introduce)
 

build.ps1

@@ -83,16 +83,19 @@ if ($IsWindows) {
         if (Test-Path $testExe) {
             $env:PATH = "$QtPath\bin;$QtPath\lib;$env:PATH"
             Write-Host "Executing: $testExe"
-            & $testExe
-            $env:PATH = $env:PATH -replace [regex]::Escape("$QtPath\bin;$QtPath\lib;"), ""
-            if ($LASTEXITCODE -ne 0) {
-                Write-Error "Tests failed (exit code: $LASTEXITCODE)"
+            Push-Location build
+            & .\SQLiteQueryTests.exe
+            $testExitCode = $LASTEXITCODE
+            Pop-Location
+            if ($testExitCode -ne 0) {
+                Write-Error "Tests failed (exit code: $testExitCode)"
                 exit 1
             }
             Write-Host "`n=== All tests passed ===" -ForegroundColor Green
         }
         else {
-            Write-Warning "Test executable not found at: $testExe"
+            Write-Error "Test executable not found at: $testExe"
+            exit 1
         }
     }
 
@@ -106,6 +109,30 @@ if ($IsLinux) {
     cmake --build build --config Release --parallel $(nproc)
     cmake --install build
 
+    Write-Host "`nRunning tests..."
+    $testExe = "./build/SQLiteQueryTests"
+    if (Test-Path $testExe) {
+        $originalPath = $env:PATH
+        if ($QtPath) {
+            $pathArray = ($env:PATH -split ':') | Where-Object { $_ -ne "$QtPath/bin" -and $_ -ne "$QtPath/lib" }
+            $pathArray = @("$QtPath/bin", "$QtPath/lib") + $pathArray
+            $env:PATH = $pathArray -join ':'
+        }
+        Write-Host "Executing: $testExe"
+        & $testExe
+        if ($QtPath) {
+            $env:PATH = $originalPath
+        }
+        if ($LASTEXITCODE -ne 0) {
+            Write-Error "Tests failed (exit code: $LASTEXITCODE)"
+            exit 1
+        }
+        Write-Host "`n=== All tests passed ===" -ForegroundColor Green
+    }
+    else {
+        Write-Warning "Test executable not found at: $testExe"
+    }
+
     if ($Package) {
         cpack -G 7Z --config ./build/CPackConfig.cmake
         cpack -G ZIP --config ./build/CPackConfig.cmake
@@ -125,10 +152,35 @@ if ($IsLinux) {
     }
 }
 
-if ($IsMacOS -And $Package) {
+if ($IsMacOS) {
 
     cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/tmp/sqlitequery
     cmake --build build --config Release --parallel 32
+
+    Write-Host "`nRunning tests..."
+    $testExe = "./build/SQLiteQueryTests"
+    if (Test-Path $testExe) {
+        $originalPath = $env:PATH
+        if ($QtPath) {
+            $pathArray = ($env:PATH -split ':') | Where-Object { $_ -ne "$QtPath/bin" -and $_ -ne "$QtPath/lib" }
+            $pathArray = @("$QtPath/bin", "$QtPath/lib") + $pathArray
+            $env:PATH = $pathArray -join ':'
+        }
+        Write-Host "Executing: $testExe"
+        & $testExe
+        if ($QtPath) {
+            $env:PATH = $originalPath
+        }
+        if ($LASTEXITCODE -ne 0) {
+            Write-Error "Tests failed (exit code: $LASTEXITCODE)"
+            exit 1
+        }
+        Write-Host "`n=== All tests passed ===" -ForegroundColor Green
+    }
+    else {
+        Write-Warning "Test executable not found at: $testExe"
+    }
+
     if ($Package) {
         macdeployqt build/SQLiteQueryAnalyzer.app -dmg -appstore-compliant
     }

src/cli/script.cpp

@@ -29,9 +29,20 @@ void Script::executeSqlFile(const QString &sqlFilePath,
     QStringList errors;
     executor.runScript(sqlScript, &errors);
 
+    if (!errors.isEmpty()) {
+        QTextStream err(stderr);
+        for (const auto &error : errors) {
+            err << "ERROR: " << error << "\n";
+        }
+    }
+
     const auto milliseconds = static_cast<double>(time.elapsed());
     const auto msg = "Script execution took " + QString::number(milliseconds / 1000) + " seconds";
     QTextStream out(stdout);
     out << msg;
     fflush(stdout);
+
+    if (!errors.isEmpty()) {
+        exit(1);
+    }
 }

src/database/dbanalyzer.cpp

@@ -2,10 +2,6 @@
 
 #include <QFileInfo>
 
-#include "dbanalyzer.h"
-
-#include <QFileInfo>
-
 DbAnalyzer::DbAnalyzer(IDatabase *database)
     : database(database) {
 }
@@ -26,13 +22,14 @@ bool DbAnalyzer::analyze(DatabaseInfo &info) const {
 void DbAnalyzer::loadTables(DatabaseInfo &info) const {
     const QString sql = "SELECT * FROM sqlite_master WHERE type='table'";
 
-    if (!this->database->open()) {
+    const bool wasOpen = this->database->isOpen();
+    if (!wasOpen && !this->database->open()) {
         return;
     }
 
     const QueryResult result = this->database->runStatement(sql);
     if (!result.ok) {
-        database->close();
+        if (!wasOpen) database->close();
         return;
     }
 
@@ -47,7 +44,7 @@ void DbAnalyzer::loadTables(DatabaseInfo &info) const {
         info.tables.append(table);
     }
 
-    database->close();
+    if (!wasOpen) database->close();
 }
 
 void DbAnalyzer::loadColumns(DatabaseInfo &info) const {

src/database/dbexportdata.cpp

@@ -64,12 +64,15 @@ void DbDataExport::exportDataToSqlFile(IDatabase *database,
             });
 
         if (!streamResult.ok) {
+            progress->addError(table.name, streamResult.error);
             continue;
         }
         out << "\n";
     }
     file->close();
-    progress->setCompleted();
+    if (!progress->hasAnyErrors()) {
+        progress->setCompleted();
+    }
 }
 
 void DbDataExport::exportDataToCsvFile(IDatabase *database,
@@ -106,9 +109,13 @@ void DbDataExport::exportDataToCsvFile(IDatabase *database,
 
         file->close();
         if (!streamResult.ok) {
+            progress->addError(table.name, streamResult.error);
+            QFile::remove(filename);
             continue;
         }
     }
 
-    progress->setCompleted();
+    if (!progress->hasAnyErrors()) {
+        progress->setCompleted();
+    }
 }

src/database/idatabase.h

@@ -19,6 +19,8 @@ class IDatabase {
 
     virtual void close() = 0;
 
+    [[nodiscard]] virtual bool isOpen() const = 0;
+
     virtual void shrink() = 0;
 
     [[nodiscard]] virtual QString getFilename() const = 0;

src/database/inmemorydatabase.cpp

@@ -7,10 +7,13 @@
 InMemoryDatabase::InMemoryDatabase() {
     database = QSqlDatabase::addDatabase("QSQLITE", "in_memory_connection");
     database.setDatabaseName(":memory:");
-    database.setHostName("localhost");
 }
 
 void InMemoryDatabase::setSource(const QString &filename) {
+    if (database.databaseName() == ":memory:") {
+        qWarning("InMemoryDatabase::setSource: cannot change source of in-memory database");
+        return;
+    }
     this->source = filename;
     database.setDatabaseName(filename);
 }

src/database/inmemorydatabase.h

@@ -16,6 +16,8 @@ class InMemoryDatabase : public IDatabase {
 
     void close() override;
 
+    [[nodiscard]] bool isOpen() const override { return database.isOpen(); }
+
     void shrink() override;
 
     [[nodiscard]] QString getFilename() const override { return source; }
@@ -25,8 +27,6 @@ class InMemoryDatabase : public IDatabase {
     QueryResult streamRows(const QString &sql,
                            const std::function<bool(const QList<QVariant> &)> &onRow) override;
 
-    [[nodiscard]] QSqlDatabase getConnection() const { return database; }
-
 private:
     QSqlDatabase database;
     QString source;

src/database/progress.h

@@ -1,15 +1,23 @@
 #ifndef PROGRESS_H
 #define PROGRESS_H
 
+#include <QStringList>
+#include <QTextStream>
+#include <stdio.h>
+
 class ExportDataProgress {
     uint64_t affectedRows = 0;
     bool isComplete = false;
     bool printProgress = false;
+    bool hasErrors = false;
+    QStringList errors;
 
 public:
     void reset() {
         affectedRows = 0;
         isComplete = false;
+        hasErrors = false;
+        errors.clear();
     }
 
     void increment() {
@@ -22,8 +30,15 @@ class ExportDataProgress {
         }
     }
 
+    void addError(const QString &table, const QString &message) {
+        hasErrors = true;
+        errors.append(QString("[%1] %2").arg(table, message));
+    }
+
     [[nodiscard]] uint64_t getAffectedRows() const { return affectedRows; }
     [[nodiscard]] bool isCompleted() const { return isComplete; }
+    [[nodiscard]] bool hasAnyErrors() const { return hasErrors; }
+    [[nodiscard]] const QStringList &getErrors() const { return errors; }
     void setCompleted() { isComplete = true; }
     void setShowProgress(const bool value) { printProgress = value; }
     [[nodiscard]] bool isShowProgress() const { return printProgress; }

src/database/queryexecutor.cpp

@@ -12,7 +12,7 @@ QList<QueryResult> QueryExecutor::runScript(const QString &script, QStringList *
 QList<QueryResult> QueryExecutor::runStatements(const QStringList &statements, QStringList *errors) {
     QList<QueryResult> results;
     for (const auto &raw: statements) {
-        const QString sql = raw.trimmed().replace('\n', "", Qt::CaseInsensitive);
+        const QString sql = raw.trimmed().replace('\n', "");
         if (sql.isEmpty())
             continue;
 

src/database/queryresult.h

@@ -16,7 +16,7 @@ struct QueryResult {
     bool isSelect = false;
     QStringList columns;
     QList<QueryRow> rows;
-    int rowsAffected = 0;
+    qint64 rowsAffected = 0;
 };
 
 #endif // QUERYRESULT_H

src/database/sqlitedatabase.cpp

@@ -5,8 +5,9 @@
 #include <QSqlRecord>
 
 SqliteDatabase::SqliteDatabase() {
-    database = QSqlDatabase::addDatabase("QSQLITE");
-    database.setHostName("localhost");
+    static int instanceCounter = 0;
+    const QString connectionName = QString("sqlite_connection_%1").arg(++instanceCounter);
+    database = QSqlDatabase::addDatabase("QSQLITE", connectionName);
 }
 
 void SqliteDatabase::setSource(const QString &filename) {
@@ -16,7 +17,8 @@ void SqliteDatabase::setSource(const QString &filename) {
 }
 
 bool SqliteDatabase::open() {
-    this->close();
+    if (database.isOpen())
+        return true;
     return database.open();
 }
 
@@ -30,7 +32,9 @@ void SqliteDatabase::shrink() {
         database.open();
 
     QSqlQuery query(database);
-    query.exec("VACUUM");
+    if (!query.exec("VACUUM")) {
+        qWarning("VACUUM failed: %s", qPrintable(query.lastError().text()));
+    }
 }
 
 QueryResult SqliteDatabase::runStatement(const QString &sql) {

src/database/sqlitedatabase.h

@@ -16,6 +16,8 @@ class SqliteDatabase : public IDatabase {
 
     void close() override;
 
+    [[nodiscard]] bool isOpen() const override { return database.isOpen(); }
+
     void shrink() override;
 
     [[nodiscard]] QString getFilename() const override { return source; }