thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17565 from ClickHouse/fix-multiline-queries-with-comments

Browse Source 
Fix multiline queries with comments in interactive mode
This commit is contained in:
alexey-milovidov 2020-11-30 09:38:41 +03:00 committed by GitHub
commit 46e685e1b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/common/LineReader.cpp
View File

@ -127,7 +127,7 @@ String LineReader::readLine(const String & first_prompt, const String & second_p
}
#endif
line += (line.empty() ? "" : " ") + input;
line += (line.empty() ? "" : "\n") + input;
if (!need_next_line)
break;

0
tests/queries/0_stateless/01599_multiline_input_and_singleline_comments.reference Normal file
View File

25
tests/queries/0_stateless/01599_multiline_input_and_singleline_comments.sh Executable file
View File

@ -0,0 +1,25 @@
#!/usr/bin/expect -f
log_user 0
set timeout 5
match_max 100000
if ![info exists env(CLICKHOUSE_PORT_TCP)] {set env(CLICKHOUSE_PORT_TCP) 9000}
spawn clickhouse-client --multiline --port "$env(CLICKHOUSE_PORT_TCP)"
expect ":) "
# Make a query
send -- "SELECT 1\r"
expect ":-] "
send -- "-- xxx\r"
expect ":-] "
send -- ", 2\r"
expect ":-] "
send -- ";\r"
expect "│ 1 │ 2 │"
expect ":) "
send -- "\4"
expect eof