improved SchemaStatVisitor. bug fixed for issue #2509

This commit is contained in:
wenshao
2018-04-20 09:32:13 +08:00
parent 13670a431a
commit 863ba9a053
16 changed files with 118 additions and 63 deletions
@@ -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")));
}
}
@@ -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")));
@@ -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));
@@ -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));
@@ -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));
@@ -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")));
}
}
@@ -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());
@@ -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());
@@ -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());
@@ -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());
@@ -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);
@@ -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());
}
}
@@ -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", "*"));
}
}
@@ -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());
}
}