improve postgresql support

src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGArrayExpr.java

@@ -23,8 +23,18 @@ import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor;
 
 public class PGArrayExpr extends PGExprImpl {
 
+    private SQLExpr       expr;
+
     private List<SQLExpr> values = new ArrayList<SQLExpr>();
 
+    public SQLExpr getExpr() {
+        return expr;
+    }
+
+    public void setExpr(SQLExpr expr) {
+        this.expr = expr;
+    }
+
     public List<SQLExpr> getValues() {
         return values;
     }
@@ -36,6 +46,7 @@ public class PGArrayExpr extends PGExprImpl {
     @Override
     public void accept0(PGASTVisitor visitor) {
         if (visitor.visit(this)) {
+            acceptChild(visitor, expr);
             acceptChild(visitor, values);
         }
         visitor.endVisit(this);
@@ -43,7 +54,11 @@ public class PGArrayExpr extends PGExprImpl {
 
     @Override
     public int hashCode() {
-        return values.hashCode();
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((expr == null) ? 0 : expr.hashCode());
+        result = prime * result + ((values == null) ? 0 : values.hashCode());
+        return result;
     }
 
     @Override
@@ -52,6 +67,9 @@ public class PGArrayExpr extends PGExprImpl {
         if (obj == null) return false;
         if (getClass() != obj.getClass()) return false;
         PGArrayExpr other = (PGArrayExpr) obj;
+        if (expr == null) {
+            if (other.expr != null) return false;
+        } else if (!expr.equals(other.expr)) return false;
         if (values == null) {
             if (other.values != null) return false;
         } else if (!values.equals(other.values)) return false;

src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java

@@ -69,8 +69,9 @@ public class PGExprParser extends SQLExprParser {
     
     public SQLExpr primary() {
         if (lexer.token() == Token.ARRAY) {
-            lexer.nextToken();
             PGArrayExpr array = new PGArrayExpr();
+            array.setExpr(new SQLIdentifierExpr(lexer.stringVal()));
+            lexer.nextToken();
             accept(Token.LBRACKET);
             this.exprList(array.getValues(), array);
             accept(Token.RBRACKET);
@@ -119,6 +120,15 @@ public class PGExprParser extends SQLExprParser {
             return primaryRest(castExpr);
         }
         
+        if (lexer.token() == Token.LBRACKET) {
+            PGArrayExpr array = new PGArrayExpr();
+            array.setExpr(expr);
+            lexer.nextToken();
+            this.exprList(array.getValues(), array);
+            accept(Token.RBRACKET);
+            return primaryRest(array);
+        }
+        
         if (expr.getClass() == SQLIdentifierExpr.class) {
             String ident = ((SQLIdentifierExpr)expr).getName();
             

src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java

@@ -519,7 +519,8 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor
     
     @Override
     public boolean visit(PGArrayExpr x) {
-        print("ARRAY[");
+        x.getExpr().accept(this);
+        print("[");
         printAndAccept(x.getValues(), ", ");
         print("]");
         return false;