thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 10:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Query CREATE DICTIONARY id expression fix

Browse Source
This commit is contained in:
Maksim Kita 2021-01-25 15:43:35 +03:00
parent 77af612bc5
commit ab7f15c77e
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/Dictionaries/getDictionaryConfigurationFromAST.cpp
View File

@ -180,6 +180,32 @@ Names getPrimaryKeyColumns(const ASTExpressionList * primary_key)
return result; return result;
} }
void buildAttributeExpressionIfNeeded(
AutoPtr<Document> doc,
AutoPtr<Element> root,
const ASTDictionaryAttributeDeclaration * dict_attr)
{
if (dict_attr->expression != nullptr)
{
AutoPtr<Element> expression_element(doc->createElement("expression"));
/// EXPRESSION PROPERTY should be expression or string
String expression_str;
if (const auto * literal = dict_attr->expression->as<ASTLiteral>();
literal && literal->value.getType() == Field::Types::String)
{
expression_str = getFieldAsString(literal->value);
}
else
expression_str = queryToString(dict_attr->expression);
AutoPtr<Text> expression(doc->createTextNode(expression_str));
expression_element->appendChild(expression);
root->appendChild(expression_element);
}
}
/** /**
* Transofrms single dictionary attribute to configuration * Transofrms single dictionary attribute to configuration
* third_column UInt8 DEFAULT 2 EXPRESSION rand() % 100 * 77 * third_column UInt8 DEFAULT 2 EXPRESSION rand() % 100 * 77
@ -217,25 +243,7 @@ void buildSingleAttribute(
null_value_element->appendChild(null_value); null_value_element->appendChild(null_value);
attribute_element->appendChild(null_value_element); attribute_element->appendChild(null_value_element);
if (dict_attr->expression != nullptr) buildAttributeExpressionIfNeeded(doc, attribute_element, dict_attr);
{
AutoPtr<Element> expression_element(doc->createElement("expression"));
/// EXPRESSION PROPERTY should be expression or string
String expression_str;
if (const auto * literal = dict_attr->expression->as<ASTLiteral>();
literal && literal->value.getType() == Field::Types::String)
{
expression_str = getFieldAsString(literal->value);
}
else
expression_str = queryToString(dict_attr->expression);
AutoPtr<Text> expression(doc->createTextNode(expression_str));
expression_element->appendChild(expression);
attribute_element->appendChild(expression_element);
}
if (dict_attr->hierarchical) if (dict_attr->hierarchical)
{ {
@ -286,6 +294,8 @@ void buildPrimaryKeyConfiguration(
const Names & key_names, const Names & key_names,
const ASTExpressionList * dictionary_attributes) const ASTExpressionList * dictionary_attributes)
{ {
const auto & children = dictionary_attributes->children;
if (!complex) if (!complex)
{ {
if (key_names.size() != 1) if (key_names.size() != 1)
@ -296,12 +306,16 @@ void buildPrimaryKeyConfiguration(
root->appendChild(id_element); root->appendChild(id_element);
AutoPtr<Element> name_element(doc->createElement("name")); AutoPtr<Element> name_element(doc->createElement("name"));
id_element->appendChild(name_element); id_element->appendChild(name_element);
AutoPtr<Text> name(doc->createTextNode(*key_names.begin()));
const ASTDictionaryAttributeDeclaration * dict_attr = children.front()->as<const ASTDictionaryAttributeDeclaration>();
AutoPtr<Text> name(doc->createTextNode(dict_attr->name));
name_element->appendChild(name); name_element->appendChild(name);
buildAttributeExpressionIfNeeded(doc, id_element, dict_attr);
} }
else else
{ {
const auto & children = dictionary_attributes->children;
if (children.size() < key_names.size()) if (children.size() < key_names.size())
throw Exception( throw Exception(
"Primary key fields count is more, than dictionary attributes count.", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION); "Primary key fields count is more, than dictionary attributes count.", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);