thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ISSUES-2343 fix failed test (#2344)

Browse Source
This commit is contained in:
Winter Zhang 2018-05-11 22:35:32 +08:00 committed by Vitaliy Lyudvichenko
parent efe661b620
commit adbbbb3c48
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/src/Server/LocalServer.cpp
View File

@ -171,7 +171,7 @@ try
std::string default_database = config().getString("default_database", "_local"); std::string default_database = config().getString("default_database", "_local");
context->addDatabase(default_database, std::make_shared<DatabaseMemory>(default_database)); context->addDatabase(default_database, std::make_shared<DatabaseMemory>(default_database));
context->setCurrentDatabase(default_database); context->setCurrentDatabase(default_database);
applyCmdSettings(*context); applyCmdOptions(*context);
if (!context->getPath().empty()) if (!context->getPath().empty())
{ {
@ -480,6 +480,12 @@ void LocalServer::init(int argc, char ** argv)
config().setBool("ignore-error", true); config().setBool("ignore-error", true);
} }
void LocalServer::applyCmdOptions(Context & context)
{
context.setDefaultFormat(config().getString("output-format", config().getString("format", "TSV")));
applyCmdSettings(context);
}
} }
int mainEntryClickHouseLocal(int argc, char ** argv) int mainEntryClickHouseLocal(int argc, char ** argv)

1
dbms/src/Server/LocalServer.h
View File

@ -36,6 +36,7 @@ private:
std::string getInitialCreateTableQuery(); std::string getInitialCreateTableQuery();
void tryInitPath(); void tryInitPath();
void applyCmdOptions(Context & context);
void applyCmdSettings(Context & context); void applyCmdSettings(Context & context);
void attachSystemTables(); void attachSystemTables();
void processQueries(); void processQueries();