Fix Returning support (#2854)

bmalrat · mgrojo · commit 299666dc2adc · 2023-09-06T18:08:18.000+02:00
See issue #2720.
diff --git a/src/RowLoader.cpp b/src/RowLoader.cpp
@@ -203,7 +203,11 @@ void RowLoader::run ()
 void RowLoader::process (Task & t)
 {
     QString sLimitQuery;
-    if(query.startsWith("PRAGMA", Qt::CaseInsensitive) || query.startsWith("EXPLAIN", Qt::CaseInsensitive))
+    if(query.startsWith("PRAGMA", Qt::CaseInsensitive) || query.startsWith("EXPLAIN", Qt::CaseInsensitive) ||
+        // With RETURNING keyword DELETE,INSERT,UPDATE can return rows
+        // https://www.sqlite.org/lang_returning.html
+        query.startsWith("DELETE", Qt::CaseInsensitive) || query.startsWith("INSERT", Qt::CaseInsensitive) ||
+        query.startsWith("UPDATE", Qt::CaseInsensitive))
     {
         sLimitQuery = query;
     } else {
diff --git a/src/RunSql.cpp b/src/RunSql.cpp
@@ -182,11 +182,17 @@ bool RunSql::executeNextStatement()
         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.
+            // because statements that display data don't change data as well, except if the statement are one of INSERT/UPDATE/DELETE that could
+            // return datas with the RETURNING keyword.
 
             releaseDbAccess();
 
             lk.lock();
+
+            // Set the modified flag to true if the statement was one of INSERT/UPDATE/DELETE triggered by a possible RETURNING keyword.
+            if (query_type == InsertStatement || query_type == UpdateStatement || query_type == DeleteStatement)
+                modified = true;
+
             may_continue_with_execution = false;
 
             auto time_end = std::chrono::high_resolution_clock::now();

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,11 @@ void RowLoader::run ()`
`203`	`203`	`void RowLoader::process (Task & t)`
`204`	`204`	`{`
`205`	`205`	`QString sLimitQuery;`
`206`		`- if(query.startsWith("PRAGMA", Qt::CaseInsensitive) \|\| query.startsWith("EXPLAIN", Qt::CaseInsensitive))`
	`206`	`+ if(query.startsWith("PRAGMA", Qt::CaseInsensitive) \|\| query.startsWith("EXPLAIN", Qt::CaseInsensitive) \|\|`
	`207`	`+ // With RETURNING keyword DELETE,INSERT,UPDATE can return rows`
	`208`	`+ // https://www.sqlite.org/lang_returning.html`
	`209`	`+ query.startsWith("DELETE", Qt::CaseInsensitive) \|\| query.startsWith("INSERT", Qt::CaseInsensitive) \|\|`
	`210`	`+ query.startsWith("UPDATE", Qt::CaseInsensitive))`
`207`	`211`	`{`
`208`	`212`	`sLimitQuery = query;`
`209`	`213`	`} else {`