mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-21 09:10:48 +00:00
fix sync
This commit is contained in:
parent
f67fd49a73
commit
5674949c18
@ -22,11 +22,12 @@ Macros::Macros(const Poco::Util::AbstractConfiguration & config, const String &
|
||||
macros[key] = config.getString(root_key + "." + key);
|
||||
if (key == "database" || key == "table" || key == "uuid")
|
||||
{
|
||||
LOG_WARNING(log,
|
||||
"Config file contains '{}' macro. This macro has special meaning "
|
||||
"and it's explicit definition is not recommended. Implicit unfolding for "
|
||||
"'database', 'table' and 'uuid' macros will be disabled.",
|
||||
key);
|
||||
if (log)
|
||||
LOG_WARNING(log,
|
||||
"Config file contains '{}' macro. This macro has special meaning "
|
||||
"and it's explicit definition is not recommended. Implicit unfolding for "
|
||||
"'database', 'table' and 'uuid' macros will be disabled.",
|
||||
key);
|
||||
enable_special_macros = false;
|
||||
}
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ class Macros
|
||||
{
|
||||
public:
|
||||
Macros() = default;
|
||||
Macros(const Poco::Util::AbstractConfiguration & config, const String & key, Poco::Logger * log);
|
||||
Macros(const Poco::Util::AbstractConfiguration & config, const String & key, Poco::Logger * log = nullptr);
|
||||
|
||||
struct MacroExpansionInfo
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user