dbms: fixed build [#METR-10616].

This commit is contained in:
Alexey Milovidov 2014-03-29 00:32:38 +04:00
parent ad52e7dd9d
commit c12d5231dd
6 changed files with 21 additions and 21 deletions

View File

@ -50,8 +50,8 @@ int main(int argc, char ** argv)
DB::ExpressionAnalyzer analyzer(ast, context); DB::ExpressionAnalyzer analyzer(ast, context);
DB::ExpressionActionsChain chain; DB::ExpressionActionsChain chain;
analyzer.appendSelect(chain); analyzer.appendSelect(chain, false);
analyzer.appendProjectResult(chain); analyzer.appendProjectResult(chain, false);
chain.finalize(); chain.finalize();
DB::ExpressionActionsPtr expression = chain.getLastActions(); DB::ExpressionActionsPtr expression = chain.getLastActions();

View File

@ -56,8 +56,8 @@ int main(int argc, char ** argv)
DB::ExpressionAnalyzer analyzer(ast, context); DB::ExpressionAnalyzer analyzer(ast, context);
DB::ExpressionActionsChain chain; DB::ExpressionActionsChain chain;
analyzer.appendSelect(chain); analyzer.appendSelect(chain, false);
analyzer.appendProjectResult(chain); analyzer.appendProjectResult(chain, false);
chain.finalize(); chain.finalize();
DB::ExpressionActionsPtr expression = chain.getLastActions(); DB::ExpressionActionsPtr expression = chain.getLastActions();

View File

@ -130,8 +130,8 @@ int main(int argc, char ** argv)
DB::ExpressionAnalyzer analyzer(ast, context); DB::ExpressionAnalyzer analyzer(ast, context);
DB::ExpressionActionsChain chain; DB::ExpressionActionsChain chain;
analyzer.appendSelect(chain); analyzer.appendSelect(chain, false);
analyzer.appendWhere(chain); analyzer.appendWhere(chain, false);
chain.finalize(); chain.finalize();
DB::ExpressionActionsPtr expression = chain.getLastActions(); DB::ExpressionActionsPtr expression = chain.getLastActions();

View File

@ -71,8 +71,8 @@ int main(int argc, char ** argv)
DB::ExpressionAnalyzer analyzer(ast, context); DB::ExpressionAnalyzer analyzer(ast, context);
DB::ExpressionActionsChain chain; DB::ExpressionActionsChain chain;
analyzer.appendSelect(chain); analyzer.appendSelect(chain, false);
analyzer.appendProjectResult(chain); analyzer.appendProjectResult(chain, false);
chain.finalize(); chain.finalize();
DB::ExpressionActionsPtr expression = chain.getLastActions(); DB::ExpressionActionsPtr expression = chain.getLastActions();

View File

@ -65,8 +65,8 @@ int main(int argc, char ** argv)
DB::ExpressionAnalyzer analyzer(ast, context); DB::ExpressionAnalyzer analyzer(ast, context);
DB::ExpressionActionsChain chain; DB::ExpressionActionsChain chain;
analyzer.appendSelect(chain); analyzer.appendSelect(chain, false);
analyzer.appendProjectResult(chain); analyzer.appendProjectResult(chain, false);
chain.finalize(); chain.finalize();
DB::ExpressionActionsPtr expression = chain.getLastActions(); DB::ExpressionActionsPtr expression = chain.getLastActions();

View File

@ -86,19 +86,19 @@ int main(int argc, char ** argv)
std::cout << "\n"; std::cout << "\n";
ExpressionActionsChain before; ExpressionActionsChain before;
if (analyzer.appendWhere(before)) if (analyzer.appendWhere(before, false))
before.addStep(); before.addStep();
analyzer.appendAggregateFunctionsArguments(before); analyzer.appendAggregateFunctionsArguments(before, false);
analyzer.appendGroupBy(before); analyzer.appendGroupBy(before, false);
before.finalize(); before.finalize();
ExpressionActionsChain after; ExpressionActionsChain after;
if (analyzer.appendHaving(after)) if (analyzer.appendHaving(after, false))
after.addStep(); after.addStep();
analyzer.appendSelect(after); analyzer.appendSelect(after, false);
analyzer.appendOrderBy(after); analyzer.appendOrderBy(after, false);
after.addStep(); after.addStep();
analyzer.appendProjectResult(after); analyzer.appendProjectResult(after, false);
after.finalize(); after.finalize();
std::cout << "before aggregation:\n\n"; std::cout << "before aggregation:\n\n";
@ -120,12 +120,12 @@ int main(int argc, char ** argv)
if (dynamic_cast<ASTSelectQuery *>(&*root)) if (dynamic_cast<ASTSelectQuery *>(&*root))
{ {
ExpressionActionsChain chain; ExpressionActionsChain chain;
if (analyzer.appendWhere(chain)) if (analyzer.appendWhere(chain, false))
chain.addStep(); chain.addStep();
analyzer.appendSelect(chain); analyzer.appendSelect(chain, false);
analyzer.appendOrderBy(chain); analyzer.appendOrderBy(chain, false);
chain.addStep(); chain.addStep();
analyzer.appendProjectResult(chain); analyzer.appendProjectResult(chain, false);
chain.finalize(); chain.finalize();
for (size_t i = 0; i < chain.steps.size(); ++i) for (size_t i = 0; i < chain.steps.size(); ++i)