alexey.rassokhin/tet123
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

DBZ-4640 Parse including keyword column table ddl error

Browse Source
This commit is contained in:
harveyyue 2022-01-30 14:37:16 +08:00 committed by Chris Cranford
parent 92b15475f3
commit bfd2ce97e8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlAntlrDdlParserTest.java
View File

@ -875,7 +875,7 @@ public void shouldParseAlterTableMultiTableOptions() {
} }
@Test @Test
@FixFor({ "DBZ-1150", "DBZ-4174" }) @FixFor({ "DBZ-1150", "DBZ-4174", "DBZ-4640" })
public void shouldParseCheckTableKeywords() { public void shouldParseCheckTableKeywords() {
String ddl = "CREATE TABLE my_table (\n" + String ddl = "CREATE TABLE my_table (\n" +
" user_id varchar(64) NOT NULL,\n" + " user_id varchar(64) NOT NULL,\n" +
@ -890,6 +890,7 @@ public void shouldParseCheckTableKeywords() {
" usa VARCHAR(100),\n" + " usa VARCHAR(100),\n" +
" jis VARCHAR(100),\n" + " jis VARCHAR(100),\n" +
" internal INT,\n" + " internal INT,\n" +
" instant BIT,\n" +
" UNIQUE KEY call_states_userid (user_id)\n" + " UNIQUE KEY call_states_userid (user_id)\n" +
") ENGINE=InnoDB DEFAULT CHARSET=utf8"; ") ENGINE=InnoDB DEFAULT CHARSET=utf8";
parser.parse(ddl, tables); parser.parse(ddl, tables);
@ -902,6 +903,7 @@ public void shouldParseCheckTableKeywords() {
assertThat(table.columnWithName("medium")).isNotNull(); assertThat(table.columnWithName("medium")).isNotNull();
assertThat(table.columnWithName("extended")).isNotNull(); assertThat(table.columnWithName("extended")).isNotNull();
assertThat(table.columnWithName("changed")).isNotNull(); assertThat(table.columnWithName("changed")).isNotNull();
assertThat(table.columnWithName("instant")).isNotNull();
} }
@Test @Test

2
debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mysql/generated/MySqlParser.g4
View File

@ -2586,7 +2586,7 @@ keywordsCanBeId
| FOLLOWS | FOUND | FULL | FUNCTION | GENERAL | GLOBAL | GRANTS | GROUP | GROUP_CONCAT | FOLLOWS | FOUND | FULL | FUNCTION | GENERAL | GLOBAL | GRANTS | GROUP | GROUP_CONCAT
| GROUP_REPLICATION | GROUP_REPLICATION_ADMIN | HANDLER | HASH | HELP | HISTORY | HOST | HOSTS | IDENTIFIED | GROUP_REPLICATION | GROUP_REPLICATION_ADMIN | HANDLER | HASH | HELP | HISTORY | HOST | HOSTS | IDENTIFIED
| IGNORE_SERVER_IDS | IMPORT | INDEXES | INITIAL_SIZE | INNODB_REDO_LOG_ARCHIVE | IGNORE_SERVER_IDS | IMPORT | INDEXES | INITIAL_SIZE | INNODB_REDO_LOG_ARCHIVE
| INPLACE | INSERT_METHOD | INSTALL | INSTANCE | INTERNAL | INVOKER | IO | INPLACE | INSERT_METHOD | INSTALL | INSTANCE | INSTANT | INTERNAL | INVOKER | IO
| IO_THREAD | IPC | ISO | ISOLATION | ISSUER | JIS | JSON | KEY_BLOCK_SIZE | IO_THREAD | IPC | ISO | ISOLATION | ISSUER | JIS | JSON | KEY_BLOCK_SIZE
| LANGUAGE | LAST | LEAVES | LESS | LEVEL | LIST | LOCAL | LANGUAGE | LAST | LEAVES | LESS | LEVEL | LIST | LOCAL
| LOGFILE | LOGS | MASTER | MASTER_AUTO_POSITION | LOGFILE | LOGS | MASTER | MASTER_AUTO_POSITION