Improve detection of query vs. modify statements in Execute SQL tab

This should improve the detection of read-only query statements vs. modifiying statements in the Execute SQL tab. The idea is to stop looking for the SELECT keyword at the beginning of the statement and instead fully rely on whether SQLite returns any data for this statement. See issue #1185.
sqlitebrowser · Oct 27, 2017 · 955848f · 955848f
1 parent b9595b9
commit 955848f
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -1080,28 +1080,33 @@ void MainWindow::executeQuery()
             {
             case SQLITE_ROW:
             {
+                // If we get here, the SQL statement returns some sort of data. So hand it over to the model for display. Don't set the modified flag
+                // because statements that display data don't change data as well.
+
                 sqlWidget->getModel()->setQuery(queryPart);
 
                 // The query takes the last placeholder as it may itself contain the sequence '%' + number
                 statusMessage = tr("%1 rows returned in %2ms from: %3").arg(
                             sqlWidget->getModel()->totalRowCount()).arg(timer.elapsed()).arg(queryPart.trimmed());
                 ui->actionSqlResultsSave->setEnabled(true);
                 ui->actionSqlResultsSaveAsView->setEnabled(!db.readOnly());
+
+                statusMessage = tr("Query executed successfully: %1 (took %2ms)").arg(queryPart.trimmed()).arg(timer.elapsed());
                 sql3status = SQLITE_OK;
+                break;
             }
             case SQLITE_DONE:
             case SQLITE_OK:
             {
-                if(query_part_type != SelectStatement)
-                {
-                    modified = true;
+                // If we get here, the SQL statement doesn't return data and just executes. Don't run it again because it has already been executed.
+                // But do set the modified flag because statements that don't return data, often modify the database.
 
-                    QString stmtHasChangedDatabase;
-                    if(query_part_type == InsertStatement || query_part_type == UpdateStatement || query_part_type == DeleteStatement)
-                        stmtHasChangedDatabase = tr(", %1 rows affected").arg(sqlite3_changes(db._db));
+                QString stmtHasChangedDatabase;
+                if(query_part_type == InsertStatement || query_part_type == UpdateStatement || query_part_type == DeleteStatement)
+                    stmtHasChangedDatabase = tr(", %1 rows affected").arg(sqlite3_changes(db._db));
 
-                    statusMessage = tr("Query executed successfully: %1 (took %2ms%3)").arg(queryPart.trimmed()).arg(timer.elapsed()).arg(stmtHasChangedDatabase);
-                }
+                modified = true;
+                statusMessage = tr("Query executed successfully: %1 (took %2ms%3)").arg(queryPart.trimmed()).arg(timer.elapsed()).arg(stmtHasChangedDatabase);
                 break;
             }
             case SQLITE_MISUSE: