Skip to content

Fix Returning support #2854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bmalrat wants to merge 2 commits into from
Closed

Fix Returning support #2854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
592fe4f
Fix Returning support
bmalrat Oct 4, 2021
eb6d7d2
update comments
bmalrat Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/RowLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 8 additions & 1 deletion src/RunSql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,18 @@ 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_part_type == StatementType::InsertStatement || query_part_type == StatementType::UpdateStatement ||
query_part_type == StatementType::DeleteStatement)
modified = true;

may_continue_with_execution = false;

auto time_end = std::chrono::high_resolution_clock::now();
Expand Down