fixes #600

JSQLParser · Apr 13, 2018 · e80ea68 · e80ea68
1 parent c28a549
commit e80ea68
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -135,6 +135,8 @@
 
 /**
  * Find all used tables within an select statement.
+ * 
+ * Override extractTableName method to modify the extracted table names (e.g. without schema).
  */
 public class TablesNamesFinder implements SelectVisitor, FromItemVisitor, ExpressionVisitor, ItemsListVisitor, SelectItemVisitor, StatementVisitor {
 
@@ -218,9 +220,18 @@ public void visit(PlainSelect plainSelect) {
         }
     }
 
+    /**
+     * Override to adapt the tableName generation (e.g. with / without schema).
+     * @param table
+     * @return 
+     */
+    protected String extractTableName(Table table) {
+        return table.getFullyQualifiedName();
+    }
+
     @Override
     public void visit(Table tableName) {
-        String tableWholeName = tableName.getFullyQualifiedName();
+        String tableWholeName = extractTableName(tableName);
         if (!otherItemNames.contains(tableWholeName.toLowerCase())
                 && !tables.contains(tableWholeName)) {
             tables.add(tableWholeName);
@@ -618,7 +629,7 @@ public void visit(ValueListExpression valueList) {
 
     @Override
     public void visit(Delete delete) {
-        tables.add(delete.getTable().getName());
+        visit(delete.getTable());
 
         if (delete.getJoins() != null) {
             for (Join join : delete.getJoins()) {
@@ -634,7 +645,7 @@ public void visit(Delete delete) {
     @Override
     public void visit(Update update) {
         for (Table table : update.getTables()) {
-            tables.add(table.getName());
+            visit(table);
         }
         if (update.getExpressions() != null) {
             for (Expression expression : update.getExpressions()) {
@@ -659,7 +670,7 @@ public void visit(Update update) {
 
     @Override
     public void visit(Insert insert) {
-        tables.add(insert.getTable().getName());
+        visit(insert.getTable());
         if (insert.getItemsList() != null) {
             insert.getItemsList().accept(this);
         }
@@ -670,7 +681,7 @@ public void visit(Insert insert) {
 
     @Override
     public void visit(Replace replace) {
-        tables.add(replace.getTable().getName());
+        visit(replace.getTable());
         if (replace.getExpressions() != null) {
             for (Expression expression : replace.getExpressions()) {
                 expression.accept(this);
@@ -698,7 +709,7 @@ public void visit(CreateIndex createIndex) {
 
     @Override
     public void visit(CreateTable create) {
-        tables.add(create.getTable().getFullyQualifiedName());
+        visit(create.getTable());
         if (create.getSelect() != null) {
             create.getSelect().accept(this);
         }
@@ -743,7 +754,7 @@ public void visit(HexValue hexValue) {
 
     @Override
     public void visit(Merge merge) {
-        tables.add(merge.getTable().getName());
+        visit(merge.getTable());
         if (merge.getUsingTable() != null) {
             merge.getUsingTable().accept(this);
         } else if (merge.getUsingSelect() != null) {
@@ -780,7 +791,7 @@ public void visit(Commit commit) {
 
     @Override
     public void visit(Upsert upsert) {
-        tables.add(upsert.getTable().getName());
+        visit(upsert.getTable());
         if (upsert.getItemsList() != null) {
             upsert.getItemsList().accept(this);
         }

diff --git a/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java b/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java
@@ -506,4 +506,13 @@ public void testMySQLValueListExpression() throws JSQLParserException {
         assertTrue(tableList.contains("TABLE1"));
     }
 
+    @Test
+    public void testSkippedSchemaIssue600() throws JSQLParserException {
+        String sql = "delete from schema.table where id = 1";
+        TablesNamesFinder finder = new TablesNamesFinder();
+        List<String> tableList = finder.getTableList(CCJSqlParserUtil.parse(sql));
+        assertEquals(1, tableList.size());
+        assertTrue(tableList.contains("schema.table"));
+    }
+
 }