From ba49b04dd5b6d506ef9b82fb4b6e45d4c227670f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Sat, 12 Dec 2020 13:36:30 +0800 Subject: [PATCH] improved OracleSysdateExpr toString, fix #4084 --- .../oracle/ast/OracleSQLObjectImpl.java | 6 +++ .../sql/oracle/select/OracleSysdateTest.java | 39 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObjectImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObjectImpl.java index 830f88e546..94a035c3fd 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObjectImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObjectImpl.java @@ -19,6 +19,7 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class OracleSQLObjectImpl extends SQLObjectImpl implements OracleSQLObject { @@ -31,6 +32,11 @@ public abstract class OracleSQLObjectImpl extends SQLObjectImpl implements Oracl protected void accept0(SQLASTVisitor v) { if (v instanceof OracleASTVisitor) { this.accept0((OracleASTVisitor) v); + return; + } + + if (v instanceof SQLASTOutputVisitor) { + ((SQLASTOutputVisitor) v).print(this.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java new file mode 100644 index 0000000000..caff9c618e --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java @@ -0,0 +1,39 @@ +/* + * Copyright 1999-2017 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.select; + +import com.alibaba.druid.DbType; +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.ast.expr.OracleSysdateExpr; +import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; +import com.alibaba.druid.util.JdbcConstants; + +import java.util.List; + +public class OracleSysdateTest extends OracleTest { + private DbType dbType = JdbcConstants.ORACLE; + + public void test_0() throws Exception { + OracleSysdateExpr sysdate = new OracleSysdateExpr(); + + StringBuffer buf = new StringBuffer(); + SQLASTOutputVisitor v = new SQLASTOutputVisitor(buf); + sysdate.accept(v); + assertEquals("SYSDATE", buf.toString()); + } +}