database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

Fix DDL parser for spaces in table options

Browse Source 
MariaDB's parser allows for spaces instead of equals in table options, ColumnStore's parser currently does not allow this causing a query such as the following to fail:

CREATE TABLE t1 (a int, b int) ENGINE COLUMNSTORE;

This fix allows the spaces.
This commit is contained in:
Andrew Hutchings
2016-08-16 14:19:49 +01:00
parent 516d45a27b
commit acb078d07d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dbcon/ddlpackage/ddl.y
View File

@@ -67,7 +67,7 @@ void ddlerror (void* yyscanner, char const *error);
char* copy_string(const char *str); char* copy_string(const char *str);
%} %}
%expect 15 %expect 16
%pure-parser %pure-parser
%lex-param {void * scanner} %lex-param {void * scanner}
%parse-param {void * scanner} %parse-param {void * scanner}
@@ -457,25 +457,29 @@ table_options:
} }
; ;
opt_equal:
{} | '=' {}
;
table_option: table_option:
ENGINE '=' IDENT {$$ = new pair<string,string>("engine", $3);} ENGINE opt_equal IDENT {$$ = new pair<string,string>("engine", $3);}
| |
MAX_ROWS '=' ICONST {$$ = new pair<string,string>("max_rows", $3);} MAX_ROWS opt_equal ICONST {$$ = new pair<string,string>("max_rows", $3);}
| |
MIN_ROWS '=' ICONST {$$ = new pair<string,string>("min_rows", $3);} MIN_ROWS opt_equal ICONST {$$ = new pair<string,string>("min_rows", $3);}
| |
COMMENT '=' string_literal {$$ = new pair<string,string>("comment", $3);} COMMENT opt_equal string_literal {$$ = new pair<string,string>("comment", $3);}
| |
COMMENT string_literal {$$ = new pair<string,string>("comment", $2);} COMMENT string_literal {$$ = new pair<string,string>("comment", $2);}
| |
AUTO_INCREMENT '=' ICONST AUTO_INCREMENT opt_equal ICONST
{ {
$$ = new pair<string,string>("auto_increment", $3); $$ = new pair<string,string>("auto_increment", $3);
} }
| |
DEFAULT CHARSET '=' IDENT {$$ = new pair<string,string>("default charset", $4);} DEFAULT CHARSET opt_equal IDENT {$$ = new pair<string,string>("default charset", $4);}
| |
DEFAULT IDB_CHAR SET '=' IDENT {$$ = new pair<string,string>("default charset", $5);} DEFAULT IDB_CHAR SET opt_equal IDENT {$$ = new pair<string,string>("default charset", $5);}
; ;
alter_table_statement: alter_table_statement: