Always use QUERY_SQL in the dqlite shell #260
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In recent versions of dqlite, the QUERY_SQL request supports SQL queries that modify the database and do not return rows. Update internal/shell/shell.go to always send this request for SQL strings entered by the user, instead of switching between QUERY_SQL and EXEC_SQL based on whether the string start with `SELECT`. Also fix the Rows iterator so that it can deal with empty row sets that have zero columns. Previously it would enter an infinite loop in this situation. Signed-off-by: Cole Miller <cole.miller@canonical.com>
|
Note that this does not address the desire for the dqlite shell to fully support RETURNING, but that's not a go-dqlite issue. Once dqlite learns how to handle requests that both modify the database and return rows, such statements will just work with go-dqlite Query and the shell. |
cole-miller
force-pushed
the
shell
branch
2 times, most recently
from
ed54a2f
to
0c6530a
Compare
Signed-off-by: Cole Miller <cole.miller@canonical.com>
|
Any related dqlite issue? I searched with |
|
@zxill You're right, we didn't have a dqlite issue for this, so I've opened one at canonical/dqlite#527 and will fill in details there when I get the chance. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In recent versions of dqlite, the QUERY_SQL request supports SQL
queries that modify the database and do not return rows. Update
internal/shell/shell.go to always send this request for SQL strings
entered by the user, instead of switching between QUERY_SQL and EXEC_SQL
based on whether the string starts with
SELECT.Also fix the Rows iterator so that it can deal with empty row sets that
have zero columns, and add a regression test. Previously it would enter
an infinite loop in this situation.
Closes #239
Signed-off-by: Cole Miller cole.miller@canonical.com