refactor

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);
             }

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);

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() {

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 {

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<Long>(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<Long>(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());
 

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;

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> 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")));
     }
 }

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> 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")));
+    }
+}

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> 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")));
     }
 }

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> 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")));
+    }
+
+}

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());
 

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<SQLStatement> statementList = parser.parseStatementList();
         SQLStatement statemen = statementList.get(0);
-        System.out.println(output(statementList));
+        print(statementList);
 
         Assert.assertEquals(1, statementList.size());