diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 54f85999ca..6f10b6afc4 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1999,7 +1999,22 @@ public class SQLExprParser extends SQLParser { item.setValue(new SQLIdentifierExpr(lexer.stringVal())); lexer.nextToken(); } else { - item.setValue(expr()); + SQLExpr expr = expr(); + + if (lexer.token() == Token.COMMA && JdbcConstants.POSTGRESQL.equals(dbType)) { + SQLListExpr listExpr = new SQLListExpr(); + listExpr.addItem(expr); + expr.setParent(listExpr); + do { + lexer.nextToken(); + SQLExpr listItem = this.expr(); + listItem.setParent(listExpr); + listExpr.addItem(listItem); + } while (lexer.token() == Token.COMMA); + item.setValue(listExpr); + } else { + item.setValue(expr); + } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest2.java new file mode 100644 index 0000000000..43e0b2128b --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest2.java @@ -0,0 +1,65 @@ +/* + * Copyright 1999-2101 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 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.sql.visitor.ParameterizedOutputVisitorUtils; +import com.alibaba.druid.util.JdbcUtils; +import org.junit.Assert; + +import java.util.List; + +public class PGSetTest2 extends PGTest { + + protected void setUp() throws Exception { + super.setUp(); + + System.out.println(); + } + + public void test_0() throws Exception { + String sql = "SET search_path = \"public\",\"$user\", public"; + + PGSQLStatementParser parser = new PGSQLStatementParser(sql); + List 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()); + // System.out.println("coditions : " + visitor.getConditions()); + + Assert.assertEquals(0, visitor.getColumns().size()); + + String mergedSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.POSTGRESQL); + assertEquals("SET search_path = \"public\",\"$user\", public", mergedSql); + } + +} + +// select categoryId , offerIds from cnres.function_select_get_spt_p4p_offer_list (' 1031918 , 1031919 , 1037004 ') as +// a(categoryId numeric,offerIds character varying(4000)) +// select memberId , offerIds from cnres.function_select_get_seller_hot_offer_list('\'gzyyd168\'') as a(memberId +// character varying(20),offerIds character varying(4000)) +