diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java index fdae4d5b62..b1845ef691 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java @@ -2085,9 +2085,7 @@ class SchemaResolveVisitorFactory { SQLExpr expr = selectItem.getExpr(); if (expr instanceof SQLAllColumnExpr) { SQLAllColumnExpr allColumnExpr = (SQLAllColumnExpr) expr; - if (from instanceof SQLExprTableSource) { - allColumnExpr.setResolvedTableSource(from); - } + allColumnExpr.setResolvedTableSource(from); visitor.visit(allColumnExpr); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java index 61da207cdb..d658f3b2fc 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -1407,43 +1407,61 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { public boolean visit(SQLAllColumnExpr x) { SQLTableSource tableSource = x.getResolvedTableSource(); + if (tableSource == null) { + return false; + } + statAllColumn(x, tableSource); + + return false; + } + + private void statAllColumn(SQLAllColumnExpr x, SQLTableSource tableSource) { if (tableSource instanceof SQLExprTableSource) { - SQLExprTableSource exprTableSource = (SQLExprTableSource) tableSource; - SQLName expr = exprTableSource.getName(); + statAllColumn(x, (SQLExprTableSource) tableSource); + return; + } - SQLCreateTableStatement createStmt = null; + if (tableSource instanceof SQLJoinTableSource) { + SQLJoinTableSource join = (SQLJoinTableSource) tableSource; + statAllColumn(x, join.getLeft()); + statAllColumn(x, join.getRight()); + } + } - SchemaObject tableObject = exprTableSource.getSchemaObject(); - if (tableObject != null) { - SQLStatement stmt = tableObject.getStatement(); - if (stmt instanceof SQLCreateTableStatement) { - createStmt = (SQLCreateTableStatement) stmt; - } - } + private void statAllColumn(SQLAllColumnExpr x, SQLExprTableSource tableSource) { + SQLExprTableSource exprTableSource = tableSource; + SQLName expr = exprTableSource.getName(); - if (createStmt != null - && createStmt.getTableElementList().size() > 0) { - SQLName tableName = createStmt.getName(); - for (SQLTableElement e : createStmt.getTableElementList()) { - if (e instanceof SQLColumnDefinition) { - SQLColumnDefinition columnDefinition = (SQLColumnDefinition) e; - SQLName columnName = columnDefinition.getName(); - Column column = addColumn(tableName.toString(), columnName.toString()); - if (isParentSelectItem(x.getParent())) { - column.setSelec(true); - } - } - } - } else if (expr != null) { - Column column = addColumn(expr.toString(), "*"); - if (isParentSelectItem(x.getParent())) { - column.setSelec(true); - } + SQLCreateTableStatement createStmt = null; + + SchemaObject tableObject = exprTableSource.getSchemaObject(); + if (tableObject != null) { + SQLStatement stmt = tableObject.getStatement(); + if (stmt instanceof SQLCreateTableStatement) { + createStmt = (SQLCreateTableStatement) stmt; } } - return false; + if (createStmt != null + && createStmt.getTableElementList().size() > 0) { + SQLName tableName = createStmt.getName(); + for (SQLTableElement e : createStmt.getTableElementList()) { + if (e instanceof SQLColumnDefinition) { + SQLColumnDefinition columnDefinition = (SQLColumnDefinition) e; + SQLName columnName = columnDefinition.getName(); + Column column = addColumn(tableName.toString(), columnName.toString()); + if (isParentSelectItem(x.getParent())) { + column.setSelec(true); + } + } + } + } else if (expr != null) { + Column column = addColumn(expr.toString(), "*"); + if (isParentSelectItem(x.getParent())) { + column.setSelec(true); + } + } } public Map getTables() { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java index 99a89bfdca..a033dd6da2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java @@ -38,7 +38,7 @@ public class MySqlCreateViewTest5 extends MysqlTest { SQLCreateViewStatement stmt = (SQLCreateViewStatement) statementList.get(0); // print(statementList); - Assert.assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); @@ -57,7 +57,7 @@ public class MySqlCreateViewTest5 extends MysqlTest { "\tINNER JOIN t1 ON t1.col1 = tt1.col1;", // SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("create or replace definer = current_user\n" + + assertEquals("create or replace definer = current_user\n" + "\tsql security = invoker\n" + "\tview my_view4 (\n" + "\tc1, \n" + @@ -76,13 +76,13 @@ public class MySqlCreateViewTest5 extends MysqlTest { // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(1, visitor.getColumns().size()); - Assert.assertEquals(1, visitor.getConditions().size()); + assertEquals(2, visitor.getTables().size()); + assertEquals(3, visitor.getColumns().size()); + assertEquals(1, visitor.getConditions().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); + assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("t1", "col1"))); -// Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "l_suppkey"))); + assertTrue(visitor.getColumns().contains(new Column("t1", "col1"))); +// assertTrue(visitor.getColumns().contains(new Column("t2", "l_suppkey"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java index d08de9e115..c04bff45b0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java @@ -58,7 +58,7 @@ public class OceanbaseHintTest_Index extends MysqlTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(4, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java index d98b8f614a..8a356c3bdf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java @@ -56,7 +56,7 @@ public class OdpsSelectTest29 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(2, visitor.getTables().size()); - assertEquals(0, visitor.getColumns().size()); + assertEquals(2, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java index 25b8407363..e764efac48 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java @@ -52,7 +52,7 @@ public class OdpsSelectTest32 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(2, visitor.getTables().size()); - assertEquals(2, visitor.getColumns().size()); + assertEquals(4, visitor.getColumns().size()); assertEquals(2, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java index ecbc23f51f..b18c660826 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java @@ -52,7 +52,7 @@ public class OdpsSelectTest33 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(2, visitor.getTables().size()); - assertEquals(2, visitor.getColumns().size()); + assertEquals(4, visitor.getColumns().size()); assertEquals(2, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java index ab3fffd37b..b5e6265721 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java @@ -41,7 +41,7 @@ public class OracleSelectTest46 extends OracleTest { SQLStatement stmt = statementList.get(0); print(statementList); - Assert.assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); @@ -52,21 +52,21 @@ public class OracleSelectTest46 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - Assert.assertEquals(2, visitor.getTables().size()); + assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(4, visitor.getColumns().size()); + assertEquals(6, visitor.getColumns().size()); String text = TestUtils.outputOracle(stmt); - Assert.assertEquals("SELECT *" // + assertEquals("SELECT *" // + "\nFROM MT_PRODUCT_ORDER T1, MT_ORDER T2" // + "\nWHERE T1.MT_ORDER_ID = T2.MT_ORDER_ID" // + "\n\tAND SELLER_SSOID = 1" // + "\n\tAND T1.MT_ORDER_ID = '1'" // + "\n\tAND T1.MT_BATCH_ORDER_ID IN ('1')", text); - // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); + // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); - // Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); + // assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java index b255107d3a..c097e09a76 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java @@ -83,7 +83,7 @@ public class OracleSelectTest81_join_brace extends OracleTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(5, visitor.getTables().size()); - assertEquals(14, visitor.getColumns().size()); + assertEquals(19, visitor.getColumns().size()); assertEquals(15, visitor.getConditions().size()); assertEquals(4, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java index c2f316a1d3..09fa8f5e42 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java @@ -64,7 +64,7 @@ public class OracleSelectTest91 extends OracleTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(3, visitor.getTables().size()); - assertEquals(4, visitor.getColumns().size()); + assertEquals(7, visitor.getColumns().size()); assertEquals(4, visitor.getConditions().size()); assertEquals(2, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java index 3539f6b5bd..9535c037b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java @@ -78,7 +78,7 @@ public class OracleSelectTest95_pivot extends OracleTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(2, visitor.getTables().size()); - assertEquals(3, visitor.getColumns().size()); + assertEquals(5, visitor.getColumns().size()); assertEquals(3, visitor.getConditions().size()); assertEquals(1, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java index 0784d1708c..3a8ce44bb8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java @@ -78,7 +78,7 @@ public class OracleSelectTest96_pivot extends OracleTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(2, visitor.getTables().size()); - assertEquals(3, visitor.getColumns().size()); + assertEquals(5, visitor.getColumns().size()); assertEquals(3, visitor.getConditions().size()); assertEquals(1, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest1.java index f4736ba16e..5a491de488 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest1.java @@ -37,7 +37,7 @@ public class PGSelectTest1 extends PGTest { SQLStatement statemen = statementList.get(0); // print(statementList); - Assert.assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); PGSchemaStatVisitor visitor = new PGSchemaStatVisitor(); statemen.accept(visitor); @@ -46,8 +46,8 @@ public class PGSelectTest1 extends PGTest { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); - Assert.assertEquals(0, visitor.getColumns().size()); - Assert.assertEquals(2, visitor.getTables().size()); + assertEquals(2, visitor.getColumns().size()); + assertEquals(4, visitor.getTables().size()); } public void test_1() throws Exception { @@ -57,7 +57,7 @@ public class PGSelectTest1 extends PGTest { SQLStatement statemen = statementList.get(0); // print(statementList); - Assert.assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); assertTrue(statemen instanceof PGSelectStatement); PGSelectStatement select = (PGSelectStatement) statemen; assertTrue(select.getSelect().getQuery() instanceof SQLUnionQuery); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest2.java index 4ba49ade2c..fedee7e773 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest2.java @@ -34,7 +34,7 @@ public class PGSelectTest2 extends PGTest { SQLStatement statemen = statementList.get(0); // print(statementList); - Assert.assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); PGSchemaStatVisitor visitor = new PGSchemaStatVisitor(); statemen.accept(visitor); @@ -43,8 +43,8 @@ public class PGSelectTest2 extends PGTest { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); - Assert.assertEquals(0, visitor.getColumns().size()); - Assert.assertEquals(2, visitor.getTables().size()); + assertEquals(2, visitor.getColumns().size()); + assertEquals(2, visitor.getTables().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest19.java new file mode 100644 index 0000000000..fb325d1397 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest19.java @@ -0,0 +1,39 @@ +package com.alibaba.druid.bvt.sql.schemaStat; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.parser.SQLParserUtils; +import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.sql.repository.SchemaRepository; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +public class SchemaStatTest19 extends TestCase { + + public void test_schemaStat() throws Exception { + String sql = "select * from table1 a left outer join table2 b on a.id=b.id"; + + SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, JdbcConstants.MYSQL); + SQLStatement stmt = parser.parseStatementList().get(0); + + SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); + stmt.accept(statVisitor); + + System.out.println("Tables : " + statVisitor.getTables()); + System.out.println("columns : " + statVisitor.getColumns()); +// System.out.println(statVisitor.getGroupByColumns()); // group by + System.out.println("relationships : " + statVisitor.getRelationships()); // group by + System.out.println(statVisitor.getConditions()); + + assertEquals(4, statVisitor.getColumns().size()); + assertEquals(2, statVisitor.getConditions().size()); + assertEquals(0, statVisitor.getFunctions().size()); + + assertTrue(statVisitor.containsTable("table1")); + assertTrue(statVisitor.containsColumn("table1", "*")); + assertTrue(statVisitor.containsColumn("table1", "id")); + assertTrue(statVisitor.containsColumn("table2", "id")); + assertTrue(statVisitor.containsColumn("table2", "*")); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java index abda4951e4..efea092b32 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java @@ -30,7 +30,7 @@ public class SchemaStatTest8 extends TestCase { // System.out.println(statVisitor.getGroupByColumns()); // group by System.out.println("relationships : " + statVisitor.getRelationships()); // group by - Assert.assertEquals(6, statVisitor.getColumns().size()); - Assert.assertEquals(6, statVisitor.getConditions().size()); + assertEquals(8, statVisitor.getColumns().size()); + assertEquals(6, statVisitor.getConditions().size()); } }