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

Fixes

Browse Source
This commit is contained in:
kssenii 2021-11-03 09:17:27 +00:00
parent feb3d8bc75
commit 26c4affc18
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/client/Client.cpp
View File

@ -408,6 +408,9 @@ void Client::prepareForInteractive()
clearTerminal(); clearTerminal();
showClientVersion(); showClientVersion();
if (delayed_interactive)
std::cout << std::endl;
/// Load Warnings at the beginning of connection /// Load Warnings at the beginning of connection
if (!config().has("no-warnings")) if (!config().has("no-warnings"))
{ {
@ -563,8 +566,9 @@ void Client::connect()
if (is_interactive) if (is_interactive)
{ {
std::cout << "Connected to " << server_name << " server version " << server_version << " revision " << server_revision << "." std::cout << "Connected to " << server_name << " server version " << server_version << " revision " << server_revision << "."
<< std::endl
<< std::endl; << std::endl;
if (!delayed_interactive)
std::cout << std::endl;
auto client_version_tuple = std::make_tuple(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH); auto client_version_tuple = std::make_tuple(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
auto server_version_tuple = std::make_tuple(server_version_major, server_version_minor, server_version_patch); auto server_version_tuple = std::make_tuple(server_version_major, server_version_minor, server_version_patch);

3
src/Client/ClientBase.cpp
View File

@ -1705,6 +1705,9 @@ void ClientBase::init(int argc, char ** argv)
config().setString("history_file", options["history_file"].as<std::string>()); config().setString("history_file", options["history_file"].as<std::string>());
if (options.count("verbose")) if (options.count("verbose"))
config().setBool("verbose", true); config().setBool("verbose", true);
if (options.count("interactive"))
config().setBool("interactive", true);
if (options.count("log-level")) if (options.count("log-level"))
Poco::Logger::root().setLevel(options["log-level"].as<std::string>()); Poco::Logger::root().setLevel(options["log-level"].as<std::string>());
if (options.count("server_logs_file")) if (options.count("server_logs_file"))

3
tests/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.expect
View File

@ -23,8 +23,5 @@ send -- "select * from t format TSV\r"
expect "1" expect "1"
expect ":) " expect ":) "
send -- "exit\r"
expect eof
spawn bash -c "\$CLICKHOUSE_TESTS_DIR/helpers/02112_clean.sh" spawn bash -c "\$CLICKHOUSE_TESTS_DIR/helpers/02112_clean.sh"

0
tests/queries/0_stateless/02112_delayed_clickhouse_local.expect.reference
View File

3
tests/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.expect
View File

@ -23,8 +23,5 @@ send -- "select * from t format TSV\r"
expect "1" expect "1"
expect ":) " expect ":) "
send -- "exit\r"
expect eof
spawn bash -c "\$CLICKHOUSE_TESTS_DIR/helpers/02112_clean.sh" spawn bash -c "\$CLICKHOUSE_TESTS_DIR/helpers/02112_clean.sh"