hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1364 Simplify grammar rules

Browse Source
This commit is contained in:
Johan Wikman
2017-08-22 15:31:50 +03:00
parent bea56f40b2
commit 4c100a305e
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
View File

@ -1977,26 +1977,10 @@ wf_frame_opt ::= wf_frame_units wf_frame_extent wf_frame_exclusion_opt .
wf ::= OVER LP wf_window_ref_opt wf_partition_by_opt wf_order_by_opt wf_frame_opt RP. wf ::= OVER LP wf_window_ref_opt wf_partition_by_opt wf_order_by_opt wf_frame_opt RP.
wf ::= OVER id. wf ::= OVER id.
expr(A) ::= id(X) LP distinct(D) exprlist(Y) func_arg_tail_opt(Z) RP(E) wf. { wf_opt ::= .
// We just append Z on Y as we are only interested in what columns wf_opt ::= wf.
// the function used.
Y = sqlite3ExprListAppendList(pParse, Y, Z);
if( Y && Y->nExpr>pParse->db->aLimit[SQLITE_LIMIT_FUNCTION_ARG] ){
sqlite3ErrorMsg(pParse, "too many arguments on function %T", &X);
}
A.pExpr = sqlite3ExprFunction(pParse, Y, &X);
spanSet(&A,&X,&E);
if( D==SF_Distinct && A.pExpr ){
A.pExpr->flags |= EP_Distinct;
}
}
expr(A) ::= id(X) LP STAR RP(E) wf. { expr(A) ::= id(X) LP distinct(D) exprlist(Y) func_arg_tail_opt(Z) RP(E) wf_opt. {
A.pExpr = sqlite3ExprFunction(pParse, 0, &X);
spanSet(&A,&X,&E);
}
expr(A) ::= id(X) LP distinct(D) exprlist(Y) func_arg_tail_opt(Z) RP(E). {
// We just append Z on Y as we are only interested in what columns // We just append Z on Y as we are only interested in what columns
// the function used. // the function used.
Y = sqlite3ExprListAppendList(pParse, Y, Z); Y = sqlite3ExprListAppendList(pParse, Y, Z);
@ -2014,7 +1998,7 @@ expr(A) ::= id(X) LP distinct(D) exprlist(Y) RP(E). {
} }
} }
%ifdef MAXSCALE %ifdef MAXSCALE
expr(A) ::= nm DOT nm(X) LP distinct(D) exprlist(Y) func_arg_tail_opt(Z) RP(E). { expr(A) ::= nm DOT nm(X) LP distinct(D) exprlist(Y) func_arg_tail_opt(Z) RP(E) wf_opt. {
// We just append Z on Y as we are only interested in what columns // We just append Z on Y as we are only interested in what columns
// the function used. // the function used.
Y = sqlite3ExprListAppendList(pParse, Y, Z); Y = sqlite3ExprListAppendList(pParse, Y, Z);
@ -2043,7 +2027,7 @@ expr(A) ::= keyword_as_function(X) LP distinct(D) exprlist(Y) RP(E). {
} }
} }
%endif %endif
expr(A) ::= id(X) LP STAR RP(E). { expr(A) ::= id(X) LP STAR RP(E) wf_opt. {
A.pExpr = sqlite3ExprFunction(pParse, 0, &X); A.pExpr = sqlite3ExprFunction(pParse, 0, &X);
spanSet(&A,&X,&E); spanSet(&A,&X,&E);
} }