From 42ecf91df1686d12957af075c4cd6e070c0a09aa Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Tue, 11 Aug 2020 00:36:49 +0300 Subject: [PATCH] Fix "Arcadia" build --- programs/client/ConnectionParameters.cpp | 7 ++++++- programs/ya.make | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/client/ConnectionParameters.cpp b/programs/client/ConnectionParameters.cpp index f0ef3ae5694..19734dd5ffa 100644 --- a/programs/client/ConnectionParameters.cpp +++ b/programs/client/ConnectionParameters.cpp @@ -9,7 +9,10 @@ #include #include #include -#include + +#if !defined(ARCADIA_BUILD) +#include // Y_IGNORE +#endif namespace DB { @@ -49,10 +52,12 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati } if (password_prompt) { +#if !defined(ARCADIA_BUILD) std::string prompt{"Password for user (" + user + "): "}; char buf[1000] = {}; if (auto * result = readpassphrase(prompt.c_str(), buf, sizeof(buf), 0)) password = result; +#endif } compression = config.getBool("compression", true) ? Protocol::Compression::Enable : Protocol::Compression::Disable; diff --git a/programs/ya.make b/programs/ya.make index 31e7b6f8569..1b80b264959 100644 --- a/programs/ya.make +++ b/programs/ya.make @@ -6,14 +6,9 @@ CFLAGS( -DENABLE_CLICKHOUSE_SERVER ) -ADDINCL ( - GLOBAL clickhouse/base/readpassphrase -) - PEERDIR( clickhouse/base/daemon clickhouse/base/loggers - clickhouse/base/readpassphrase clickhouse/src )