From e0625ead3c8805c58bda92a1836a360e11c2fdf0 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Tue, 2 Jun 2015 09:40:23 +0800
Subject: [PATCH] improved postgresql support

---
 .../druid/sql/parser/SQLStatementParser.java  |  3 +
 .../bvt/sql/postgresql/PGAlterTableTest3.java | 60 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest3.java

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 ccd1e257a2..1895cc0f53 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java
@@ -1658,6 +1658,9 @@ public class SQLStatementParser extends SQLParser {
             item.getColumns().add(columnDef);
             if (lexer.token() == Token.COMMA) {
                 lexer.nextToken();
+                if (identifierEquals("ADD")) {
+                    break;
+                }
                 continue;
             }
             break;
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest3.java
new file mode 100644
index 0000000000..9efdb37a26
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest3.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.sql.postgresql;
+
+import java.util.List;
+
+import org.junit.Assert;
+
+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 PGAlterTableTest3 extends PGTest {
+
+    public void test_0() throws Exception {
+        String sql = "ALTER TABLE issues "//
+                + "ADD COLUMN issue_creation_date_ms BIGINT NULL, "//
+                + "ADD COLUMN issue_update_date_ms BIGINT NULL, "//
+                + "ADD COLUMN issue_close_date_ms BIGINT NULL, "//
+                + "ADD COLUMN tags VARCHAR (4000) NULL, "//
+                + "ADD COLUMN component_uuid VARCHAR (50) NULL, "//
+                + "ADD COLUMN project_uuid VARCHAR (50) NULL";
+
+        PGSQLStatementParser parser = new PGSQLStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement statemen = statementList.get(0);
+        print(statementList);
+
+        Assert.assertEquals(1, statementList.size());
+
+        PGSchemaStatVisitor visitor = new PGSchemaStatVisitor();
+        statemen.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("issues")));
+        
+        Assert.assertTrue(visitor.getTables().get(new TableStat.Name("issues")).getAlterCount() == 1);
+
+        Assert.assertEquals(visitor.getColumns().size(), 6);
+    }
+
+   
+}