cli/sql: properly support special COPY input mode #93057
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 |
otan
reviewed
Dec 6, 2022
pkg/cli/clisqlshell/editor_copy.go
Outdated
| // (outside of COPY mode) or a "copy" editor (inside COPY). | ||
| // This is because the main editor may be multi-line and | ||
| // thus inadequate for input of COPY data. | ||
| type copyEditor struct { |
There was a problem hiding this comment.
i'm not sure about the naming of this - it sounds like it handles copy but if i read this right it's really a mux of some sort where we redirect traffic based on the mode we're in. can we do something like editorRouter or something? file name has a similar issue.
There was a problem hiding this comment.
I went for bimodalEditor. Do you like it?
When in COPY mode, multi-line input is disabled and the tab key inputs raw ASCII TAB characters. This commit achieves this by redirecting the input to either the interactive editor or the bufio-based editor, depending on whether the current mode is COPY. NB: using ctrl+c while in COPY mode will not work with this patch, but that is caused by a separate issue cockroachdb#93053 and the behavior will be restored when that separate issue is fixed. In the meantime the user can use `\.` or ctrl+d to terminate their input. Release note: None
knz
force-pushed
the
20221205-sql-copy
branch
from
a0fd120 to
3fd75b4
Compare
otan
approved these changes
Dec 6, 2022
|
TFYR! bors r=otan |
|
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 #93031.
Epic: CRDB-22182
When in COPY mode, multi-line input is disabled and the tab key inputs raw ASCII TAB characters.
This commit achieves this by redirecting the input to either the interactive editor or the bufio-based editor, depending on whether the current mode is COPY.
NB: using ctrl+c while in COPY mode will not work with this patch, but that is caused by a separate issue #93053 and the behavior will be restored when that separate issue is fixed. In the meantime the user can use
\.or ctrl+d to terminate their input.Release note: None