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

MXS-1196: Accept UNIQUE as synonym for DISTINCT

Browse Source
This commit is contained in:
Johan Wikman
2017-05-02 15:55:34 +03:00
parent 518f7e81ca
commit da0900786a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1113,6 +1113,7 @@ select_into(A) ::= INTO OUTFILE STRING. {A = sqlite3ExprListAppend(pParse, 0, 0)
%type select_options {int} %type select_options {int}
select_options(A) ::= . {A = 0;} select_options(A) ::= . {A = 0;}
select_options(A) ::= select_options DISTINCT. {A = SF_Distinct;} select_options(A) ::= select_options DISTINCT. {A = SF_Distinct;}
select_options(A) ::= select_options UNIQUE. {A = SF_Distinct;}
select_options(A) ::= select_options ALL. {A = SF_All;} select_options(A) ::= select_options ALL. {A = SF_All;}
select_options(A) ::= select_options(X) HIGH_PRIORITY. {A = X;} select_options(A) ::= select_options(X) HIGH_PRIORITY. {A = X;}
select_options(A) ::= select_options(X) SELECT_OPTIONS_KW. {A = X;} select_options(A) ::= select_options(X) SELECT_OPTIONS_KW. {A = X;}
@ -1122,6 +1123,9 @@ select_options(A) ::= select_options(X) STRAIGHT_JOIN. {A = X;}
// present and false (0) if it is not. // present and false (0) if it is not.
// //
%type distinct {int} %type distinct {int}
%ifdef MAXSCALE
distinct(A) ::= UNIQUE. {A = SF_Distinct;}
%endif
distinct(A) ::= DISTINCT. {A = SF_Distinct;} distinct(A) ::= DISTINCT. {A = SF_Distinct;}
distinct(A) ::= ALL. {A = SF_All;} distinct(A) ::= ALL. {A = SF_All;}
distinct(A) ::= . {A = 0;} distinct(A) ::= . {A = 0;}