diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java index 3c782b0e97..46c8f080e4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java @@ -26,7 +26,7 @@ import com.alibaba.druid.stat.TableStat.Mode; public class MySqlSchemaStatVisitor extends MySqlASTVisitorAdapter { - private HashMap tableStats = new HashMap(); + private HashMap tableStats = new HashMap(); private Set fields = new HashSet(); private final static ThreadLocal> aliasLocal = new ThreadLocal>(); @@ -49,7 +49,7 @@ public class MySqlSchemaStatVisitor extends MySqlASTVisitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } Mode mode = modeLocal.get(); @@ -98,7 +98,7 @@ public class MySqlSchemaStatVisitor extends MySqlASTVisitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } stat.incrementUpdateCount(); @@ -133,7 +133,7 @@ public class MySqlSchemaStatVisitor extends MySqlASTVisitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } stat.incrementDeleteCount(); } @@ -183,7 +183,7 @@ public class MySqlSchemaStatVisitor extends MySqlASTVisitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } stat.incrementInsertCount(); @@ -221,7 +221,7 @@ public class MySqlSchemaStatVisitor extends MySqlASTVisitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } stat.incrementInsertCount(); @@ -318,9 +318,13 @@ public class MySqlSchemaStatVisitor extends MySqlASTVisitorAdapter { return false; } - public Map getTables() { + public Map getTables() { return tableStats; } + + public boolean containsTable(String tableName) { + return tableStats.containsKey(new TableStat.Name(tableName)); + } public Set getFields() { return fields; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleSchemaStatVisitor.java index abd456e53d..d65e381585 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleSchemaStatVisitor.java @@ -25,10 +25,11 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUpdateStatement; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.stat.TableStat.Mode; +import com.alibaba.druid.stat.TableStat.Name; public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { - private HashMap tableStats = new HashMap(); + private HashMap tableStats = new HashMap(); private Set fields = new HashSet(); private final static ThreadLocal> aliasLocal = new ThreadLocal>(); @@ -51,7 +52,7 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } Mode mode = modeLocal.get(); @@ -90,7 +91,7 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } Mode mode = modeLocal.get(); @@ -139,7 +140,7 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } stat.incrementUpdateCount(); @@ -166,7 +167,7 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } stat.incrementUpdateCount(); @@ -208,7 +209,7 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } stat.incrementDeleteCount(); @@ -251,7 +252,7 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { TableStat stat = tableStats.get(ident); if (stat == null) { stat = new TableStat(); - tableStats.put(ident, stat); + tableStats.put(new TableStat.Name(ident), stat); } stat.incrementInsertCount(); @@ -365,9 +366,13 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { return false; } - public Map getTables() { + public Map getTables() { return tableStats; } + + public boolean containsTable(String tableName) { + return tableStats.containsKey(new TableStat.Name(tableName)); + } public Set getFields() { return fields; diff --git a/src/main/java/com/alibaba/druid/stat/TableStat.java b/src/main/java/com/alibaba/druid/stat/TableStat.java index 78740ffb2e..27032f7ee3 100644 --- a/src/main/java/com/alibaba/druid/stat/TableStat.java +++ b/src/main/java/com/alibaba/druid/stat/TableStat.java @@ -22,7 +22,6 @@ public class TableStat { public int getUpdateCount() { return updateCount; } - public void incrementUpdateCount() { updateCount++; @@ -35,7 +34,7 @@ public class TableStat { public int getDeleteCount() { return deleteCount; } - + public void incrementDeleteCount() { this.deleteCount++; } @@ -43,7 +42,7 @@ public class TableStat { public void setDeleteCount(int deleteCount) { this.deleteCount = deleteCount; } - + public void incrementInsertCount() { this.insertCount++; } @@ -74,6 +73,37 @@ public class TableStat { return buf.toString(); } + public static class Name { + + private String name; + + public Name(String name){ + this.name = name; + } + + public String getName() { + return this.name; + } + + public int hashCode() { + return this.name.toLowerCase().hashCode(); + } + + public boolean equals(Object o) { + if (!(o instanceof Name)) { + return false; + } + + Name other = (Name) o; + + return this.name.equalsIgnoreCase(other.name); + } + + public String toString() { + return this.name; + } + } + public static class Column { private String table; diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest1.java index d28488d598..e2a3f8f721 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest1.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest1.java @@ -29,8 +29,8 @@ public class MySqlSchemaStatVisitorTest1 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); - Assert.assertEquals(true, visitor.getTables().containsKey("usergroups")); + Assert.assertEquals(true, visitor.containsTable("users")); + Assert.assertEquals(true, visitor.containsTable("usergroups")); Assert.assertEquals(4, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "groupId"))); @@ -57,8 +57,8 @@ public class MySqlSchemaStatVisitorTest1 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); - Assert.assertEquals(true, visitor.getTables().containsKey("usergroups")); + Assert.assertEquals(true, visitor.containsTable("users")); + Assert.assertEquals(true, visitor.containsTable("usergroups")); Assert.assertEquals(4, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "groupId"))); diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest2.java index 0056b1f0f8..8e33d833f7 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest2.java @@ -29,7 +29,7 @@ public class MySqlSchemaStatVisitorTest2 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); @@ -54,7 +54,7 @@ public class MySqlSchemaStatVisitorTest2 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); @@ -79,7 +79,7 @@ public class MySqlSchemaStatVisitorTest2 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest3.java index 19e321d3f3..e7880b7116 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest3.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest3.java @@ -29,8 +29,8 @@ public class MySqlSchemaStatVisitorTest3 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); - Assert.assertEquals(true, visitor.getTables().containsKey("users2")); + Assert.assertEquals(true, visitor.containsTable("users")); + Assert.assertEquals(true, visitor.containsTable("users2")); Assert.assertEquals(5, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest4.java index 1024fb1f67..72db5b2fa3 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest4.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest4.java @@ -29,7 +29,7 @@ public class MySqlSchemaStatVisitorTest4 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Delete.java index 94ca569304..5a3e7f64cb 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Delete.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Delete.java @@ -29,7 +29,7 @@ public class MySqlSchemaStatVisitorTest_Delete extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery.java index c0ea8852de..025887fbb6 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery.java @@ -29,7 +29,7 @@ public class MySqlSchemaStatVisitorTest_Subquery extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery2.java index 23ab56fc67..79c1333665 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery2.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery2.java @@ -29,8 +29,8 @@ public class MySqlSchemaStatVisitorTest_Subquery2 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); - Assert.assertEquals(true, visitor.getTables().containsKey("groups")); + Assert.assertEquals(true, visitor.containsTable("users")); + Assert.assertEquals(true, visitor.containsTable("groups")); Assert.assertEquals(5, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Update.java index 53d6737cf3..21278d8a25 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Update.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Update.java @@ -29,7 +29,7 @@ public class MySqlSchemaStatVisitorTest_Update extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java index 9b35f82d95..48192bbe12 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java @@ -6,8 +6,6 @@ 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.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.stat.TableStat.Column; @@ -31,8 +29,8 @@ public class OracleSchemaStatVisitorTest1 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); - Assert.assertEquals(true, visitor.getTables().containsKey("usergroups")); + Assert.assertEquals(true, visitor.containsTable("users")); + Assert.assertEquals(true, visitor.containsTable("usergroups")); Assert.assertEquals(4, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "groupId"))); @@ -45,13 +43,13 @@ public class OracleSchemaStatVisitorTest1 extends TestCase { public void test_1() throws Exception { String sql = "select a.name, b.name FROM users a, usergroups b on a.groupId = b.id where a.groupID = ?"; - MySqlStatementParser parser = new MySqlStatementParser(sql); + OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); Assert.assertEquals(1, statementList.size()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statemen.accept(visitor); System.out.println(sql); @@ -59,8 +57,8 @@ public class OracleSchemaStatVisitorTest1 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); - Assert.assertEquals(true, visitor.getTables().containsKey("usergroups")); + Assert.assertEquals(true, visitor.containsTable("users")); + Assert.assertEquals(true, visitor.containsTable("usergroups")); Assert.assertEquals(4, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "groupId"))); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java index ed8c0dc1dc..436bab940f 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java @@ -29,7 +29,7 @@ public class OracleSchemaStatVisitorTest2 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); @@ -54,7 +54,7 @@ public class OracleSchemaStatVisitorTest2 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); @@ -79,7 +79,7 @@ public class OracleSchemaStatVisitorTest2 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java index ca697d6975..9e45bfcd80 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java @@ -29,8 +29,8 @@ public class OracleSchemaStatVisitorTest3 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); - Assert.assertEquals(true, visitor.getTables().containsKey("users2")); + Assert.assertEquals(true, visitor.containsTable("users")); + Assert.assertEquals(true, visitor.containsTable("users2")); Assert.assertEquals(5, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java index f26b38533d..3942df8484 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java @@ -29,7 +29,7 @@ public class OracleSchemaStatVisitorTest4 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java index 63bacffa40..08a64103e4 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java @@ -29,7 +29,7 @@ public class OracleSchemaStatVisitorTest_Delete extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java index 9906a69198..00182bf64a 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java @@ -29,7 +29,7 @@ public class OracleSchemaStatVisitorTest_Subquery extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java index c466603f69..96ca9ec30f 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java @@ -29,8 +29,8 @@ public class OracleSchemaStatVisitorTest_Subquery2 extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); - Assert.assertEquals(true, visitor.getTables().containsKey("groups")); + Assert.assertEquals(true, visitor.containsTable("users")); + Assert.assertEquals(true, visitor.containsTable("groups")); Assert.assertEquals(5, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java index 62bab81dee..76e2c65e8b 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java @@ -29,7 +29,7 @@ public class OracleSchemaStatVisitorTest_Update extends TestCase { System.out.println("fields : " + visitor.getFields()); Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.getTables().containsKey("users")); + Assert.assertEquals(true, visitor.containsTable("users")); Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id")));