From 9f07744b03c875d3b6cd29db63012f520c9ce58b Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 15 Jul 2016 20:17:06 +0800 Subject: [PATCH] improved oracle sql parser trim option, fixed issue #1327 --- .../oracle/parser/OracleExprParser.java | 10 ++- .../oracle/visitor/OracleOutputVisitor.java | 4 +- .../bvt/sql/oracle/OracleSelectTest56.java | 78 +++++++++++++++++++ 3 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest56.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java index 4b9d956977..3fa93cb33f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java @@ -508,9 +508,13 @@ public class OracleExprParser extends SQLExprParser { methodExpr.putAttribute("trim_option", lexer.stringVal()); lexer.nextToken(); } - SQLExpr trim_character = this.primary(); - trim_character.setParent(methodExpr); - methodExpr.putAttribute("trim_character", trim_character); + + if (lexer.token() != Token.FROM) { + SQLExpr trim_character = this.primary(); + trim_character.setParent(methodExpr); + methodExpr.putAttribute("trim_character", trim_character); + } + if (lexer.token() == Token.FROM) { lexer.nextToken(); SQLExpr trim_source = this.expr(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index ab60bdbc89..00225b21de 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -480,7 +480,9 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS x.getExpr().accept(this); if (x.getType() != null) { print(' '); - print0(x.getType().name().toUpperCase()); + + String typeName = x.getType().name(); + print0(ucase ? typeName.toUpperCase() : typeName.toLowerCase()); } if (x.getNullsOrderType() != null) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest56.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest56.java new file mode 100644 index 0000000000..0194dff6ba --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest56.java @@ -0,0 +1,78 @@ +/* + * 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.oracle; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; + +public class OracleSelectTest56 extends OracleTest { + + public void test_0() throws Exception { + String sql = // + "SELECT TRIM(BOTH FROM EUCD) AS \"value\",NTLANG1 AS \"text\" " // + + " FROM T_HT_WREM_ENUMLANG_D" + + " WHERE TYPE=?" + + " ORDER BY \"value\" ASC"; // + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + stmt.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("relationships : " + visitor.getRelationships()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + + Assert.assertEquals(4, visitor.getColumns().size()); + + { + String text = SQLUtils.toOracleString(stmt); + + Assert.assertEquals("SELECT TRIM(EUCD) AS \"value\", NTLANG1 AS \"text\"" + + "\nFROM T_HT_WREM_ENUMLANG_D" + + "\nWHERE TYPE = ?" + + "\nORDER BY \"value\" ASC", text); + } + + { + String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + + Assert.assertEquals("select TRIM(EUCD) as \"value\", NTLANG1 as \"text\"" + + "\nfrom T_HT_WREM_ENUMLANG_D" + + "\nwhere TYPE = ?" + + "\norder by \"value\" asc", text); + } + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); + + // Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); + } +}