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

MXS-3404 Fix parsing of TRIM()

Browse Source 
Now should accept all possible argument variations.
This commit is contained in:
Johan Wikman
2021-03-01 08:54:25 +02:00
parent 49d56c31bc
commit 0408bd9531
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2135,12 +2135,15 @@ expr(A) ::= keyword_as_function(X) LP distinct(D) exprlist(Y) RP(E). {
} }
} }
trim_arg1_opt ::= TRIM_ARG.
trim_arg1_opt ::= .
trim_arg2 ::= INTEGER|STRING. %type trim_args {ExprSpan}
%destructor trim_args {sqlite3ExprDelete(pParse->db, $$.pExpr);}
trim_args(A) ::= TRIM_ARG term FROM expr(X). { A = X; }
trim_args(A) ::= TRIM_ARG FROM expr(X). { A = X; }
trim_args(A) ::= term FROM expr(X). { A = X; }
trim_args(A) ::= expr(X). { A = X; }
expr(A) ::= TRIM(X) LP trim_arg1_opt trim_arg2 FROM expr(Y) RP(Z). { expr(A) ::= TRIM(X) LP trim_args(Y) RP(Z). {
ExprList* pArgs = sqlite3ExprListAppend(pParse, NULL, Y.pExpr); ExprList* pArgs = sqlite3ExprListAppend(pParse, NULL, Y.pExpr);
A.pExpr = sqlite3ExprFunction(pParse, pArgs, &X); A.pExpr = sqlite3ExprFunction(pParse, pArgs, &X);
spanSet(&A, &X, &Z); spanSet(&A, &X, &Z);