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 4f48219327..89c9f7e328 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1652,8 +1652,14 @@ public class SQLExprParser extends SQLParser { } else { accept(Token.EQ); } - item.setValue(expr()); - + + if(lexer.token() == Token.ON) { + item.setValue(new SQLIdentifierExpr(lexer.stringVal())); + lexer.nextToken(); + } else { + item.setValue(expr()); + } + return item; } diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index b963faa74e..42a6e1cb6c 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -123,15 +123,21 @@ public final class JdbcUtils implements JdbcConstants { public static void printResultSet(ResultSet rs) throws SQLException { printResultSet(rs, System.out); } - + public static void printResultSet(ResultSet rs, PrintStream out) throws SQLException { + printResultSet(rs, out, true, "\t"); + } + + public static void printResultSet(ResultSet rs, PrintStream out, boolean printHeader, String seperator) throws SQLException { ResultSetMetaData metadata = rs.getMetaData(); int columnCount = metadata.getColumnCount(); - for (int columnIndex = 1; columnIndex <= columnCount; ++columnIndex) { - if (columnIndex != 1) { - out.print('\t'); + if (printHeader) { + for (int columnIndex = 1; columnIndex <= columnCount; ++columnIndex) { + if (columnIndex != 1) { + out.print(seperator); + } + out.print(metadata.getColumnName(columnIndex)); } - out.print(metadata.getColumnName(columnIndex)); } out.println(); @@ -140,7 +146,7 @@ public final class JdbcUtils implements JdbcConstants { for (int columnIndex = 1; columnIndex <= columnCount; ++columnIndex) { if (columnIndex != 1) { - out.print('\t'); + out.print(seperator); } int type = metadata.getColumnType(columnIndex); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest.java new file mode 100644 index 0000000000..3a04f73c3c --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest.java @@ -0,0 +1,66 @@ +/* + * 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.sql.visitor.ParameterizedOutputVisitorUtils; +import com.alibaba.druid.util.JdbcUtils; + +public class PGSetTest extends PGTest { + + protected void setUp() throws Exception { + super.setUp(); + + System.out.println(); + } + + public void test_0() throws Exception { + String sql = "SET standard_conforming_strings=on"; + + 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(1, visitor.getColumns().size()); + + String mergedSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.POSTGRESQL); + System.out.println(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)) +