Merge pull request zendesk#2076 from mavenlink/fix-create-table-tablespace-quoting

Add `tablespace` token to accept backtick'd names

Author: osheroff

src/main/antlr4/imports/mysql_create_table.g4

@@ -72,7 +72,7 @@ creation_stats_auto_recalc: STATS_AUTO_RECALC '='? (DEFAULT | INTEGER_LITERAL);
 creation_stats_persistent: STATS_PERSISTENT '='? (DEFAULT | INTEGER_LITERAL);
 creation_stats_sample_pages: STATS_SAMPLE_PAGES '='? (DEFAULT | INTEGER_LITERAL);
 creation_storage_option: STORAGE (DISK | MEMORY | DEFAULT);
-creation_tablespace: TABLESPACE '='? string;
+creation_tablespace: tablespace;
 creation_union: UNION '='? '(' name (',' name)* ')';
 creation_encryption: ENCRYPTION '='? string_literal;
 creation_start_transaction: START TRANSACTION;

src/main/antlr4/imports/mysql_idents.g4

@@ -40,6 +40,8 @@ default_collation: DEFAULT? collation;
 charset_token: (CHARSET | (CHARACTER SET) | (CHAR SET));
 collation: COLLATE '='? (IDENT | string_literal | QUOTED_IDENT | DEFAULT);
 
+tablespace: TABLESPACE '='? (id | string_literal);
+
 if_not_exists: IF NOT EXISTS;
 
 

src/test/resources/sql/ddl/mysql-test-fixed.sql

@@ -219,6 +219,9 @@ CREATE TABLE time_zone_leap_second (   Transition_time bigint signed NOT NULL,
 CREATE TABLE time_zone_transition (   Time_zone_id int unsigned NOT NULL,   Transition_time bigint signed NOT NULL,   Transition_type_id int unsigned NOT NULL,   PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time) ) engine=MyISAM CHARACTER SET utf8   comment='Time zone transitions'
 CREATE TABLE time_zone_transition_type (   Time_zone_id int unsigned NOT NULL,   Transition_type_id int unsigned NOT NULL,   Offset int signed DEFAULT 0 NOT NULL,   Is_DST tinyint unsigned DEFAULT 0 NOT NULL,   Abbreviation char(8) DEFAULT '' NOT NULL,   PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id) ) engine=MyISAM CHARACTER SET utf8   comment='Time zone transition types'
 CREATE TABLE ДОЛЕН_регистър_утф8 (s1 INT)
+CREATE TABLE t_with_tablespace (a INT) TABLESPACE innodb_system
+CREATE TABLE t_with_tablespace (a INT) TABLESPACE `innodb_system`
+CREATE TABLE t_with_tablespace (a INT)  /*!50100 TABLESPACE `innodb_system` */
 DROP TABLE IF EXISTS `t1`,`t2`,`t3`,`t4`,`t9`,`t1a``b`,`v1`,`v2`,`v3`,`v4`,`v5`,`v6` /* generated by server */
 DROP TABLE IF EXISTS `t1`,`t``1`,`t 1` /* generated by server */
 DROP TABLE ```ab````cd``` /* generated by server */