database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

MCOL-3721 Fix quoting issues for COLLATE

Browse Source
This commit is contained in:
Andrew Hutchings
2020-02-12 09:14:07 +00:00
parent c334a6fb1e
commit e43d9be05b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dbcon/ddlpackage/ddl.y
View File

@@ -199,7 +199,7 @@ BOOL BOOLEAN MEDIUMINT TIMESTAMP
%type <sqlStmt> trunc_table_statement %type <sqlStmt> trunc_table_statement
%type <sqlStmt> rename_table_statement %type <sqlStmt> rename_table_statement
%type <str> ident %type <str> ident
%type <str> opt_quoted_literal
%% %%
stmtblock: stmtmulti { x->fParseTree = $1; } stmtblock: stmtmulti { x->fParseTree = $1; }
; ;
@@ -490,9 +490,9 @@ table_option:
| |
DEFAULT IDB_CHAR SET opt_equal ident {$$ = new pair<string,string>("default charset", $5);} DEFAULT IDB_CHAR SET opt_equal ident {$$ = new pair<string,string>("default charset", $5);}
| |
DEFAULT COLLATE opt_equal ident {$$ = new pair<string, string>("default collate", $4);} DEFAULT COLLATE opt_equal opt_quoted_literal {$$ = new pair<string, string>("default collate", $4);}
| |
COLLATE opt_equal ident {$$ = new pair<string, string>("default collate", $3);} COLLATE opt_equal opt_quoted_literal {$$ = new pair<string, string>("default collate", $3);}
; ;
alter_table_statement: alter_table_statement:
@@ -735,13 +735,13 @@ optional_braces:
opt_column_charset: opt_column_charset:
/* empty */ {} /* empty */ {}
| |
IDB_CHAR SET ident {} IDB_CHAR SET opt_quoted_literal {}
; ;
opt_column_collate: opt_column_collate:
/* empty */ {} /* empty */ {}
| |
COLLATE ident {} COLLATE opt_quoted_literal {}
; ;
data_type: data_type:
@@ -864,6 +864,12 @@ string_literal:
'\'' SCONST '\'' {$$ = $2;} '\'' SCONST '\'' {$$ = $2;}
; ;
opt_quoted_literal:
string_literal
|
ident
;
character_string_type: character_string_type:
CHARACTER CHARACTER
{ {