From f347c78a1adb93320901bbd92464d9e728a0ffdb Mon Sep 17 00:00:00 2001 From: owenludong Date: Tue, 30 Jul 2013 20:08:37 +0800 Subject: [PATCH] =?UTF-8?q?1=20=E4=BF=AE=E5=A4=8D=20OracleOutputVisitor.ja?= =?UTF-8?q?va=20=E5=9C=A8=E8=BE=93=E5=87=BAhint=E6=97=B6=E5=80=99=20?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E9=94=99=E8=AF=AF=202=20hint=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E6=94=BE=E5=9C=A8select=E5=90=8E=E9=9D=A2=E5=90=A6?= =?UTF-8?q?=E5=88=99=E8=B5=B0=E4=B8=8D=E4=B8=8A=E7=B4=A2=E5=BC=95=203=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=88=86=E9=9A=94=EF=BC=8C=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E5=90=8E=E9=9D=A2=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oracle/visitor/OracleOutputVisitor.java | 12 +++---- .../sql/visitor/SQLASTOutputVisitor.java | 2 +- .../druid/bvt/sql/oracle/OracleHintTest.java | 36 +++++++++++++++++++ 3 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java 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 3392d310d5..c9f77ce50c 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 @@ -566,8 +566,12 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS } public boolean visit(OracleSelectQueryBlock x) { - print("SELECT "); + print("SELECT "); + if (x.getHints().size() > 0) { + printAndAccept(x.getHints(), ", "); + } + if (SQLSetQuantifier.ALL == x.getDistionOption()) { print("ALL "); } else if (SQLSetQuantifier.DISTINCT == x.getDistionOption()) { @@ -576,12 +580,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS print("UNIQUE "); } - if (x.getHints().size() > 0) { - print("/*+"); - printAndAccept(x.getHints(), ", "); - print("*/ "); - } - printSelectList(x.getSelectList()); if (x.getInto() != null) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 240be1f789..6977ec3573 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -1301,7 +1301,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter { public boolean visit(SQLCommentHint x) { print("/*"); print(x.getText()); - print("*/"); + print("*/ "); return false; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java new file mode 100644 index 0000000000..684204c344 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java @@ -0,0 +1,36 @@ +package com.alibaba.druid.bvt.sql.oracle; + +import java.util.List; + +import com.alibaba.druid.sql.PagerUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; +import com.alibaba.druid.util.JdbcUtils; + +import junit.framework.Assert; +import junit.framework.TestCase; + +public class OracleHintTest extends TestCase { + + public void test_hint1() throws Exception { + String sql = "SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ distinct e.id from ord_order_item e where e.F1 = Date '2011-10-01'"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + StringBuilder out = new StringBuilder(); + stmt.accept(new OracleOutputVisitor(out, true)); + + String newSQL = out.toString(); + Assert.assertEquals("SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ DISTINCT e.id\nFROM ord_order_item e\nWHERE e.F1 = DATE '2011-10-01';\n", newSQL); + + } + + public void test_hint2() throws Exception { + String sql = "SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ distinct e.id from ord_order_item e where e.F1 = Date '2011-10-01'"; + String countSQL = PagerUtils.count(sql, JdbcUtils.ORACLE); + Assert.assertEquals("SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ DISTINCT COUNT(*)\nFROM ord_order_item e\nWHERE e.F1 = DATE '2011-10-01'", countSQL); + } +}