From f0c29c44a83ce59a1d5cbbe3a76898d891d455cd Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 15 Oct 2011 08:42:58 +0000 Subject: [PATCH] analytic clause git-svn-id: http://code.alibabatech.com/svn/druid/trunk@974 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../oracle/visitor/OracleOutputVisitor.java | 12 ++++++-- .../bvt/sql/oracle/OracleAnalyticTest.java | 30 +++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.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 9ca05ab399..63f5364d05 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 @@ -133,19 +133,27 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS } public boolean visit(OracleAnalytic x) { + boolean space = false; if (x.getPartitionBy().size() > 0) { print("PARTITION BY ("); printAndAccept(x.getPartitionBy(), ", "); print(")"); + + space = true; } if (x.getOrderBy() != null) { - print(" "); + if (space) { + print(" "); + } x.getOrderBy().accept(this); + space = true; } if (x.getWindowing() != null) { - print(" "); + if (space) { + print(" "); + } x.getWindowing().accept(this); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java new file mode 100644 index 0000000000..8b7ebea4fa --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java @@ -0,0 +1,30 @@ +package com.alibaba.druid.bvt.sql.oracle; + +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.test.TestUtils; + +import junit.framework.Assert; +import junit.framework.TestCase; + +public class OracleAnalyticTest extends TestCase { + + public void test_isEmpty() throws Exception { + String sql = "SELECT last_name, salary, STDDEV(salary) OVER (ORDER BY hire_date) \"StdDev\" " + + "FROM employees " + + "WHERE department_id = 30;"; + + String expect = "SELECT last_name, salary, STDDEV(salary) OVER (ORDER BY hire_date) AS \"StdDev\"\n" + + "FROM employees\n" + + "WHERE department_id = 30;\n"; + OracleStatementParser parser = new OracleStatementParser(sql); + SQLSelectStatement stmt = (SQLSelectStatement) parser + .parseStatementList().get(0); + + String text = TestUtils.outputOracle(stmt); + + Assert.assertEquals(expect, text); + + System.out.println(text); + } +}