Fixed inconsistency between clickhouse-client and clickhouse-local [#CLICKHOUSE-2]

This commit is contained in:
Alexey Milovidov 2018-08-23 04:35:19 +03:00
parent 61f3c4f0d1
commit 0562ab69e8

View File

@ -273,7 +273,7 @@ void LocalServer::processQueries()
/// Use the same query_id (and thread group) for all queries /// Use the same query_id (and thread group) for all queries
CurrentThread::QueryScope query_scope_holder(*context); CurrentThread::QueryScope query_scope_holder(*context);
bool echo_query = config().hasOption("echo") || config().hasOption("verbose"); bool echo_queries = config().hasOption("echo") || config().hasOption("verbose");
std::exception_ptr exception; std::exception_ptr exception;
for (const auto & query : queries) for (const auto & query : queries)
@ -281,8 +281,8 @@ void LocalServer::processQueries()
ReadBufferFromString read_buf(query); ReadBufferFromString read_buf(query);
WriteBufferFromFileDescriptor write_buf(STDOUT_FILENO); WriteBufferFromFileDescriptor write_buf(STDOUT_FILENO);
if (echo_query) if (echo_queries)
std::cerr << query << '\n'; std::cout << query << '\n';
try try
{ {