cli: support multi-line copy/paste #28235
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
|
This change is |
The introduction of support for bracketed paste (cockroachdb#23116 / cedff23) has broken an invariant in the SQL shell: that the readline function can return at most one line of input. The shell was not organized to "peek" within that line and detect that it needs different handling for different parts of the pasted input, for example when pasting: ``` \set display_format csv values (1,2), (3,4); ``` the `\set` must be executed client-side, and the `values` server-side. This was not possible and the entire string was sent to the server, and the server reported an error upon encountering `\set`. To address this, this patch recognizes multi-line results of Readline() and ensures the lines are processed one by one. Release note (bug fix): `cockroach sql` and `cockroach demo` now again properly handles copy-pasting a mixture of client-side commands (e.g. `\set`) and SQL statements.
knz
force-pushed
the
20180803-multiline-paste
branch
from
6562b9d
to
abf1928
Compare
benesch
approved these changes
Aug 3, 2018
|
thanks! bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Aug 3, 2018
28235: cli: support multi-line copy/paste r=knz a=knz Fixes #24965. The introduction of support for bracketed paste (#23116 / cedff23) has broken an invariant in the SQL shell: that the readline function can return at most one line of input. The shell was not organized to "peek" within that line and detect that it needs different handling for different parts of the pasted input, for example when pasting: ``` \set display_format csv values (1,2), (3,4); ``` the `\set` must be executed client-side, and the `values` server-side. This was not possible and the entire string was sent to the server, and the server reported an error upon encountering `\set`. To address this, this patch recognizes multi-line results of Readline() and ensures the lines are processed one by one. Release note (bug fix): `cockroach sql` and `cockroach demo` now again properly handles copy-pasting a mixture of client-side commands (e.g. `\set`) and SQL statements. Co-authored-by: Raphael 'kena' Poss <knz@cockroachlabs.com>
Build succeeded |
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.
Fixes #24965.
The introduction of support for bracketed paste (#23116 /
cedff23) has broken an invariant in
the SQL shell: that the readline function can return at most one line
of input. The shell was not organized to "peek" within that line and
detect that it needs different handling for different parts of the
pasted input, for example when pasting:
the
\setmust be executed client-side, and thevaluesserver-side. This was not possible and the entire string was sent to
the server, and the server reported an error upon encountering
\set.To address this, this patch recognizes multi-line results of
Readline() and ensures the lines are processed one by one.
Release note (bug fix):
cockroach sqlandcockroach demonow againproperly handles copy-pasting a mixture of client-side
commands (e.g.
\set) and SQL statements.