Merge pull request #560 from Altinity/fix_alter_column

Fix alter drop column
Altinity · May 5, 2024 · d8ba8ee · d8ba8ee
2 parents 3548fe4 + 313c8b8
commit d8ba8ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/...java/com/altinity/clickhouse/debezium/embedded/ddl/parser/MySqlDDLParserListenerImpl.java b/...java/com/altinity/clickhouse/debezium/embedded/ddl/parser/MySqlDDLParserListenerImpl.java
@@ -518,7 +518,7 @@ public void enterAlterTable(MySqlParser.AlterTableContext alterTableContext) {
                 for (ParseTree dropColumnTree : ((MySqlParser.AlterByDropColumnContext) (tree)).children) {
                     if (dropColumnTree instanceof MySqlParser.UidContext) {
                         for(ParseTree dropColumnChild: ((MySqlParser.UidContext) dropColumnTree).children) {
-                            if(dropColumnChild instanceof MySqlParser.SimpleIdContext) {
+                            if(dropColumnChild instanceof MySqlParser.SimpleIdContext || dropColumnChild instanceof TerminalNodeImpl) {
                                 this.query.append(String.format(Constants.DROP_COLUMN, dropColumnChild.getText()));
                             }
                         }

diff --git a/...test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/AlterTableAddColumnIT.java b/...test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/AlterTableAddColumnIT.java
@@ -78,6 +78,7 @@ public void testAddColumn() throws Exception {
         conn.prepareStatement(" alter table add_test drop column col101;").execute();
         conn.prepareStatement(" alter table add_test add column col5 ENUM ('M','F');").execute();
         conn.prepareStatement(" alter table add_test add column col6 JSON;").execute();
+        conn.prepareStatement(" alter table add_test drop col4").execute();
 
         Thread.sleep(25000);
 

diff --git a/.../com/altinity/clickhouse/debezium/embedded/ddl/parser/MySqlDDLParserListenerImplTest.java b/.../com/altinity/clickhouse/debezium/embedded/ddl/parser/MySqlDDLParserListenerImplTest.java
@@ -618,6 +618,16 @@ public void testDropColumn() {
 
     }
 
+    @Test
+    public void testDropColumnWithoutColumnSyntax() {
+        StringBuffer clickHouseQuery = new StringBuffer();
+
+        String sql = "alter table `leads`  drop `country`";
+        mySQLDDLParserService.parseSql(sql, "", clickHouseQuery);
+
+        Assert.assertTrue(clickHouseQuery.toString().equalsIgnoreCase("alter table employees.`leads` drop column `country`"));
+    }
+
     @Test
     public void renameMultipleTables() {
         StringBuffer clickHouseQuery = new StringBuffer();