Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 2580 #2583

Merged
merged 2 commits into from
Jul 2, 2018
Merged

Issue 2580 #2583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd1d39c
Reload client connection params before reconnection. #2580
KochetovNicolai Jul 2, 2018
a13f4e2
Added test. #2580
KochetovNicolai Jul 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dbms/programs/client/Client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,6 @@ class Client : public Poco::Util::Application
echo_queries = config().getBool("echo", false);
}

connection_parameters = ConnectionParameters(config());
connect();

/// Initialize DateLUT here to avoid counting time spent here as query execution time.
Expand Down Expand Up @@ -492,6 +491,8 @@ class Client : public Poco::Util::Application

void connect()
{
connection_parameters = ConnectionParameters(config());

if (is_interactive)
std::cout << "Connecting to "
<< (!connection_parameters.default_database.empty() ? "database " + connection_parameters.default_database + " at " : "")
Expand Down
1 change: 1 addition & 0 deletions dbms/tests/queries/0_stateless/00651_default_database_on_client_reconnect.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
val UInt64
6 changes: 6 additions & 0 deletions dbms/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
. $CURDIR/../shell_config.sh

${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "USE test; DROP TABLE IF EXISTS tab; CREATE TABLE tab (val UInt64) engine = Memory; SHOW CREATE TABLE tab format abcd; DESC tab; DROP TABLE tab;" 2> /dev/null