bug fixed for pg sql parser

src/test/java/com/alibaba/druid/TestMySqlPing.java

@@ -20,6 +20,8 @@ import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker;
+
 import junit.framework.TestCase;
 
 
@@ -35,9 +37,9 @@ public class TestMySqlPing extends TestCase {
         // password = "ccbuauto";
         // SQL = "SELECT * FROM WP_ORDERS WHERE ID = ?";
 
-        jdbcUrl = "jdbc:mysql://a.b.c.d:3308/dragoon_v25_masterdb";
-        user = "dragoon_admin";
-        password = "dragoon_root";
+        jdbcUrl = "jdbc:mysql://a.b.c.d/tddl5_00";
+        user = "aa";
+        password = "bb";
 
         driverClass = "com.mysql.jdbc.Driver";
     }
@@ -48,6 +50,10 @@ public class TestMySqlPing extends TestCase {
         Connection conn = DriverManager.getConnection(jdbcUrl, user, password);
 
         com.mysql.jdbc.Connection mysqlConn = (com.mysql.jdbc.Connection) conn;
+        
+        MySqlValidConnectionChecker checker = new MySqlValidConnectionChecker();
+        
+        checker.isValidConnection(mysqlConn, "select 'x'", 30);
 
         for (int i = 0; i < 10; ++i) {
             ping_1000(mysqlConn);

src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java

@@ -17,8 +17,8 @@ public class Bug_for_qianbi extends TestCase {
                      + "where match(auctionTitle,\"男鞋\\n中石化&加油卡\\n中石化&充值卡\\n中石化&冲值卡\\n中石化&代冲\\n中石化&代充\\n中国石化&加油卡\\n中国石化&充值卡\\n中国石化&冲值卡\\n中国石化&代冲\\n中国石化&代充\",\"\\n\")";
 
         String expected = "INSERT INTO TABLE lol"
-                          + "\nSELECT detail(sellerid, id) AS count1, "
-                          + "\n\tSUM(sellerid) AS sum1"
+                          + "\nSELECT detail(sellerid, id) AS count1"
+                          + "\n\t, SUM(sellerid) AS sum1"
                           + "\nFROM ctu_trade_paid_done:time('natural', '1d', '1h')"
                           + "\nWHERE match(auctionTitle, '男鞋\\n中石化&加油卡\\n中石化&充值卡\\n中石化&冲值卡\\n中石化&代冲\\n中石化&代充\\n中国石化&加油卡\\n中国石化&充值卡\\n中国石化&冲值卡\\n中国石化&代冲\\n中国石化&代充', '\\n');\n";
 

src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest8.java

@@ -55,8 +55,10 @@ public class PGDeleteTest8 extends PGTest {
         Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("parts")));
         Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("included_parts")));
 
-        Assert.assertTrue(visitor.getColumns().size() == 4);
+        Assert.assertTrue(visitor.getColumns().size() == 3);
         
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("parts", "sub_part")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("included_parts", "sub_part")));
         Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("parts", "part")));
     }
 

src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest15.java

@@ -51,7 +51,7 @@ public class PGSelectTest15 extends PGTest {
         System.out.println("fields : " + visitor.getColumns());
         System.out.println("coditions : " + visitor.getConditions());
 
-        Assert.assertEquals(6, visitor.getColumns().size());
+        Assert.assertEquals(7, visitor.getColumns().size());
         Assert.assertEquals(2, visitor.getTables().size());
     }
 }

src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest16.java

@@ -23,6 +23,7 @@ import com.alibaba.druid.sql.PGTest;
 import com.alibaba.druid.sql.ast.SQLStatement;
 import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
 import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
 
 public class PGSelectTest16 extends PGTest {
 
@@ -57,6 +58,16 @@ public class PGSelectTest16 extends PGTest {
 
         Assert.assertEquals(9, visitor.getColumns().size());
         Assert.assertEquals(2, visitor.getTables().size());
+        
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("graph", "id")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("graph", "link")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("graph", "data")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("search_graph", "depth")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("graph", "path")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("search_graph", "link")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("graph", "cycle")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sg", "depth")));
+        Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sg", "link")));
     }
 }
 

src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest6.java

@@ -29,7 +29,12 @@ public class PGSelectTest6 extends PGTest {
     public void test_0() throws Exception {
         String sql = "select fromUserId, toMemberId, rank, tag " + //
                      "from cnres.function_get_re_cni_myali_acion_fct0(?) " + //
-                     "as (fromUserId character varying(128), toMemberId character varying(128), rank numeric, tag character varying(128))";
+                     "as ("//
+                     + "fromUserId character varying(128), " //
+                     + "toMemberId character varying(128), " //
+                     + "rank numeric, " //
+                     + "tag character varying(128)" //
+                     + ")";
 
         PGSQLStatementParser parser = new PGSQLStatementParser(sql);
         List<SQLStatement> statementList = parser.parseStatementList();

src/test/java/com/alibaba/druid/pool/TestMySql.java

@@ -0,0 +1,30 @@
+package com.alibaba.druid.pool;
+
+import java.sql.Connection;
+
+import junit.framework.TestCase;
+
+public class TestMySql extends TestCase {
+
+    private DruidDataSource dataSource = new DruidDataSource();
+
+    protected void setUp() throws Exception {
+        String jdbcUrl = "jdbc:mysql://10.249.193.126/tddl5_00";
+        String user = "tddl5";
+        String password = "tddl5";
+
+        dataSource.setUrl(jdbcUrl);
+        dataSource.setUsername(user);
+        dataSource.setPassword(password);
+    }
+
+    protected void tearDown() throws Exception {
+        dataSource.close();
+    }
+
+    public void test_0() throws Exception {
+        Connection conn = dataSource.getConnection();
+
+        conn.close();
+    }
+}