database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-20 01:42:27 +03:00
Code Activity

Merge pull request #506 from drrtuy/MCOL-1454

Browse Source 
MCOL-1454 DDL parser supports reserved word TIME as a column name now.
This commit is contained in:
David.Hall
2018-06-25 09:24:41 -05:00
committed by GitHub
parent 2204c4bd44 5ddd510c31
commit d8083086aa
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/ddlpackage/ddl.l
View File

@@ -120,7 +120,7 @@ CREATE {return CREATE;}
CURRENT_USER {return CURRENT_USER;} CURRENT_USER {return CURRENT_USER;}
DATE {ddlget_lval(yyscanner)->str=strdup("date"); return DATE;} DATE {ddlget_lval(yyscanner)->str=strdup("date"); return DATE;}
DATETIME {return DATETIME;} DATETIME {return DATETIME;}
TIME {return TIME;} TIME {ddlget_lval(yyscanner)->str=strdup("time"); return TIME;}
DECIMAL {return DECIMAL;} DECIMAL {return DECIMAL;}
DEC {return DECIMAL;} DEC {return DECIMAL;}
DEFAULT {return DEFAULT;} DEFAULT {return DEFAULT;}

7
dbcon/ddlpackage/ddl.y
View File

@@ -110,11 +110,11 @@ DECIMAL DEFAULT DEFERRABLE DEFERRED IDB_DELETE DROP ENGINE
FOREIGN FULL IMMEDIATE INDEX INITIALLY IDB_INT INTEGER KEY LONGBLOB LONGTEXT FOREIGN FULL IMMEDIATE INDEX INITIALLY IDB_INT INTEGER KEY LONGBLOB LONGTEXT
MATCH MAX_ROWS MEDIUMBLOB MEDIUMTEXT MATCH MAX_ROWS MEDIUMBLOB MEDIUMTEXT
MIN_ROWS MODIFY NO NOT NULL_TOK NUMBER NUMERIC ON PARTIAL PRECISION PRIMARY MIN_ROWS MODIFY NO NOT NULL_TOK NUMBER NUMERIC ON PARTIAL PRECISION PRIMARY
REFERENCES RENAME RESTRICT SET SMALLINT TABLE TEXT TIME TINYBLOB TINYTEXT REFERENCES RENAME RESTRICT SET SMALLINT TABLE TEXT TINYBLOB TINYTEXT
TINYINT TO UNIQUE UNSIGNED UPDATE USER SESSION_USER SYSTEM_USER VARCHAR VARBINARY TINYINT TO UNIQUE UNSIGNED UPDATE USER SESSION_USER SYSTEM_USER VARCHAR VARBINARY
VARYING WITH ZONE DOUBLE IDB_FLOAT REAL CHARSET IDB_IF EXISTS CHANGE TRUNCATE VARYING WITH ZONE DOUBLE IDB_FLOAT REAL CHARSET IDB_IF EXISTS CHANGE TRUNCATE
%token <str> DQ_IDENT IDENT FCONST SCONST CP_SEARCH_CONDITION_TEXT ICONST DATE %token <str> DQ_IDENT IDENT FCONST SCONST CP_SEARCH_CONDITION_TEXT ICONST DATE TIME
/* Notes: /* Notes:
* 1. "ata" stands for alter_table_action * 1. "ata" stands for alter_table_action
@@ -644,7 +644,8 @@ ata_add_column:
; ;
column_name: column_name:
DATE TIME
|DATE
|ident |ident
; ;