thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 09:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

SyntaxAnalyzer (in progress).

Browse Source
This commit is contained in:
Nikolai Kochetov 2018-11-07 15:44:05 +03:00
parent bcd6e03257
commit 748b0f7077
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -132,6 +132,7 @@ ExpressionAnalyzer::ExpressionAnalyzer(
auto syntax_analyzer_result = SyntaxAnalyzer()
.analyze(query, context, storage, source_columns, required_result_columns_, subquery_depth);
query = syntax_analyzer_result.query;
storage = syntax_analyzer_result.storage;
source_columns = syntax_analyzer_result.source_columns;
aliases = syntax_analyzer_result.aliases;
array_join_result_to_source = syntax_analyzer_result.array_join_result_to_source;
@ -139,7 +140,6 @@ ExpressionAnalyzer::ExpressionAnalyzer(
array_join_name_to_alias = syntax_analyzer_result.array_join_name_to_alias;
analyzed_join = syntax_analyzer_result.analyzed_join;
rewrite_subqueries = syntax_analyzer_result.rewrite_subqueries;
storage = syntax_analyzer_result.storage;
select_query = typeid_cast<ASTSelectQuery *>(query.get());

3
dbms/src/Interpreters/SyntaxAnalyzer.cpp
View File

@ -832,10 +832,9 @@ SyntaxAnalyzerResult SyntaxAnalyzer::analyze(const ASTPtr & query,
const Names & required_result_columns,
size_t subquery_depth) const
{
SyntaxAnalyzerResult result;
result.storage = storage;
result.query = query->clone();
result.query = query; // ->clone();
auto * select_query = typeid_cast<ASTSelectQuery *>(result.query.get());
result.source_columns = collectSourceColumns(std::move(source_columns), select_query, context, result.storage);