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

Fix tests

Browse Source
This commit is contained in:
kssenii 2021-10-16 19:30:35 +00:00
parent e127fa6976
commit 91e9ab7760
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/client/Client.cpp
View File

@ -231,9 +231,6 @@ bool Client::executeMultiQuery(const String & all_queries_text)
}
catch (...)
{
if (!is_interactive)
throw;
// Surprisingly, this is a client error. A server error would
// have been reported w/o throwing (see onReceiveSeverException()).
client_exception = std::make_unique<Exception>(getCurrentExceptionMessage(print_stack_trace), getCurrentExceptionCode());

4
programs/local/LocalServer.cpp
View File

@ -142,7 +142,7 @@ bool LocalServer::executeMultiQuery(const String & all_queries_text)
}
catch (...)
{
if (!is_interactive)
if (!is_interactive && !ignore_error)
throw;
// Surprisingly, this is a client error. A server error would
@ -472,7 +472,7 @@ catch (const DB::Exception & e)
cleanup();
bool print_stack_trace = config().getBool("stacktrace", false);
std::cerr << getExceptionMessage(e, print_stack_trace, true) << std::endl << std::endl;
std::cerr << getExceptionMessage(e, print_stack_trace, true) << std::endl;
return e.code() ? e.code() : -1;
}
catch (...)