bug fixed for MySqlSchemaStatVisitor & OracleSchemaStatVisitor

src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java

@@ -47,8 +47,8 @@ public class MySqlSchemaStatVisitor extends MySqlASTVisitorAdapter {
     }
 
     public boolean visit(SQLExprTableSource x) {
-        if (x.getExpr() instanceof SQLIdentifierExpr) {
-            String ident = ((SQLIdentifierExpr) x.getExpr()).getName();
+        if (x.getExpr() instanceof SQLIdentifierExpr || x.getExpr() instanceof SQLPropertyExpr) {
+            String ident = x.getExpr().toString();
             TableStat stat = tableStats.get(ident);
             if (stat == null) {
                 stat = new TableStat();

src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java

@@ -54,8 +54,8 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter {
     }
 
     public boolean visit(SQLExprTableSource x) {
-        if (x.getExpr() instanceof SQLName) {
-            String ident = ((SQLName) x.getExpr()).toString();
+    	if (x.getExpr() instanceof SQLIdentifierExpr || x.getExpr() instanceof SQLPropertyExpr) {
+    		String ident = x.getExpr().toString();
             TableStat stat = tableStats.get(ident);
             if (stat == null) {
                 stat = new TableStat();

src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java

@@ -0,0 +1,45 @@
+package com.alibaba.druid.bvt.sql.mysql.visitor;
+
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat.Column;
+
+public class MySqlSchemaStatVisitorTest5 extends TestCase {
+
+	public void test_0() throws Exception {
+		String sql = "SELECT      distinct a.id \"id\",    a.col \"col\",     a.position \"position\",     a.panel_id \"panelId\"    "
+				+ "FROM     (select * from view_position_info) a LEFT JOIN db1.view_portal b ON a.panel_id = b.panel_id     "
+				+ "  LEFT JOIN (select * from view_portal_panel) c  ON a.panel_id = c.panel_id   "
+				+ " WHERE     b.user_id = ? and     ((b.is_grid='y' and c.param_name='is_hidden' and c.param_value='false') or      b.is_grid  != 'y') and b.user_id in (select user_id from table1 where id = 1)    ORDER BY    a.col ASC, a.position ASC";
+
+		MySqlStatementParser parser = new MySqlStatementParser(sql);
+		List<SQLStatement> statementList = parser.parseStatementList();
+		SQLStatement statemen = statementList.get(0);
+
+		Assert.assertEquals(1, statementList.size());
+
+		MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+		statemen.accept(visitor);
+
+		System.out.println(sql);
+		System.out.println("Tables : " + visitor.getTables());
+		System.out.println("fields : " + visitor.getFields());
+
+		Assert.assertEquals(4, visitor.getTables().size());
+		Assert.assertEquals(true, visitor.containsTable("view_position_info"));
+
+		Assert.assertEquals(7, visitor.getFields().size());
+		// Assert.assertEquals(true, visitor.getFields().contains(new
+		// Column("users", "id")));
+		// Assert.assertEquals(true, visitor.getFields().contains(new
+		// Column("users", "name")));
+
+	}
+
+}