diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java index 29020b3da9..95452da70c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java @@ -22,4 +22,7 @@ public class SQLDefaultExpr extends SQLLiteralExpr { visitor.endVisit(this); } + public String toString() { + return "DEFAULT"; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index 23e82d6ecd..e16fea27c8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -91,6 +91,10 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } public boolean visit(MySqlSelectQueryBlock select) { + if (select.getOrderBy() != null) { + select.getOrderBy().setParent(select); + } + print("SELECT "); if (SQLSetQuantifier.ALL == select.getDistionOption()) print("ALL "); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java index f025427a54..0866e0ba01 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java @@ -212,7 +212,7 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements // table == null时是SubQuery if (table != null) { - fields.add(new Column(table, x.getName())); + columns.add(new Column(table, x.getName())); } } } @@ -236,7 +236,7 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements String currentTable = currentTableLocal.get(); if (currentTable != null) { - fields.add(new Column(currentTable, x.getName())); + columns.add(new Column(currentTable, x.getName())); } return false; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index ac439eac62..24329a1aa8 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -442,9 +442,8 @@ public class SQLExprParser extends SQLParser { expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Assignment, rightExp); } else { if (lexer.token() == Token.LPAREN) { - if (expr instanceof SQLIdentifierExpr) { - SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr; - String method_name = identExpr.getName(); + if (expr instanceof SQLIdentifierExpr || expr instanceof SQLDefaultExpr) { + String method_name = expr.toString(); lexer.nextToken(); if (isAggreateFunction(method_name)) { @@ -463,7 +462,7 @@ public class SQLExprParser extends SQLParser { return primaryRest(methodInvokeExpr); } - throw new ParserException("not support token:"); + throw new ParserException("not support token:" + lexer.token()); } } @@ -480,7 +479,7 @@ public class SQLExprParser extends SQLParser { if (lexer.token() == Token.KEY) { name = "KEY"; lexer.nextToken(); - } else if (lexer.token() != Token.IDENTIFIER) { + } else if (lexer.token() != Token.IDENTIFIER && lexer.token() != Token.USER && lexer.token() != Token.PASSWORD) { throw new ParserException("error : " + lexer.stringVal()); } else { name = lexer.stringVal(); 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 5e472701fc..acc479e1a2 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -9,12 +9,14 @@ import java.util.Set; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLInListExpr; import com.alibaba.druid.sql.ast.expr.SQLInSubQueryExpr; +import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; @@ -23,6 +25,8 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; import com.alibaba.druid.sql.ast.statement.SQLSelect; +import com.alibaba.druid.sql.ast.statement.SQLSelectItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; @@ -36,13 +40,87 @@ import com.alibaba.druid.stat.TableStat.Mode; public class SchemaStatVisitor extends SQLASTVisitorAdapter { protected final HashMap tableStats = new HashMap(); - protected final Set fields = new HashSet(); + protected final Set columns = new HashSet(); protected final Set conditions = new HashSet(); + protected final Set orderByColumns = new HashSet(); + protected final Set groupByColumns = new HashSet(); protected final static ThreadLocal> aliasLocal = new ThreadLocal>(); protected final static ThreadLocal currentTableLocal = new ThreadLocal(); protected final static ThreadLocal modeLocal = new ThreadLocal(); + public class OrderByStatVisitor extends SQLASTVisitorAdapter { + + private final SQLOrderBy orderBy; + + public OrderByStatVisitor(SQLOrderBy orderBy){ + this.orderBy = orderBy; + } + + public SQLOrderBy getOrderBy() { + return orderBy; + } + + public boolean visit(SQLIdentifierExpr x) { + String currentTable = currentTableLocal.get(); + + if (currentTable != null) { + orderByColumns.add(new Column(currentTable, x.getName())); + } + return false; + } + + public boolean visit(SQLPropertyExpr x) { + if (x.getOwner() instanceof SQLIdentifierExpr) { + String owner = ((SQLIdentifierExpr) x.getOwner()).getName(); + + if (owner != null) { + Map aliasMap = aliasLocal.get(); + if (aliasMap != null) { + String table = aliasMap.get(owner); + + // table == null时是SubQuery + if (table != null) { + orderByColumns.add(new Column(table, x.getName())); + } + } + } + } + + return false; + } + } + + public boolean visit(SQLOrderBy x) { + OrderByStatVisitor orderByVisitor = new OrderByStatVisitor(x); + SQLSelectQueryBlock query = null; + if (x.getParent() instanceof SQLSelectQueryBlock) { + query = (SQLSelectQueryBlock) x.getParent(); + } + if (query != null) { + for (SQLSelectOrderByItem item : x.getItems()) { + SQLExpr expr = item.getExpr(); + if (expr instanceof SQLIntegerExpr) { + int intValue = ((SQLIntegerExpr) expr).getNumber().intValue() - 1; + if (intValue < query.getSelectList().size()) { + SQLSelectItem selectItem = query.getSelectList().get(intValue); + selectItem.getExpr().accept(orderByVisitor); + } + } + } + } + x.accept(orderByVisitor); + return true; + } + + public Set getOrderByColumns() { + return orderByColumns; + } + + public Set getGroupByColumns() { + return groupByColumns; + } + public Set getConditions() { return conditions; } @@ -278,7 +356,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { // table == null时是SubQuery if (table != null) { - fields.add(new Column(table, x.getName())); + columns.add(new Column(table, x.getName())); } } } @@ -290,7 +368,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { String currentTable = currentTableLocal.get(); if (currentTable != null) { - fields.add(new Column(currentTable, x.getName())); + columns.add(new Column(currentTable, x.getName())); } return false; } @@ -299,7 +377,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { String currentTable = currentTableLocal.get(); if (currentTable != null) { - fields.add(new Column(currentTable, "*")); + columns.add(new Column(currentTable, "*")); } return false; } @@ -312,8 +390,8 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { return tableStats.containsKey(new TableStat.Name(tableName)); } - public Set getFields() { - return fields; + public Set getColumns() { + return columns; } public boolean visit(SQLSelectStatement x) { @@ -387,6 +465,10 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { } public boolean visit(SQLSelect x) { + if (x.getOrderBy() != null) { + x.getOrderBy().setParent(x); + } + accept(x.getQuery()); String originalTable = currentTableLocal.get(); @@ -453,14 +535,14 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { return false; } - + public boolean visit(SQLInListExpr x) { if (x.isNot()) { handleCondition(x.getExpr(), "NOT IN"); } else { handleCondition(x.getExpr(), "IN"); } - + return true; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java index 910818fee1..0dcbc6f56b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java @@ -25,7 +25,7 @@ public class CommitTest extends MysqlTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().size() == 0); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java index a13c490c77..f9a8f25299 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java @@ -25,7 +25,7 @@ public class CreateUserTest extends MysqlTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().size() == 0); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java index c151ffd305..132c4fd68a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java @@ -26,7 +26,7 @@ public class DropTableTest extends MysqlTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("distributors"))); @@ -34,7 +34,7 @@ public class DropTableTest extends MysqlTest { Assert.assertTrue(visitor.getTables().get(new TableStat.Name("films")).getDropCount() == 1); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("distributors")).getDropCount() == 1); - Assert.assertTrue(visitor.getFields().size() == 0); + Assert.assertTrue(visitor.getColumns().size() == 0); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java index f7b907cf13..1700a7c0a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java @@ -25,7 +25,7 @@ public class DropUserTest extends MysqlTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().size() == 0); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_0.java index c9f403b4c5..10c00a5542 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_0.java @@ -27,17 +27,18 @@ public class MySqlSelectTest_0 extends MysqlTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); - + System.out.println("orderBy : " + visitor.getOrderByColumns()); + Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(3, visitor.getFields().size()); + Assert.assertEquals(3, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("mytable"))); - Assert.assertTrue(visitor.getFields().contains(new Column("mytable", "last_name"))); - Assert.assertTrue(visitor.getFields().contains(new Column("mytable", "first_name"))); - Assert.assertTrue(visitor.getFields().contains(new Column("mytable", "full_name"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_1.java index fb5db3fb7e..b7fbc04ad6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_1.java @@ -27,18 +27,19 @@ public class MySqlSelectTest_1 extends MysqlTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertEquals(3, visitor.getFields().size()); + Assert.assertEquals(3, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employee"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("info"))); - Assert.assertTrue(visitor.getFields().contains(new Column("employee", "name"))); - Assert.assertTrue(visitor.getFields().contains(new Column("info", "name"))); - Assert.assertTrue(visitor.getFields().contains(new Column("info", "salary"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("employee", "name"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("info", "name"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("info", "salary"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_2.java new file mode 100644 index 0000000000..ed7bb591e4 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_2.java @@ -0,0 +1,44 @@ +package com.alibaba.druid.bvt.sql.mysql; + +import java.util.List; + +import junit.framework.Assert; + +import com.alibaba.druid.sql.MysqlTest; +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; +import com.alibaba.druid.stat.TableStat.Column; + +public class MySqlSelectTest_2 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "SELECT college, region, seed FROM tournament ORDER BY 2, 3;"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + System.out.println(output(statementList)); + + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(3, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("tournament"))); + + Assert.assertTrue(visitor.getColumns().contains(new Column("tournament", "college"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("tournament", "region"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("tournament", "seed"))); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java index 55ddbc723b..2c1e40b268 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java @@ -54,7 +54,7 @@ public class MySqlResourceTest extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println(); System.out.println(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java index d479775fc6..b6d537767b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java @@ -26,17 +26,17 @@ public class MySqlSchemaStatVisitorTest1 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(2, visitor.getTables().size()); 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"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("usergroups", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("usergroups", "name"))); + Assert.assertEquals(4, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "groupId"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "name"))); } @@ -54,17 +54,17 @@ public class MySqlSchemaStatVisitorTest1 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(2, visitor.getTables().size()); 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"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("usergroups", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("usergroups", "name"))); + Assert.assertEquals(4, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "groupId"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java index 07dabe1d0b..6f899cc808 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java @@ -26,14 +26,14 @@ public class MySqlSchemaStatVisitorTest2 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } @@ -51,14 +51,14 @@ public class MySqlSchemaStatVisitorTest2 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } @@ -76,14 +76,14 @@ public class MySqlSchemaStatVisitorTest2 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java index bb5ba5349c..9936b7cf1c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java @@ -26,18 +26,18 @@ public class MySqlSchemaStatVisitorTest3 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(2, visitor.getTables().size()); 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"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "loginCount"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users2", "name2"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users2", "id2"))); + Assert.assertEquals(5, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "loginCount"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users2", "name2"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users2", "id2"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java index 8bc4f1b82e..5f8dacf839 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java @@ -26,14 +26,14 @@ public class MySqlSchemaStatVisitorTest4 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java index 36c9a5a94c..de954a5d5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java @@ -30,12 +30,12 @@ public class MySqlSchemaStatVisitorTest5 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(4, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("view_position_info")); - Assert.assertEquals(7, visitor.getFields().size()); + Assert.assertEquals(7, visitor.getColumns().size()); // Assert.assertEquals(true, visitor.getFields().contains(new // Column("users", "id"))); // Assert.assertEquals(true, visitor.getFields().contains(new diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java index c186fb6b55..276660eb47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java @@ -26,14 +26,14 @@ public class MySqlSchemaStatVisitorTest_Delete extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java index e6e706719c..21cd797cf9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java @@ -26,14 +26,14 @@ public class MySqlSchemaStatVisitorTest_Subquery extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java index 608871fa08..a3129aab10 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java @@ -26,18 +26,18 @@ public class MySqlSchemaStatVisitorTest_Subquery2 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(2, visitor.getTables().size()); 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"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "groupId"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("groups", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("groups", "name"))); + Assert.assertEquals(5, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "groupId"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("groups", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("groups", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java index 3a400828ca..96204a2928 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java @@ -26,14 +26,14 @@ public class MySqlSchemaStatVisitorTest_Update extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "loginCount"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "loginCount"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java index 2dab6f101d..c684075818 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java @@ -28,9 +28,9 @@ public class OracleOutputVisitorTest_Aggregate extends TestCase { Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("emp")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("emp", "salary"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("emp", "F1"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("emp", "salary"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("emp", "F1"))); StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java index a0f48c7ab0..725f8c5ebc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java @@ -28,8 +28,8 @@ public class OracleOutputVisitorTest_dblink extends TestCase { Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("master@emp")); - Assert.assertEquals(1, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("master@emp", "salary"))); + Assert.assertEquals(1, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("master@emp", "salary"))); StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java index 47a180dec0..36880750a1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java @@ -28,8 +28,8 @@ public class OracleOutputVisitorTest_delete extends TestCase { Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("employee")); - Assert.assertEquals(1, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "id"))); + Assert.assertEquals(1, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("employee", "id"))); StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java index f1f348bb5c..6803cb3182 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java @@ -28,8 +28,8 @@ public class OracleOutputVisitorTest_forupdate extends TestCase { Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("employee")); - Assert.assertEquals(1, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "salary"))); + Assert.assertEquals(1, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("employee", "salary"))); StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java index ffc1ab8e65..d57b303029 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java @@ -28,9 +28,9 @@ public class OracleOutputVisitorTest_orderBy extends TestCase { Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("employee")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "salary"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("employee", "salary"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("employee", "name"))); StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java index 45b4014897..fe27a34c44 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java @@ -29,10 +29,10 @@ public class OracleOutputVisitorTest_selectJoin extends TestCase { Assert.assertEquals(true, visitor.containsTable("employee")); Assert.assertEquals(true, visitor.containsTable("department")); - Assert.assertEquals(3, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "salary"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "depId"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("department", "id"))); + Assert.assertEquals(3, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("employee", "salary"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("employee", "depId"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("department", "id"))); StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java index 112cd2eccf..9822b3d5ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java @@ -49,7 +49,7 @@ public class OracleResourceTest extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println(); System.out.println(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java index 86f11ff75c..f6d8ade144 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java @@ -26,17 +26,17 @@ public class OracleSchemaStatVisitorTest1 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(2, visitor.getTables().size()); 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"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("usergroups", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("usergroups", "name"))); + Assert.assertEquals(4, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "groupId"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "name"))); } @@ -54,17 +54,17 @@ public class OracleSchemaStatVisitorTest1 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(2, visitor.getTables().size()); 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"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("usergroups", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("usergroups", "name"))); + Assert.assertEquals(4, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "groupId"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java index 893f14b883..9db4e183ad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java @@ -26,14 +26,14 @@ public class OracleSchemaStatVisitorTest2 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } @@ -51,14 +51,14 @@ public class OracleSchemaStatVisitorTest2 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } @@ -76,14 +76,14 @@ public class OracleSchemaStatVisitorTest2 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java index dd62af3bae..8dab65544b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java @@ -26,18 +26,18 @@ public class OracleSchemaStatVisitorTest3 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(2, visitor.getTables().size()); 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"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "loginCount"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users2", "name2"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users2", "id2"))); + Assert.assertEquals(5, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "loginCount"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users2", "name2"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users2", "id2"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java index 878d652a12..e240fe5957 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java @@ -26,14 +26,14 @@ public class OracleSchemaStatVisitorTest4 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java index 9e3a93cf33..5c3e1cc94d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java @@ -26,14 +26,14 @@ public class OracleSchemaStatVisitorTest_Delete extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java index be9a26a533..d25ad0fa15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java @@ -26,14 +26,14 @@ public class OracleSchemaStatVisitorTest_Subquery extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java index 85d47ea527..554967c7d2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java @@ -26,18 +26,18 @@ public class OracleSchemaStatVisitorTest_Subquery2 extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(2, visitor.getTables().size()); 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"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "groupId"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "name"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("groups", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("groups", "name"))); + Assert.assertEquals(5, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "groupId"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("groups", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("groups", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java index 9d1129f465..2405f418cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java @@ -26,14 +26,14 @@ public class OracleSchemaStatVisitorTest_Update extends TestCase { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(true, visitor.containsTable("users")); - Assert.assertEquals(2, visitor.getFields().size()); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "id"))); - Assert.assertEquals(true, visitor.getFields().contains(new Column("users", "loginCount"))); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); + Assert.assertEquals(true, visitor.getColumns().contains(new Column("users", "loginCount"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java index 6c5ec0ad01..23878ad026 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java @@ -26,7 +26,7 @@ public class DropTableTest extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("distributors"))); @@ -34,7 +34,7 @@ public class DropTableTest extends PGTest { Assert.assertTrue(visitor.getTables().get(new TableStat.Name("films")).getDropCount() == 1); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("distributors")).getDropCount() == 1); - Assert.assertTrue(visitor.getFields().size() == 0); + Assert.assertTrue(visitor.getColumns().size() == 0); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java index 4ddbedea5d..c990426e4e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java @@ -27,7 +27,7 @@ public class PGDeleteTest extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java index 6908d90dee..6287d3ca11 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java @@ -26,12 +26,12 @@ public class PGDeleteTest2 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("tasks"))); - Assert.assertTrue(visitor.getFields().size() == 0); + Assert.assertTrue(visitor.getColumns().size() == 0); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java index 1588797bae..0d390f1c92 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java @@ -26,12 +26,12 @@ public class PGDeleteTest3 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("tasks"))); - Assert.assertTrue(visitor.getFields().size() == 1); + Assert.assertTrue(visitor.getColumns().size() == 1); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java index ccb25a3928..31158ca98d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java @@ -26,17 +26,17 @@ public class PGDeleteTest4 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("producers"))); System.out.println("coditions : " + visitor.getConditions()); - Assert.assertTrue(visitor.getFields().size() == 3); + Assert.assertTrue(visitor.getColumns().size() == 3); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "producer_id"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("producers", "id"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("producers", "name"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "producer_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("producers", "id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("producers", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java index 46d47c8fce..b0b4b45b13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java @@ -26,17 +26,17 @@ public class PGDeleteTest5 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("producers"))); - Assert.assertTrue(visitor.getFields().size() == 3); + Assert.assertTrue(visitor.getColumns().size() == 3); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "producer_id"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("producers", "id"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("producers", "name"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "producer_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("producers", "id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("producers", "name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java index e99712dc23..0f75aa7a4e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java @@ -26,12 +26,12 @@ public class PGInsertTest0 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); - Assert.assertEquals(0, visitor.getFields().size()); + Assert.assertEquals(0, visitor.getColumns().size()); // Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "producer_id"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java index 78efe5323f..23518e81b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java @@ -26,18 +26,18 @@ public class PGInsertTest1 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); - Assert.assertEquals(5, visitor.getFields().size()); + Assert.assertEquals(5, visitor.getColumns().size()); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "kind"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "code"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "date_prod"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "title"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "did"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "kind"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "code"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "date_prod"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "title"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "did"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java index a0c6b84a43..d15f448639 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java @@ -28,17 +28,17 @@ public class PGInsertTest2 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); - Assert.assertEquals(5, visitor.getFields().size()); + Assert.assertEquals(5, visitor.getColumns().size()); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "kind"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "code"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "date_prod"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "title"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "did"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "kind"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "code"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "date_prod"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "title"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "did"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java index 497ff30bfc..9520962b3b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java @@ -26,16 +26,16 @@ public class PGInsertTest3 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("tmp_films"))); - Assert.assertEquals(2, visitor.getFields().size()); + Assert.assertEquals(2, visitor.getColumns().size()); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("tmp_films", "date_prod"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("tmp_films", "*"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("tmp_films", "date_prod"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("tmp_films", "*"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java index b3b4da579e..1893fb9bfe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java @@ -26,15 +26,15 @@ public class PGInsertTest4 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("distributors"))); - Assert.assertEquals(2, visitor.getFields().size()); + Assert.assertEquals(2, visitor.getColumns().size()); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("distributors", "did"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("distributors", "dname"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("distributors", "did"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("distributors", "dname"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java index 8573628669..e77b667d65 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java @@ -31,19 +31,19 @@ public class PGInsertTest5 extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees_log"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("accounts"))); - Assert.assertEquals(4, visitor.getFields().size()); + Assert.assertEquals(4, visitor.getColumns().size()); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("employees", "sales_count"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("employees", "id"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("accounts", "sales_person"))); - Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("accounts", "name"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "sales_count"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("accounts", "sales_person"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("accounts", "name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectIntoTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectIntoTest.java index ca75e61c51..00afe00c5d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectIntoTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectIntoTest.java @@ -26,13 +26,13 @@ public class PGSelectIntoTest extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films_recent"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); - Assert.assertTrue(visitor.getFields().contains(new Column("films", "*"))); - Assert.assertTrue(visitor.getFields().contains(new Column("films", "date_prod"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("films", "*"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("films", "date_prod"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java index bdd427d23f..c53e671c5e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java @@ -48,7 +48,7 @@ public class PostgresqlResourceTest extends PGTest { System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); System.out.println(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java index ef9d5631ae..29d716e97b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java @@ -27,12 +27,12 @@ public class TruncateTest extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("bigtable"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("fattable"))); - Assert.assertTrue(visitor.getFields().size() == 0); + Assert.assertTrue(visitor.getColumns().size() == 0); } public void test_1() throws Exception { @@ -49,12 +49,12 @@ public class TruncateTest extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("bigtable"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("fattable"))); - Assert.assertTrue(visitor.getFields().size() == 0); + Assert.assertTrue(visitor.getColumns().size() == 0); } public void test_2() throws Exception { @@ -71,10 +71,10 @@ public class TruncateTest extends PGTest { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("othertable"))); - Assert.assertTrue(visitor.getFields().size() == 0); + Assert.assertTrue(visitor.getColumns().size() == 0); } } diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java index 64782572b9..0997cacc11 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java @@ -82,6 +82,6 @@ public class OnlineSQLTest2 extends TestCase { statemen.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getFields()); + System.out.println("fields : " + visitor.getColumns()); } }