diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java index 5b77b577b5..8156f68622 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java @@ -213,7 +213,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { TransactionInfo transInfo = (TransactionInfo) attributes.remove(ATTR_TRANSACTION); if (transInfo != null) { - transInfo.setEndTimeMillis(System.currentTimeMillis()); + transInfo.setEndTimeMillis(); } } @@ -382,6 +382,15 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { if (sqlStat != null) { sqlStat.setExecuteLastStartTime(System.currentTimeMillis()); sqlStat.incrementRunningCount(); + + try { + boolean inTransaction = !statement.getConnectionProxy().getAutoCommit(); + if (inTransaction) { + sqlStat.incrementInTransactionCount(); + } + } catch (SQLException e) { + LOG.error("getAutoCommit error", e); + } } statement.getAttributes().put(ATTR_UPDATE_COUNT, 0); @@ -487,7 +496,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { String sql = resultSet.getSql(); if (sql != null) { - JdbcSqlStat sqlStat = getSqlCounter(sql); + JdbcSqlStat sqlStat = getSqlCounter(sql); if (sqlStat != null) { sqlStat.addFetchRowCount(fetchCount); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java index 69b6699a02..e69a8a651c 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java @@ -590,12 +590,12 @@ public class DruidPooledConnection implements javax.sql.PooledConnection, Connec holder.setUnderlyingAutoCommit(autoCommit); } catch (SQLException ex) { if ((!autoCommit) && holder.isUnderlyingAutoCommit()) { - + } handleException(ex); } } - + protected void transactionRecord(String sql) throws SQLException { if (transactionInfo == null && (!conn.getAutoCommit())) { DruidAbstractDataSource dataSource = holder.getDataSource(); @@ -684,10 +684,9 @@ public class DruidPooledConnection implements javax.sql.PooledConnection, Connec private void handleEndTransaction(DruidAbstractDataSource dataSource) { if (transactionInfo != null) { - long currentTimeMillis = System.currentTimeMillis(); - transactionInfo.setEndTimeMillis(currentTimeMillis); + transactionInfo.setEndTimeMillis(); - long transactionMillis = currentTimeMillis - transactionInfo.getStartTimeMillis(); + long transactionMillis = transactionInfo.getEndTimeMillis() - transactionInfo.getStartTimeMillis(); dataSource.getTransactionHistogram().recode(transactionMillis); dataSource.logTransaction(transactionInfo); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index 6d4bcc4f92..560aa82d60 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -64,10 +64,12 @@ public class MySqlStatementParser extends SQLStatementParser { public MySqlStatementParser(String sql) throws ParserException{ this(new MySqlLexer(sql)); this.lexer.nextToken(); + this.exprParser = this.createExprParser(); } public MySqlStatementParser(Lexer lexer){ super(lexer); + this.exprParser = this.createExprParser(); } protected SQLExprParser createExprParser() { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index 15364d2a90..fb719ad671 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -37,7 +37,6 @@ import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.ast.statement.SQLTruncateStatement; import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem; import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleSelectParser; public class SQLStatementParser extends SQLParser { @@ -307,7 +306,7 @@ public class SQLStatementParser extends SQLParser { } public SQLSelectParser createSQLSelectParser() { - return new OracleSelectParser(this.lexer); + return new SQLSelectParser(this.lexer); } public SQLUpdateStatement parseUpdateStatement() throws ParserException { diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java index c05b89c73c..18be503b83 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java @@ -62,6 +62,8 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { private final AtomicLong updateCount = new AtomicLong(); private final AtomicLong fetchRowCount = new AtomicLong(); + private final AtomicLong inTransactionCount = new AtomicLong(); + private final Histogram histogram = new Histogram(new long[] { // // 4, 15, 60, 250, // @@ -164,6 +166,7 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { fetchRowCount.set(0); histogram.reset(); + inTransactionCount.set(0); } public long getConcurrentMax() { @@ -319,6 +322,14 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { return executeBatchSizeMax.get(); } + public long getInTransactionCount() { + return inTransactionCount.get(); + } + + public void incrementInTransactionCount() { + inTransactionCount.incrementAndGet(); + } + private static CompositeType COMPOSITE_TYPE = null; public static CompositeType getCompositeType() throws JMException { @@ -327,20 +338,31 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { return COMPOSITE_TYPE; } - OpenType[] indexTypes = new OpenType[] { SimpleType.LONG, SimpleType.STRING, SimpleType.STRING, - SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.DATE, SimpleType.LONG, - JMXUtils.getThrowableCompositeType(), SimpleType.LONG, SimpleType.LONG, SimpleType.DATE, - SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.STRING, - SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.DATE, - SimpleType.STRING, SimpleType.STRING // + OpenType[] indexTypes = new OpenType[] { + // + SimpleType.LONG, SimpleType.STRING, SimpleType.STRING, SimpleType.LONG, + SimpleType.LONG, // - , new ArrayType(SimpleType.LONG, true) }; + SimpleType.LONG, SimpleType.DATE, SimpleType.LONG, JMXUtils.getThrowableCompositeType(), + SimpleType.LONG, + // + + SimpleType.LONG, SimpleType.DATE, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, + // + + SimpleType.LONG, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, + // + + SimpleType.STRING, SimpleType.DATE, SimpleType.STRING, SimpleType.STRING, SimpleType.LONG // + + , new ArrayType(SimpleType.LONG, true) + }; String[] indexNames = { "ID", "DataSource", "SQL", "ExecuteCount", "ErrorCount" // , "TotalTime", "LastTime", "MaxTimespan", "LastError", "EffectedRowCount" // , "FetchRowCount", "MaxTimespanOccurTime", "BatchSizeMax", "BatchSizeTotal", "ConcurrentMax" // , "RunningCount", "Name", "File", "LastErrorMessage", "LastErrorClass" // - , "LastErrorStackTrace", "LastErrorTime", "DbType", "URL" // + , "LastErrorStackTrace", "LastErrorTime", "DbType", "InTransactionCount", "URL" // , "Histogram" }; String[] indexDescriptions = indexNames; @@ -394,6 +416,7 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { map.put("DbType", dbType); map.put("URL", null); + map.put("InTransactionCount", getInTransactionCount()); map.put("Histogram", this.histogram.toArray()); diff --git a/src/main/java/com/alibaba/druid/util/TransactionInfo.java b/src/main/java/com/alibaba/druid/util/TransactionInfo.java index 60f40d2ed4..5f116fefcc 100644 --- a/src/main/java/com/alibaba/druid/util/TransactionInfo.java +++ b/src/main/java/com/alibaba/druid/util/TransactionInfo.java @@ -45,6 +45,12 @@ public class TransactionInfo { public long getEndTimeMillis() { return endTimeMillis; } + + public void setEndTimeMillis() { + if (endTimeMillis == 0) { + endTimeMillis = System.currentTimeMillis(); + } + } public void setEndTimeMillis(long endTimeMillis) { this.endTimeMillis = endTimeMillis; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest.java index e6975c453e..4e51bcb8a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest.java @@ -18,7 +18,7 @@ public class HiveCreateTableTest extends HiveTest { HiveStatementParser parser = new HiveStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest2.java index 04e619ff09..d3f11fe364 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest2.java @@ -18,7 +18,7 @@ public class HiveCreateTableTest2 extends HiveTest { HiveStatementParser parser = new HiveStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest.java index 7511ee8393..000eb6166d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest.java @@ -18,7 +18,7 @@ public class HiveSelectTest extends HiveTest { HiveStatementParser parser = new HiveStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest2.java index f17225f4e7..2bd7f956da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest2.java @@ -18,7 +18,7 @@ public class HiveSelectTest2 extends HiveTest { HiveStatementParser parser = new HiveStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveShowTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveShowTableTest.java index a911cf1128..7902b0ceac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveShowTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveShowTableTest.java @@ -18,7 +18,7 @@ public class HiveShowTableTest extends HiveTest { HiveStatementParser parser = new HiveStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveShowTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveShowTableTest2.java index 819e0df98e..8e3840ad6a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveShowTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveShowTableTest2.java @@ -17,7 +17,7 @@ public class HiveShowTableTest2 extends HiveTest { HiveStatementParser parser = new HiveStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 0dcbc6f56b..adb67add1d 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 @@ -17,7 +17,7 @@ public class CommitTest extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 f9a8f25299..cc00e65ea1 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 @@ -17,7 +17,7 @@ public class CreateUserTest extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 132c4fd68a..b4709bd6c7 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 @@ -18,7 +18,7 @@ public class DropTableTest extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 1700a7c0a9..55f712c72e 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 @@ -17,7 +17,7 @@ public class DropUserTest extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 10c00a5542..eb6c0e931a 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 @@ -19,7 +19,7 @@ public class MySqlSelectTest_0 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 b7fbc04ad6..63d0e43ba0 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 @@ -19,7 +19,7 @@ public class MySqlSelectTest_1 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 index ed7bb591e4..fa8280dea4 100644 --- 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 @@ -19,7 +19,7 @@ public class MySqlSelectTest_2 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest1.java index 5d5f23262c..630f0e8cdb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest1.java @@ -19,7 +19,7 @@ public class OracleAlterIndexTest1 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest2.java index f10eca8491..a7c15bf532 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest2.java @@ -19,7 +19,7 @@ public class OracleAlterIndexTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest.java index b98e75f348..86cc29b332 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest.java @@ -18,7 +18,7 @@ public class OracleAlterProcedureTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest2.java index c586819f1d..0f19344cff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest2.java @@ -18,7 +18,7 @@ public class OracleAlterProcedureTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSessionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSessionTest.java index 851d403e5b..cd60eb2a9d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSessionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSessionTest.java @@ -18,7 +18,7 @@ public class OracleAlterSessionTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest.java index 0324f7f38a..fa7d8ff537 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest.java @@ -19,7 +19,7 @@ public class OracleAlterTableTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest2.java index 3e24c0053a..28ff0bb362 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest2.java @@ -19,7 +19,7 @@ public class OracleAlterTableTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest3.java index ccb784879b..8d3b7f0cbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest3.java @@ -23,7 +23,7 @@ public class OracleAlterTableTest3 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest4.java index dd7d5e20b7..272c965522 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest4.java @@ -19,7 +19,7 @@ public class OracleAlterTableTest4 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest5.java index d50ef5fc56..183def39c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest5.java @@ -19,7 +19,7 @@ public class OracleAlterTableTest5 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest6.java index c15ca1d7eb..1cfa2fd276 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest6.java @@ -19,7 +19,7 @@ public class OracleAlterTableTest6 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest7.java index 494155c2d5..7e4f160e96 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest7.java @@ -19,7 +19,7 @@ public class OracleAlterTableTest7 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest8.java index 5f66470d16..6e022c0b4a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest8.java @@ -19,7 +19,7 @@ public class OracleAlterTableTest8 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTestRename.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTestRename.java index d528d929da..39d8d39827 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTestRename.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTestRename.java @@ -19,7 +19,7 @@ public class OracleAlterTableTestRename extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest.java index fdd482bd2d..55861d67c6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest.java @@ -18,7 +18,7 @@ public class OracleBlockTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); @@ -31,19 +31,12 @@ public class OracleBlockTest extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - Assert.assertEquals(2, visitor.getTables().size()); + Assert.assertEquals(0, visitor.getTables().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("departments"))); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); +// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("departments"))); - Assert.assertEquals(7, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_id"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("UNKNOWN", "job_id"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("UNKNOWN", "location_id"))); +// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest1.java index 1dc88d66ac..027f1f56e9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest1.java @@ -18,7 +18,7 @@ public class OracleBlockTest1 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest2.java index 11d0c862f4..09de1e8e58 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest2.java @@ -34,7 +34,7 @@ public class OracleBlockTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest3.java index 37377ab50b..a90c2314ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest3.java @@ -28,7 +28,7 @@ public class OracleBlockTest3 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest4.java new file mode 100644 index 0000000000..6a55c20c27 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest4.java @@ -0,0 +1,56 @@ +package com.alibaba.druid.bvt.sql.oracle; + +import java.util.List; + +import junit.framework.Assert; + +import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; + +public class OracleBlockTest4 extends OracleTest { + + public void test_0() throws Exception { + String sql = "declare " + + " cursor cspid(vspid dba_hist_snapshot.snap_id%type) is " + + " select end_interval_time , startup_time " // + + " from dba_hist_snapshot " + + // + " where snap_id = vspid and instance_number = :inst_num" + + " and dbid = :dbid; " + + " bsnapt dba_hist_snapshot.end_interval_time%type; bstart dba_hist_snapshot.startup_time%type; esnapt dba_hist_snapshot.end_interval_time%type; estart dba_hist_snapshot.startup_time%type; begin -- Check Begin Snapshot id is valid, get corresponding instance startup time open cspid(:bid); fetch cspid into bsnapt, bstart; if cspid%notfound then raise_application_error(-20200, 'Begin Snapshot Id '||:bid||' does not exist for this database/instance'); end if; close cspid; -- Check End Snapshot id is valid and get corresponding instance startup time open cspid(:eid); fetch cspid into esnapt, estart; if cspid%notfound then raise_application_error(-20200, 'End Snapshot Id '||:eid||' does not exist for this database/instance'); end if; if esnapt <= bsnapt then raise_application_error(-20200, 'End Snapshot Id '||:eid||' must be greater than Begin Snapshot Id '||:bid); end if; close cspid; -- Check startup time is same for begin and end snapshot ids if ( bstart != estart) then raise_application_error(-20200, 'The instance was shutdown between snapshots '||:bid||' and '||:eid); end if; end;"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("relationships : " + visitor.getRelationships()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(2, visitor.getTables().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("departments"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); + + Assert.assertEquals(7, visitor.getColumns().size()); + + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("UNKNOWN", "job_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("UNKNOWN", "location_id"))); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java index 5d6d27c935..374777b268 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java @@ -18,7 +18,7 @@ public class OracleCallTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest1.java index 5f43189924..1c566dc62a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest1.java @@ -19,7 +19,7 @@ public class OracleCreateIndexTest1 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest1.java index 2a4c18b4e2..81113bafe7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest1.java @@ -19,7 +19,7 @@ public class OracleCreateTableTest1 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest2.java index cd422e5875..c5e67b37ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest2.java @@ -19,7 +19,7 @@ public class OracleCreateTableTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest3.java index 7580f34397..675822728a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest3.java @@ -19,7 +19,7 @@ public class OracleCreateTableTest3 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest4.java index 64b09d4a32..9ae79663b0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest4.java @@ -19,7 +19,7 @@ public class OracleCreateTableTest4 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest5.java index 88de950ab4..ffa328dd6d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest5.java @@ -20,7 +20,7 @@ public class OracleCreateTableTest5 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest6.java index 61b7566727..1837836e25 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest6.java @@ -19,7 +19,7 @@ public class OracleCreateTableTest6 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); @@ -34,12 +34,12 @@ public class OracleCreateTableTest6 extends OracleTest { Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("cdc.en_complaint_ipr_stat_fdt0"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("\"SYS\".SYS_TEMP_0FD9D66FD_93E068F3"))); - Assert.assertEquals(0, visitor.getColumns().size()); + Assert.assertEquals(2, visitor.getColumns().size()); - // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "*"))); - // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "YEAR"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("\"SYS\".SYS_TEMP_0FD9D66FD_93E068F3", "\"C0\""))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("\"SYS\".SYS_TEMP_0FD9D66FD_93E068F3", "\"C1\""))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "order_mode"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java index 82569b05c1..06d77c8171 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java @@ -19,7 +19,7 @@ public class OracleExplainTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java index 87dcbb456e..916a080e5e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java @@ -26,7 +26,7 @@ public class OracleExplainTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java index 77bb25344d..3b00b66b75 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java @@ -18,7 +18,7 @@ public class OracleGrantTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest.java index c87968b225..3a6da40162 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest.java @@ -18,7 +18,7 @@ public class OracleInsertTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest1.java index bc6d315d57..6fa3beef95 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest1.java @@ -21,7 +21,7 @@ public class OracleInsertTest1 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest2.java index 8950f2aa5e..83001d3cc2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest2.java @@ -23,7 +23,7 @@ public class OracleInsertTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest3.java index ac6eda25ea..2fcae60a16 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest3.java @@ -21,7 +21,7 @@ public class OracleInsertTest3 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest4.java index b2f178d0a2..d3b9fc13f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest4.java @@ -57,7 +57,7 @@ public class OracleInsertTest4 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest5.java index f06057152d..1fa97576fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest5.java @@ -18,7 +18,7 @@ public class OracleInsertTest5 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest6.java index 0ff5882353..230dfdd64a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest6.java @@ -18,7 +18,7 @@ public class OracleInsertTest6 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest7.java new file mode 100644 index 0000000000..710ccfd1ba --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest7.java @@ -0,0 +1,44 @@ +package com.alibaba.druid.bvt.sql.oracle; + +import java.util.List; + +import junit.framework.Assert; + +import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; + +public class OracleInsertTest7 extends OracleTest { + + public void test_0() throws Exception { + String sql = "insert into \"OPS$ADMIN\".\"ORASTAT\" select /*+ rule */ :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, ot.name c1, null c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.hist_head$ h, histgrm$ hg where :3 is null and u.name = :1 and ot.owner# = u.user# and ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and (:4 is null or c.name = :4) and h.obj# = ot.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, ot.name c1, op.subname c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.tabpart$ tp, sys.obj$ op, sys.hist_head$ h, histgrm$ hg where u.name = :1 and ot.owner# = u.user# and ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and (:4 is null or c.name = :4) and tp.bo# = ot.obj# and tp.obj# = op.obj# and ((:3 is null and :vc_cascade_parts is not null) or op.subname = :3) and h.obj# = op.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, op.name c1, op.subname c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and ((:3 is null and :vc_cascade_parts is not null) or op.subname = :3) and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and h.obj# = op.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, op.name c1, op.subname c2, os.subname c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.tabsubpart$ ts, sys.obj$ os, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and ts.pobj# = tp.obj# and ts.obj# = os.obj# and ((:3 is null and :vc_cascade_parts is not null) or (op.subname = :3 and (:vc_cascade_parts is not null or os.subname is null)) or os.subname = :3) and h.obj# = os.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# order by c5,c1,c2,c3,c4,n10"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("relationships : " + visitor.getRelationships()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("raises"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); + + Assert.assertEquals(2, visitor.getTables().size()); + Assert.assertEquals(3, visitor.getColumns().size()); + + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); + } + +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java index 29c2a83091..9da379c295 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java @@ -18,7 +18,7 @@ public class OracleLockTableTest1 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java index 8e45b44fe0..556c3d18ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java @@ -18,7 +18,7 @@ public class OracleLockTableTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java index ff6eb8ba30..a69ec311aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java @@ -26,7 +26,7 @@ public class OracleMergeTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java index 86c0cc1638..f9f6e8a3ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java @@ -46,7 +46,7 @@ public class OracleMergeTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java index 4bd33f5453..a5d3219b5f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java @@ -18,7 +18,7 @@ public class OracleMergeTest3 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java index 3f9e0415f8..adc776405f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java @@ -18,7 +18,7 @@ public class OracleMergeTest4 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java index b74e626e0c..578a81928f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java @@ -26,7 +26,7 @@ public class OracleMergeTest5 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java index 992dd28a6f..824192e443 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java @@ -35,7 +35,7 @@ public class OracleMultiInsertTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java index 8730a2d3e6..8f0038860d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java @@ -26,7 +26,7 @@ public class OracleMultiInsertTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest1.java index 1778589f69..342ab57db6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest1.java @@ -18,7 +18,7 @@ public class OracleSelectTest1 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest10.java index 50fa8cc563..ebba8ea2b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest10.java @@ -21,7 +21,7 @@ public class OracleSelectTest10 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest11.java index a48c227dbe..d01981dbbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest11.java @@ -37,7 +37,7 @@ public class OracleSelectTest11 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest12.java index a8fa2328fa..29e92f456f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest12.java @@ -23,7 +23,7 @@ public class OracleSelectTest12 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest13.java index 1eca45b2fb..28ab3662bf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest13.java @@ -20,7 +20,7 @@ public class OracleSelectTest13 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest14.java index ef778774e9..5ff7850993 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest14.java @@ -19,7 +19,7 @@ public class OracleSelectTest14 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest15.java index 4e8bec9064..c42f0e075d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest15.java @@ -18,7 +18,7 @@ public class OracleSelectTest15 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest16.java index 613227d6ab..53a5dd7e42 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest16.java @@ -18,7 +18,7 @@ public class OracleSelectTest16 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest17.java index 44d88ed56d..07ab3d1f2e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest17.java @@ -18,7 +18,7 @@ public class OracleSelectTest17 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest18.java index a1753dcfd3..bebc71a181 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest18.java @@ -31,7 +31,7 @@ public class OracleSelectTest18 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest19.java index 186556e58e..8fd487530f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest19.java @@ -29,7 +29,7 @@ public class OracleSelectTest19 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest2.java index 6eef316472..5c70056126 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest2.java @@ -30,7 +30,7 @@ public class OracleSelectTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest20.java index 63a64a1dbc..fcc4749746 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest20.java @@ -23,7 +23,7 @@ public class OracleSelectTest20 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest21.java index 06d6eabf4e..99beafe0ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest21.java @@ -34,7 +34,7 @@ public class OracleSelectTest21 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest22.java index 8eaa396af7..c3cfa12a21 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest22.java @@ -19,7 +19,7 @@ public class OracleSelectTest22 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest23.java index 7084eb994c..61f6a221a2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest23.java @@ -19,7 +19,7 @@ public class OracleSelectTest23 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest24.java index b382441407..1e0c689c58 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest24.java @@ -19,7 +19,7 @@ public class OracleSelectTest24 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest25.java index f438504483..46de2b2cb5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest25.java @@ -19,7 +19,7 @@ public class OracleSelectTest25 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest26.java index 601c1af10e..5bf3cf00f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest26.java @@ -26,7 +26,7 @@ public class OracleSelectTest26 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest27.java index 8128c18d18..5e5845fc0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest27.java @@ -21,7 +21,7 @@ public class OracleSelectTest27 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest28.java index 85874c66d4..0d221fb148 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest28.java @@ -19,7 +19,7 @@ public class OracleSelectTest28 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest29.java index 449f31d2e9..4fb317ea0b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest29.java @@ -19,7 +19,7 @@ public class OracleSelectTest29 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest3.java index 5cd6e51b41..59d32352f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest3.java @@ -23,7 +23,7 @@ public class OracleSelectTest3 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest30.java index 0cef33131b..fdd0b08a0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest30.java @@ -30,7 +30,7 @@ public class OracleSelectTest30 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest4.java index 4b1f47d8ad..3d2afa33b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest4.java @@ -22,7 +22,7 @@ public class OracleSelectTest4 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest5.java index 6bc8a9432b..3e8634ac5a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest5.java @@ -19,7 +19,7 @@ public class OracleSelectTest5 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest6.java index b6d9b94a94..9ff3cf996d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest6.java @@ -23,7 +23,7 @@ public class OracleSelectTest6 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest7.java index 053f6277ed..e33ec1a9ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest7.java @@ -22,7 +22,7 @@ public class OracleSelectTest7 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest8.java index 4e084247a3..1d13cf73c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest8.java @@ -21,7 +21,7 @@ public class OracleSelectTest8 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest9.java index 100f376e8b..38c46cc79d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest9.java @@ -24,7 +24,7 @@ public class OracleSelectTest9 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java index 77b0cac833..83b5718912 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java @@ -18,7 +18,7 @@ public class OracleSetTransactionTest extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java index 69c41561e6..add1fbd698 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java @@ -22,7 +22,7 @@ public class OracleUpdateTest1 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java index fb42eb65f0..85d46d9872 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java @@ -30,7 +30,7 @@ public class OracleUpdateTest2 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java index 1ecfed1c8a..76451ecc71 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java @@ -24,7 +24,7 @@ public class OracleUpdateTest3 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 23878ad026..dd89644ef5 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 @@ -18,7 +18,7 @@ public class DropTableTest extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 c990426e4e..749c49a7c6 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 @@ -19,7 +19,7 @@ public class PGDeleteTest extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 6287d3ca11..35cc7713d3 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 @@ -18,7 +18,7 @@ public class PGDeleteTest2 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 0d390f1c92..7e99d52761 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 @@ -18,7 +18,7 @@ public class PGDeleteTest3 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 31158ca98d..fd34877205 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 @@ -18,7 +18,7 @@ public class PGDeleteTest4 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 b0b4b45b13..95db7edb37 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 @@ -18,7 +18,7 @@ public class PGDeleteTest5 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 0f75aa7a4e..c9de2dce42 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 @@ -18,7 +18,7 @@ public class PGInsertTest0 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 23518e81b1..6c9b193b7c 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 @@ -18,7 +18,7 @@ public class PGInsertTest1 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 d15f448639..7369379674 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 @@ -20,7 +20,7 @@ public class PGInsertTest2 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 9520962b3b..78e8c82176 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 @@ -18,7 +18,7 @@ public class PGInsertTest3 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 1893fb9bfe..200685a85a 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 @@ -18,7 +18,7 @@ public class PGInsertTest4 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 e77b667d65..33c5314dfb 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 @@ -23,7 +23,7 @@ public class PGInsertTest5 extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 00afe00c5d..5f4dbe1831 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 @@ -18,7 +18,7 @@ public class PGSelectIntoTest extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 c53e671c5e..76bd447461 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 @@ -39,7 +39,7 @@ public class PostgresqlResourceTest extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); 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 29d716e97b..05aa2b098c 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 @@ -19,7 +19,7 @@ public class TruncateTest extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); @@ -41,7 +41,7 @@ public class TruncateTest extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); @@ -63,7 +63,7 @@ public class TruncateTest extends PGTest { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); - System.out.println(output(statementList)); + print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/sql/MysqlTest.java b/src/test/java/com/alibaba/druid/sql/MysqlTest.java index 9c03e5b139..0ee8a6d678 100644 --- a/src/test/java/com/alibaba/druid/sql/MysqlTest.java +++ b/src/test/java/com/alibaba/druid/sql/MysqlTest.java @@ -19,4 +19,13 @@ public class MysqlTest extends TestCase { return out.toString(); } + + protected void print(List stmtList) { + String text = output(stmtList); + String outputProperty = System.getProperty("druid.output"); + if ("false".equals(outputProperty)) { + return; + } + System.out.println(text); + } } diff --git a/src/test/java/com/alibaba/druid/sql/OracleTest.java b/src/test/java/com/alibaba/druid/sql/OracleTest.java index 6b01739445..6bc9d5785b 100644 --- a/src/test/java/com/alibaba/druid/sql/OracleTest.java +++ b/src/test/java/com/alibaba/druid/sql/OracleTest.java @@ -18,4 +18,13 @@ public class OracleTest extends TestCase { return out.toString(); } + + protected void print(List stmtList) { + String text = output(stmtList); + String outputProperty = System.getProperty("druid.output"); + if ("false".equals(outputProperty)) { + return; + } + System.out.println(text); + } } diff --git a/src/test/java/com/alibaba/druid/sql/PGTest.java b/src/test/java/com/alibaba/druid/sql/PGTest.java index eae850f05b..914cc6ddc5 100644 --- a/src/test/java/com/alibaba/druid/sql/PGTest.java +++ b/src/test/java/com/alibaba/druid/sql/PGTest.java @@ -18,4 +18,13 @@ public class PGTest extends TestCase { return out.toString(); } + + protected void print(List stmtList) { + String text = output(stmtList); + String outputProperty = System.getProperty("druid.output"); + if ("false".equals(outputProperty)) { + return; + } + System.out.println(text); + } } diff --git a/src/test/java/com/alibaba/druid/sql/TestTransform.java b/src/test/java/com/alibaba/druid/sql/TestTransform.java index 9dcef87e56..70eb2f527c 100644 --- a/src/test/java/com/alibaba/druid/sql/TestTransform.java +++ b/src/test/java/com/alibaba/druid/sql/TestTransform.java @@ -127,7 +127,7 @@ public class TestTransform extends OracleTest { r.setLastSnapshotDate(rs.getDate(7)); r.setDbPk(rs.getLong(8)); - System.out.println(i + "(" + r.getDbName() + "/" + r.getSqlId() + ") : " + r.getSqlText()); + System.out.println(i + "(" + r.getDbName() + "/" + r.getSqlId() + "/" + r.getCommandType() + ") : " + r.getSqlText()); try { schemaStatInternal(r); } catch (Throwable e) { @@ -161,7 +161,7 @@ public class TestTransform extends OracleTest { SQLStatement statemen = statementList.get(0); Assert.assertEquals(1, statementList.size()); - // System.out.println(output(statementList)); + // print(statementList); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statemen.accept(visitor); @@ -283,7 +283,7 @@ public class TestTransform extends OracleTest { SQLStatement statemen = statementList.get(0); Assert.assertEquals(1, statementList.size()); - // System.out.println(output(statementList)); + // print(statementList); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statemen.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/sql/hive/HiveTest.java b/src/test/java/com/alibaba/druid/sql/hive/HiveTest.java index 9e7cc8fe99..1f14d66d3b 100644 --- a/src/test/java/com/alibaba/druid/sql/hive/HiveTest.java +++ b/src/test/java/com/alibaba/druid/sql/hive/HiveTest.java @@ -19,4 +19,13 @@ public class HiveTest extends TestCase { return out.toString(); } + + protected void print(List stmtList) { + String text = output(stmtList); + String outputProperty = System.getProperty("druid.output"); + if ("false".equals(outputProperty)) { + return; + } + System.out.println(text); + } }