#5148 Fixed counting of tables in queries transparently attaching oth…

…er databases
pawelsalawa · Dec 8, 2024 · e82c12f · e82c12f
1 parent aa72498
commit e82c12f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.cpp b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.cpp
@@ -32,6 +32,7 @@
 #include <QThreadPool>
 #include <QDebug>
 #include <QtMath>
+#include <dbattacher.h>
 
 // TODO modify all executor steps to use rebuildTokensFromContents() method, instead of replacing tokens manually.
 
@@ -297,13 +298,6 @@ void QueryExecutor::execInternal()
     simpleExecution = false;
     interrupted = false;
 
-    if (resultsCountingAsyncId != 0)
-    {
-        resultsCountingAsyncId = 0;
-        db->interrupt();
-        releaseResultsAndCleanup();
-    }
-
     // Reset context
     delete context;
     context = new Context();
@@ -351,6 +345,24 @@ bool QueryExecutor::countResults()
         return false;
     }
 
+    // Apply all transparent attaches to the counting DB
+    auto it = context->dbNameToAttach.iterator();
+    while (it.hasNext())
+    {
+        auto entry = it.next();
+        Db* dbToAttach = DBLIST->getByName(entry.key());
+        SqlQueryPtr attachRes = countingDb->exec(QString("ATTACH '%1' AS %2").arg(dbToAttach->getPath(), entry.value()));
+        if (attachRes->isError())
+        {
+            notifyError(tr("An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1")
+                        .arg("Failed to attach necessary databases for counting."));
+
+            qDebug() << "Error while attaching db for counting:" << attachRes->getErrorText();
+            countingDb->detachAll();
+            return false;
+        }
+    }
+
     if (asyncMode)
     {
         // Start asynchronous results counting query
@@ -596,6 +608,7 @@ bool QueryExecutor::handleRowCountingResults(SqlQueryPtr results)
                     .arg(results->getErrorText()));
     }
 
+    countingDb->detachAll();
     return true;
 }
 

diff --git a/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.h b/SQLiteStudio3/coreSQLiteStudio/db/queryexecutor.h
@@ -1385,14 +1385,6 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable
          */
         qint64 simpleExecutionStartTime;
 
-        /**
-         * @brief Asynchronous ID of counting query execution.
-         *
-         * Asynchronous ID returned from Db::asyncExec() for the counting query execution.
-         * See countResults() for details on counting query.
-         */
-        quint32 resultsCountingAsyncId = 0;
-
         /**
          * @brief Flag indicating results preloading.
          *
@@ -1496,6 +1488,7 @@ class API_EXPORT QueryExecutor : public QObject, public QRunnable
         bool forceSimpleMode = false;
         ChainExecutor* simpleExecutor = nullptr;
         Db* countingDb = nullptr;
+        QStringList countingAttaches;
 
     signals:
         /**

diff --git a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp
@@ -42,7 +42,7 @@
 
 DEFINE_SINGLETON(SQLiteStudio)
 
-static const int sqlitestudioVersion = 30409;
+static const int sqlitestudioVersion = 30410;
 
 SQLiteStudio::SQLiteStudio()
 {