Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

enhance schema stat

Browse Source
This commit is contained in:
温少
2012-02-24 09:42:39 +08:00
parent e200714281
commit 8c7352beca
53 changed files with 351 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java
+3
View File
@@ -22,4 +22,7 @@ public class SQLDefaultExpr extends SQLLiteralExpr {
visitor.endVisit(this);
}
public String toString() {
return "DEFAULT";
}
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
+4
View File
@@ -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 ");
src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java
+2 -2
View File
@@ -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;
}
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+4 -5
View File
@@ -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();
src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
+90 -8
View File
@@ -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<TableStat.Name, TableStat> tableStats = new HashMap<TableStat.Name, TableStat>();
protected final Set<Column> fields = new HashSet<Column>();
protected final Set<Column> columns = new HashSet<Column>();
protected final Set<Condition> conditions = new HashSet<Condition>();
protected final Set<Column> orderByColumns = new HashSet<Column>();
protected final Set<Column> groupByColumns = new HashSet<Column>();
protected final static ThreadLocal<Map<String, String>> aliasLocal = new ThreadLocal<Map<String, String>>();
protected final static ThreadLocal<String> currentTableLocal = new ThreadLocal<String>();
protected final static ThreadLocal<Mode> modeLocal = new ThreadLocal<Mode>();
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<String, String> 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<Column> getOrderByColumns() {
return orderByColumns;
}
public Set<Column> getGroupByColumns() {
return groupByColumns;
}
public Set<Condition> 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<Column> getFields() {
return fields;
public Set<Column> 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;
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java
+1 -1
View File
@@ -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);
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java
+1 -1
View File
@@ -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);
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java
+2 -2
View File
@@ -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);
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java
+1 -1
View File
@@ -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);
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_0.java
+7 -6
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_1.java
+6 -5
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_2.java
+44
View File
@@ -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<SQLStatement> 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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java
+1 -1
View File
@@ -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();
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java
+12 -12
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java
+12 -12
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java
+7 -7
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java
+4 -4
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java
+2 -2
View File
@@ -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
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java
+4 -4
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java
+4 -4
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java
+7 -7
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java
+4 -4
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java
+3 -3
View File
@@ -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);
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java
+2 -2
View File
@@ -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);
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java
+2 -2
View File
@@ -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);
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java
+2 -2
View File
@@ -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);
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java
+3 -3
View File
@@ -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);
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java
+4 -4
View File
@@ -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);
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java
+1 -1
View File
@@ -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();
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java
+12 -12
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java
+12 -12
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java
+7 -7
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java
+4 -4
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java
+4 -4
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java
+4 -4
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java
+7 -7
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java
+4 -4
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java
+2 -2
View File
@@ -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);
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java
+1 -1
View File
@@ -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")));
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java
+2 -2
View File
@@ -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);
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java
+2 -2
View File
@@ -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);
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java
+5 -5
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java
+5 -5
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java
+2 -2
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java
+7 -7
View File
@@ -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")));
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java
+7 -7
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java
+4 -4
View File
@@ -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", "*")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java
+4 -4
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java
+6 -6
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectIntoTest.java
+3 -3
View File
@@ -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")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java
+1 -1
View File
@@ -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();
src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java
+6 -6
View File
@@ -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);
}
}
src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java
+1 -1
View File
@@ -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());
}
}