mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
Fix
This commit is contained in:
parent
59cbe8579d
commit
410b17b4a1
@ -413,13 +413,18 @@ int LocalServer::main(const std::vector<std::string> & /*args*/)
|
||||
try
|
||||
{
|
||||
UseSSL use_ssl;
|
||||
InterruptListener interrupt_listener;
|
||||
ThreadStatus thread_status;
|
||||
|
||||
std::cout << std::fixed << std::setprecision(3);
|
||||
std::cerr << std::fixed << std::setprecision(3);
|
||||
|
||||
if (!is_interactive)
|
||||
is_interactive = stdin_is_a_tty && !config().has("query") && !config().has("table-structure") && queries_files.empty();
|
||||
std::optional<InterruptListener> interrupt_listener;
|
||||
if (is_interactive)
|
||||
{
|
||||
interrupt_listener.emplace();
|
||||
}
|
||||
else
|
||||
{
|
||||
/// We will terminate process on error
|
||||
static KillingErrorHandler error_handler;
|
||||
@ -437,7 +442,6 @@ try
|
||||
|
||||
processConfig();
|
||||
applyCmdSettings(global_context);
|
||||
|
||||
connect();
|
||||
|
||||
if (is_interactive)
|
||||
@ -478,13 +482,11 @@ catch (...)
|
||||
|
||||
void LocalServer::processConfig()
|
||||
{
|
||||
if (stdin_is_a_tty && !config().has("query") && !config().has("table-structure") && queries_files.empty())
|
||||
if (is_interactive)
|
||||
{
|
||||
if (config().has("query") && config().has("queries-file"))
|
||||
throw Exception("Specify either `query` or `queries-file` option", ErrorCodes::BAD_ARGUMENTS);
|
||||
|
||||
is_interactive = true;
|
||||
|
||||
if (config().has("multiquery"))
|
||||
is_multiquery = true;
|
||||
|
||||
|
@ -212,6 +212,9 @@ std_cerr_cout_excludes=(
|
||||
src/Interpreters/Context.cpp
|
||||
# IProcessor::dump()
|
||||
src/Processors/IProcessor.cpp
|
||||
src/Client/ClientBase.cpp
|
||||
src/Client/QueryFuzzer.cpp
|
||||
src/Client/Suggest.cpp
|
||||
)
|
||||
sources_with_std_cerr_cout=( $(
|
||||
find $ROOT_PATH/src -name '*.h' -or -name '*.cpp' | \
|
||||
|
Loading…
Reference in New Issue
Block a user