diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java deleted file mode 100644 index 3dd0d4097c..0000000000 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.sql.dialect.oracle.ast.stmt; - -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; - -public class OracleSelectHierachicalQueryClause extends OracleSQLObjectImpl { - - private SQLExpr startWith; - private SQLExpr connectBy; - private boolean prior = false; - private boolean noCycle = false; - - public OracleSelectHierachicalQueryClause(){ - - } - - public boolean isPrior() { - return prior; - } - - public void setPrior(boolean prior) { - this.prior = prior; - } - - public void accept0(OracleASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, this.startWith); - acceptChild(visitor, this.connectBy); - } - - visitor.endVisit(this); - } - - public SQLExpr getStartWith() { - return this.startWith; - } - - public void setStartWith(SQLExpr startWith) { - this.startWith = startWith; - } - - public SQLExpr getConnectBy() { - return this.connectBy; - } - - public void setConnectBy(SQLExpr connectBy) { - this.connectBy = connectBy; - } - - public boolean isNoCycle() { - return this.noCycle; - } - - public void setNoCycle(boolean noCycle) { - this.noCycle = noCycle; - } -} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java new file mode 100644 index 0000000000..d7bac89e63 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java @@ -0,0 +1,33 @@ +package com.alibaba.druid.bvt.sql; + +import com.alibaba.druid.sql.PagerUtils; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +public class PagerUtilsTest_hasUnorderedLimit_oracle extends TestCase { + + public void test_false() throws Exception { + String sql = "SELECT *" + // + "\nFROM (SELECT XX.*, ROWNUM AS RN" + // + "\n\tFROM (SELECT id, name, salary" + // + "\n\t\tFROM t" + // + "\n\t\tORDER BY id, name" + // + "\n\t\t) XX" + // + "\n\tWHERE ROWNUM <= 30" + // + "\n\t) XXX" + // + "\nWHERE RN > 20"; + assertFalse(PagerUtils.hasUnorderedLimit(sql, JdbcConstants.ORACLE)); + } + + public void test_false_1() throws Exception { + String sql = " select * from test t"; + assertFalse(PagerUtils.hasUnorderedLimit(sql, JdbcConstants.ORACLE)); + } + + public void test_true() throws Exception { + String sql = "SELECT *" + // + "\nFROM t" + // + "\nWHERE ROWNUM <= 10"; + assertTrue(PagerUtils.hasUnorderedLimit(sql, JdbcConstants.ORACLE)); + } +}