From 3a5754944e8331023db8a8f14777a4e864795f6e Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Thu, 8 Mar 2018 00:32:35 +0300 Subject: [PATCH] Fixed bug after merge [#CLICKHOUSE-2] --- dbms/src/Dictionaries/ClickHouseDictionarySource.cpp | 2 +- dbms/src/Dictionaries/MySQLDictionarySource.cpp | 2 +- dbms/src/Dictionaries/ODBCDictionarySource.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/Dictionaries/ClickHouseDictionarySource.cpp b/dbms/src/Dictionaries/ClickHouseDictionarySource.cpp index 7d1bfa10cb1..a19d0197490 100644 --- a/dbms/src/Dictionaries/ClickHouseDictionarySource.cpp +++ b/dbms/src/Dictionaries/ClickHouseDictionarySource.cpp @@ -46,7 +46,7 @@ ClickHouseDictionarySource::ClickHouseDictionarySource( db{config.getString(config_prefix + ".db", "")}, table{config.getString(config_prefix + ".table")}, where{config.getString(config_prefix + ".where", "")}, - update_field{config.getString(config_prefix + ".update_field")}, + update_field{config.getString(config_prefix + ".update_field", "")}, query_builder{dict_struct, db, table, where, ExternalQueryBuilder::Backticks}, sample_block{sample_block}, context(context), is_local{isLocalAddress({ host, port }, config.getInt("tcp_port", 0))}, diff --git a/dbms/src/Dictionaries/MySQLDictionarySource.cpp b/dbms/src/Dictionaries/MySQLDictionarySource.cpp index fe72f0380d5..352010c93da 100644 --- a/dbms/src/Dictionaries/MySQLDictionarySource.cpp +++ b/dbms/src/Dictionaries/MySQLDictionarySource.cpp @@ -30,7 +30,7 @@ MySQLDictionarySource::MySQLDictionarySource(const DictionaryStructure & dict_st db{config.getString(config_prefix + ".db", "")}, table{config.getString(config_prefix + ".table")}, where{config.getString(config_prefix + ".where", "")}, - update_field{config.getString(config_prefix + ".update_field")}, + update_field{config.getString(config_prefix + ".update_field", "")}, dont_check_update_time{config.getBool(config_prefix + ".dont_check_update_time", false)}, sample_block{sample_block}, pool{config, config_prefix}, diff --git a/dbms/src/Dictionaries/ODBCDictionarySource.cpp b/dbms/src/Dictionaries/ODBCDictionarySource.cpp index 9f7ef671061..7db8dbe9e34 100644 --- a/dbms/src/Dictionaries/ODBCDictionarySource.cpp +++ b/dbms/src/Dictionaries/ODBCDictionarySource.cpp @@ -25,7 +25,7 @@ ODBCDictionarySource::ODBCDictionarySource(const DictionaryStructure & dict_stru db{config.getString(config_prefix + ".db", "")}, table{config.getString(config_prefix + ".table")}, where{config.getString(config_prefix + ".where", "")}, - update_field{config.getString(config_prefix + ".update_field")}, + update_field{config.getString(config_prefix + ".update_field", "")}, sample_block{sample_block}, query_builder{dict_struct, db, table, where, ExternalQueryBuilder::None}, /// NOTE Better to obtain quoting style via ODBC interface. load_all_query{query_builder.composeLoadAllQuery()},