bug fixed for schema stat visitor

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest1.java

@@ -0,0 +1,41 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class OracleSelectTest1 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = "SELECT employees_seq.currval     FROM DUAL; ";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        System.out.println(output(statementList));
+
+        Assert.assertEquals(1, statementList.size());
+
+        OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+
+//        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("orders")));
+
+        Assert.assertEquals(0, visitor.getTables().size());
+        Assert.assertEquals(0, visitor.getColumns().size());
+
+//        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id")));
+    }
+
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest3.java

@@ -0,0 +1,49 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class OracleSelectTest3 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = "SELECT department_id, last_name, salary " + //
+                     "   FROM employees x " + //
+                     "   WHERE salary > (SELECT AVG(salary) " + //
+                     "      FROM employees " + //
+                     "      WHERE x.department_id = department_id) " + //
+                     "   ORDER BY department_id; ";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        System.out.println(output(statementList));
+
+        Assert.assertEquals(1, statementList.size());
+
+        OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+
+        Assert.assertEquals(1, visitor.getTables().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
+
+        Assert.assertEquals(3, visitor.getColumns().size());
+
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "last_name")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
+    }
+
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest4.java

@@ -0,0 +1,49 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class OracleSelectTest4 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = "SELECT LPAD(' ',2*(LEVEL-1)) || last_name org_chart, " + //
+                     "employee_id, manager_id, job_id " + //
+                     "    FROM employees" + //
+                     "    START WITH job_id = 'AD_PRES' " + //
+                     "    CONNECT BY PRIOR employee_id = manager_id AND LEVEL <= 2;";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        System.out.println(output(statementList));
+
+        Assert.assertEquals(1, statementList.size());
+
+        OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+
+        Assert.assertEquals(1, visitor.getTables().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
+
+        Assert.assertEquals(4, visitor.getColumns().size());
+
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "job_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "last_name")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "manager_id")));
+    }
+
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest5.java

@@ -0,0 +1,45 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class OracleSelectTest5 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = "SELECT t1.department_id, t2.* FROM hr_info t1, TABLE(t1.people) t2" + //
+                     "   WHERE t2.department_id = t1.department_id;";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        System.out.println(output(statementList));
+
+        Assert.assertEquals(1, statementList.size());
+
+        OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+
+        Assert.assertEquals(2, visitor.getTables().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("hr_info")));
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("hr_info.people")));
+
+        Assert.assertEquals(3, visitor.getColumns().size());
+
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("hr_info", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("hr_info.people", "*")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("hr_info.people", "department_id")));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest6.java

@@ -0,0 +1,53 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class OracleSelectTest6 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = "SELECT * FROM departments " + //
+                     "   WHERE EXISTS " + //
+                     "   (SELECT * FROM employees " + //
+                     "       WHERE departments.department_id = employees.department_id " + //
+                     "       AND employees.salary > 2500)" + //
+                     "   ORDER BY department_name; ";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        System.out.println(output(statementList));
+
+        Assert.assertEquals(1, statementList.size());
+
+        OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+        System.out.println("orderBy : " + visitor.getOrderByColumns());
+
+        Assert.assertEquals(2, visitor.getTables().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("departments")));
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
+
+        Assert.assertEquals(6, visitor.getColumns().size());
+
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "*")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_name")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "*")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest7.java

@@ -0,0 +1,51 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class OracleSelectTest7 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = "SELECT * FROM employees " + //
+                     "   WHERE department_id NOT IN " + //
+                     "   (SELECT department_id FROM departments " + //
+                     "       WHERE location_id = 1700)" + //
+                     "   ORDER BY last_name;";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        System.out.println(output(statementList));
+
+        Assert.assertEquals(1, statementList.size());
+
+        OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+        System.out.println("orderBy : " + visitor.getOrderByColumns());
+
+        Assert.assertEquals(2, visitor.getTables().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("departments")));
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
+
+        Assert.assertEquals(5, visitor.getColumns().size());
+
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "last_name")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "location_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "*")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id")));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest8.java

@@ -0,0 +1,48 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class OracleSelectTest8 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = "SELECT d.department_id, e.last_name" + //
+                     "   FROM departments d, employees e" + //
+                     "   WHERE d.department_id = e.department_id(+)" + //
+                     "   ORDER BY d.department_id, e.last_name;";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        System.out.println(output(statementList));
+
+        Assert.assertEquals(1, statementList.size());
+
+        OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+        System.out.println("orderBy : " + visitor.getOrderByColumns());
+
+        Assert.assertEquals(2, visitor.getTables().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("departments")));
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
+
+        Assert.assertEquals(3, visitor.getColumns().size());
+
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "last_name")));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest9.java

@@ -0,0 +1,55 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class OracleSelectTest9 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = "SELECT e.employee_id, e.salary, e.commission_pct" + //
+                     "   FROM employees e JOIN departments d" + //
+                     "   USING (department_id)" + //
+                     "   WHERE job_id = 'SA_REP'" + //
+                     "   AND location_id = 2500" + //
+                     "   ORDER BY e.employee_id" + //
+                     "   FOR UPDATE OF e.salary;";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        System.out.println(output(statementList));
+
+        Assert.assertEquals(1, statementList.size());
+
+        OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+        System.out.println("orderBy : " + visitor.getOrderByColumns());
+
+        Assert.assertEquals(2, visitor.getTables().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("departments")));
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
+
+        Assert.assertEquals(7, visitor.getColumns().size());
+
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("UNKNOWN", "job_id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("UNKNOWN", "location_id")));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java

@@ -0,0 +1,48 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class OracleUpdateTest1 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = "UPDATE table1 t_alias1 " + //
+                     "    SET column = " + //
+                     "        (SELECT expr " + //
+                     "            FROM table2 t_alias2 " + //
+                     "            WHERE t_alias1.column = t_alias2.column); ";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        System.out.println(output(statementList));
+
+        Assert.assertEquals(1, statementList.size());
+
+        OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("table1")));
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("table2")));
+
+        Assert.assertEquals(2, visitor.getTables().size());
+        Assert.assertEquals(3, visitor.getColumns().size());
+
+         Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("table1", "column")));
+         Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("table2", "expr")));
+         Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("table2", "column")));
+    }
+
+}