fix: TableNameFinder for Alter Table

manticore-projects · manticore-projects · commit 33ba5eb521c4 · 2024-08-21T12:32:08.000+07:00
- fixes #2062 Signed-off-by: Andreas Reichel <andreas@manticore-projects.com> Signed-off-by: manticore-projects <andreas@manticore-projects.com>
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -383,8 +383,8 @@ protected String extractTableName(Table table) {
     }
 
     @Override
-    public <S> Void visit(Table tableName, S context) {
-        String tableWholeName = extractTableName(tableName);
+    public <S> Void visit(Table table, S context) {
+        String tableWholeName = extractTableName(table);
         if (!otherItemNames.contains(tableWholeName)) {
             tables.add(tableWholeName);
         }
@@ -1149,13 +1149,12 @@ public void visit(CreateView createView) {
 
     @Override
     public <S> Void visit(Alter alter, S context) {
-        throwUnsupported(alter);
-        return null;
+        return alter.getTable().accept(this, context);
     }
 
     @Override
     public void visit(Alter alter) {
-        StatementVisitor.super.visit(alter);
+        alter.getTable().accept(this, null);
     }
 
     @Override
diff --git a/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java b/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java
@@ -539,19 +539,19 @@ void testTableRenamingIssue2028() throws JSQLParserException {
                 ";";
         //@formatter:on
 
-        TablesNamesFinder finder = new TablesNamesFinder<Void>() {
+        TablesNamesFinder<Void> finder = new TablesNamesFinder<>() {
             @Override
-            public <S> Void visit(Table tableName, S context) {
-                String schemaName = tableName.getSchemaName();
+            public <S> Void visit(Table table, S context) {
+                String schemaName = table.getSchemaName();
                 if (schemaName != null && IGNORE_SCHEMAS.contains(schemaName.toLowerCase())) {
-                    return super.visit(tableName, context);
+                    return super.visit(table, context);
                 }
-                String originTableName = tableName.getName();
-                tableName.setName(prefix + originTableName);
+                String originTableName = table.getName();
+                table.setName(prefix + originTableName);
                 if (originTableName.startsWith("`")) {
-                    tableName.setName("`" + prefix + originTableName.replace("`", "") + "`");
+                    table.setName("`" + prefix + originTableName.replace("`", "") + "`");
                 }
-                return super.visit(tableName, context);
+                return super.visit(table, context);
             }
         };
         finder.init(false);
@@ -561,5 +561,17 @@ public <S> Void visit(Table tableName, S context) {
 
         TestUtils.assertStatementCanBeDeparsedAs(statement, expected, true);
     }
+
+    @Test
+    void testAlterTableIssue2062() throws JSQLParserException {
+        String sqlStr = "ALTER TABLE the_cool_db.the_table\n"
+                + "    ADD test VARCHAR (40)\n"
+                + ";";
+        Set<String> tables = TablesNamesFinder.findTablesOrOtherSources(sqlStr);
+        assertThat(tables).containsExactlyInAnyOrder("the_cool_db.the_table");
+
+        tables = TablesNamesFinder.findTables(sqlStr);
+        assertThat(tables).containsExactlyInAnyOrder("the_cool_db.the_table");
+    }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -383,8 +383,8 @@ protected String extractTableName(Table table) {`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`@Override`
`386`		`- public <S> Void visit(Table tableName, S context) {`
`387`		`- String tableWholeName = extractTableName(tableName);`
	`386`	`+ public <S> Void visit(Table table, S context) {`
	`387`	`+ String tableWholeName = extractTableName(table);`
`388`	`388`	`if (!otherItemNames.contains(tableWholeName)) {`
`389`	`389`	`tables.add(tableWholeName);`
`390`	`390`	`}`
`@@ -1149,13 +1149,12 @@ public void visit(CreateView createView) {`
`1149`	`1149`
`1150`	`1150`	`@Override`
`1151`	`1151`	`public <S> Void visit(Alter alter, S context) {`
`1152`		`- throwUnsupported(alter);`
`1153`		`- return null;`
	`1152`	`+ return alter.getTable().accept(this, context);`
`1154`	`1153`	`}`
`1155`	`1154`
`1156`	`1155`	`@Override`
`1157`	`1156`	`public void visit(Alter alter) {`
`1158`		`- StatementVisitor.super.visit(alter);`
	`1157`	`+ alter.getTable().accept(this, null);`
`1159`	`1158`	`}`
`1160`	`1159`
`1161`	`1160`	`@Override`