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

Merge pull request #29790 from ClickHouse/fix-bad-cast-in-parser-create

Browse Source 
Fix bad cast in ParserCreateQuery
This commit is contained in:
tavplubix 2021-10-08 23:53:38 +03:00 committed by GitHub
commit fa1396a9dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
View File

@ -120,7 +120,7 @@ static NamesAndTypesList getColumnsList(const ASTExpressionList * columns_defini
auto * literal = child->as<ASTLiteral>(); auto * literal = child->as<ASTLiteral>();
new_child->arguments = std::make_shared<ASTExpressionList>(); new_child->arguments = std::make_shared<ASTExpressionList>();
new_child->arguments->children.push_back(std::make_shared<ASTLiteral>(literal->value.get<String>())); new_child->arguments->children.push_back(std::make_shared<ASTLiteral>(literal->value.safeGet<String>()));
new_child->arguments->children.push_back(std::make_shared<ASTLiteral>(Int16(++i))); new_child->arguments->children.push_back(std::make_shared<ASTLiteral>(Int16(++i)));
child = new_child; child = new_child;
} }

4
src/Parsers/ParserCreateQuery.cpp
View File

@ -481,7 +481,7 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
if (attach && s_from.ignore(pos, expected)) if (attach && s_from.ignore(pos, expected))
{ {
ParserLiteral from_path_p; ParserStringLiteral from_path_p;
if (!from_path_p.parse(pos, from_path, expected)) if (!from_path_p.parse(pos, from_path, expected))
return false; return false;
} }
@ -896,7 +896,7 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
if (ParserKeyword{"TO INNER UUID"}.ignore(pos, expected)) if (ParserKeyword{"TO INNER UUID"}.ignore(pos, expected))
{ {
ParserLiteral literal_p; ParserStringLiteral literal_p;
if (!literal_p.parse(pos, to_inner_uuid, expected)) if (!literal_p.parse(pos, to_inner_uuid, expected))
return false; return false;
} }

2
src/Storages/MergeTree/MergeTreeIndexSet.cpp
View File

@ -461,7 +461,7 @@ bool MergeTreeIndexConditionSet::checkASTUseless(const ASTPtr & node, bool atomi
[this](const auto & arg) { return checkASTUseless(arg, true); }); [this](const auto & arg) { return checkASTUseless(arg, true); });
} }
else if (const auto * literal = node->as<ASTLiteral>()) else if (const auto * literal = node->as<ASTLiteral>())
return !atomic && literal->value.get<bool>(); return !atomic && literal->value.safeGet<bool>();
else if (const auto * identifier = node->as<ASTIdentifier>()) else if (const auto * identifier = node->as<ASTIdentifier>())
return key_columns.find(identifier->getColumnName()) == std::end(key_columns); return key_columns.find(identifier->getColumnName()) == std::end(key_columns);
else else

1
tests/queries/0_stateless/01188_attach_table_from_path.sql
View File

@ -7,6 +7,7 @@ drop table if exists mt;
attach table test from 'some/path' (n UInt8) engine=Memory; -- { serverError 48 } attach table test from 'some/path' (n UInt8) engine=Memory; -- { serverError 48 }
attach table test from '/etc/passwd' (s String) engine=File(TSVRaw); -- { serverError 481 } attach table test from '/etc/passwd' (s String) engine=File(TSVRaw); -- { serverError 481 }
attach table test from '../../../../../../../../../etc/passwd' (s String) engine=File(TSVRaw); -- { serverError 481 } attach table test from '../../../../../../../../../etc/passwd' (s String) engine=File(TSVRaw); -- { serverError 481 }
attach table test from 42 (s String) engine=File(TSVRaw); -- { clientError 62 }
insert into table function file('01188_attach/file/data.TSV', 'TSV', 's String, n UInt8') values ('file', 42); insert into table function file('01188_attach/file/data.TSV', 'TSV', 's String, n UInt8') values ('file', 42);
attach table file from '01188_attach/file' (s String, n UInt8) engine=File(TSV); attach table file from '01188_attach/file' (s String, n UInt8) engine=File(TSV);