thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 09:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reuse correct function

Browse Source
This commit is contained in:
alesapin 2020-03-19 11:36:37 +03:00
parent d060b7111d
commit c4553f2f7b
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dbms/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
View File

@ -1,6 +1,7 @@
#include <Dictionaries/getDictionaryConfigurationFromAST.h> #include <Dictionaries/getDictionaryConfigurationFromAST.h>
#include <boost/algorithm/string/replace.hpp> #include <IO/ReadBufferFromString.h>
#include <IO/ReadHelpers.h>
#include <Poco/DOM/AutoPtr.h> #include <Poco/DOM/AutoPtr.h>
#include <Poco/DOM/Document.h> #include <Poco/DOM/Document.h>
#include <Poco/DOM/Element.h> #include <Poco/DOM/Element.h>
@ -32,16 +33,16 @@ namespace
using NamesToTypeNames = std::unordered_map<std::string, std::string>; using NamesToTypeNames = std::unordered_map<std::string, std::string>;
/// Get value from field and convert it to string. /// Get value from field and convert it to string.
/// Also remove quotes from strings. /// Also remove quotes from strings.
String getUnescapedFieldString(const Field & field) String getUnquotedFieldString(const Field & field)
{ {
String string = applyVisitor(FieldVisitorToString(), field); String string = applyVisitor(FieldVisitorToString(), field);
if (string.front() == '\'')
if (!string.empty() && string.front() == '\'' && string.back() == '\'') {
string = string.substr(1, string.size() - 2); String result;
ReadBufferFromString buf(string);
/// Escaping will be performed on dictionary providers side readQuotedString(result, buf);
boost::replace_all(string, "\\'", "'"); return result;
boost::replace_all(string, "\\\\", "\\"); }
return string; return string;
} }
@ -189,7 +190,7 @@ void buildSingleAttribute(
AutoPtr<Element> null_value_element(doc->createElement("null_value")); AutoPtr<Element> null_value_element(doc->createElement("null_value"));
String null_value_str; String null_value_str;
if (dict_attr->default_value) if (dict_attr->default_value)
null_value_str = getUnescapedFieldString(dict_attr->default_value->as<ASTLiteral>()->value); null_value_str = getUnquotedFieldString(dict_attr->default_value->as<ASTLiteral>()->value);
AutoPtr<Text> null_value(doc->createTextNode(null_value_str)); AutoPtr<Text> null_value(doc->createTextNode(null_value_str));
null_value_element->appendChild(null_value); null_value_element->appendChild(null_value);
attribute_element->appendChild(null_value_element); attribute_element->appendChild(null_value_element);
@ -203,7 +204,7 @@ void buildSingleAttribute(
if (const auto * literal = dict_attr->expression->as<ASTLiteral>(); if (const auto * literal = dict_attr->expression->as<ASTLiteral>();
literal && literal->value.getType() == Field::Types::String) literal && literal->value.getType() == Field::Types::String)
{ {
expression_str = getUnescapedFieldString(literal->value); expression_str = getUnquotedFieldString(literal->value);
} }
else else
expression_str = queryToString(dict_attr->expression); expression_str = queryToString(dict_attr->expression);
@ -352,7 +353,7 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
} }
else if (auto literal = pair->second->as<const ASTLiteral>(); literal) else if (auto literal = pair->second->as<const ASTLiteral>(); literal)
{ {
AutoPtr<Text> value(doc->createTextNode(getUnescapedFieldString(literal->value))); AutoPtr<Text> value(doc->createTextNode(getUnquotedFieldString(literal->value)));
current_xml_element->appendChild(value); current_xml_element->appendChild(value);
} }
else if (auto list = pair->second->as<const ASTExpressionList>(); list) else if (auto list = pair->second->as<const ASTExpressionList>(); list)