toString for windowing elements corrected

lax equality test implemented
included oracle test sqls
included @ and # for identifiers

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/WindowElement.java

@@ -60,7 +60,7 @@ public void setRange(WindowRange range) {
     @Override
     public String toString() {
         StringBuilder buffer = new StringBuilder(type.toString());
-
+        
         if (offset != null) {
             buffer.append(offset.toString());
         } else if (range != null) {
@@ -69,5 +69,4 @@ public String toString() {
 
         return buffer.toString();
     }
-
 }

src/main/java/net/sf/jsqlparser/expression/WindowOffset.java

@@ -54,7 +54,7 @@ public void setType(Type type) {
     public String toString() {
         StringBuilder buffer = new StringBuilder();
         if (expression != null) {
-            buffer.append(expression);
+            buffer.append(' ').append(expression);
             if (type != null) {
                 buffer.append(' ');
                 buffer.append(type);

src/main/java/net/sf/jsqlparser/expression/WindowRange.java

@@ -45,9 +45,9 @@ public void setStart(WindowOffset start) {
     @Override
     public String toString() {
         StringBuilder buffer = new StringBuilder();
-        buffer.append(" BETWEEN ");
+        buffer.append(" BETWEEN");
         buffer.append(start);
-        buffer.append(" AND ");
+        buffer.append(" AND");
         buffer.append(end);
         return buffer.toString();
     }

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -218,7 +218,7 @@ TOKEN:
 {
 	< S_IDENTIFIER: ( <LETTER> | <ADDITIONAL_LETTERS> )+ ( <DIGIT> | <LETTER> | <ADDITIONAL_LETTERS> | <SPECIAL_CHARS>)* >
 | 	< #LETTER: ["a"-"z", "A"-"Z", "_"] >
-|   < #SPECIAL_CHARS: "$" | "_">
+|   < #SPECIAL_CHARS: "$" | "_" | "#" | "@">
 |   < S_CHAR_LITERAL: "'" (~["'"])* "'" ("'" (~["'"])* "'")*>
 |   < S_QUOTED_IDENTIFIER: "\"" (~["\n","\r","\""])* "\"" | ("`" (~["\n","\r","`"])* "`") | ("[" (~["\n","\r","]"])* "]") >
 

src/test/java/net/sf/jsqlparser/test/TestUtils.java

@@ -27,33 +27,67 @@
 import java.io.*;
 
 import static junit.framework.Assert.assertEquals;
+import org.junit.Test;
 
 /**
  *
  * @author toben
  */
 public class TestUtils {
-	public static void assertSqlCanBeParsedAndDeparsed(String statement) throws JSQLParserException {
-		Statement parsed = CCJSqlParserUtil.parse(new StringReader(statement));
-		assertStatementCanBeDeparsedAs(parsed, statement);
-	}
-
-	public static void assertStatementCanBeDeparsedAs(Statement parsed, String statement) {
-		assertEquals(statement, parsed.toString());
-
-		StatementDeParser deParser = new StatementDeParser(new StringBuilder());
-		parsed.accept(deParser);
-		assertEquals(statement, deParser.getBuffer().toString());
-	}
-
-	public static void assertExpressionCanBeDeparsedAs(final Expression parsed, String expression) {
-		ExpressionDeParser expressionDeParser = new ExpressionDeParser();
-		StringBuilder stringBuilder = new StringBuilder();
-		expressionDeParser.setBuffer(stringBuilder);
-		SelectDeParser selectDeParser = new SelectDeParser(expressionDeParser, stringBuilder);
-		expressionDeParser.setSelectVisitor(selectDeParser);
-		parsed.accept(expressionDeParser);
-
-		assertEquals(expression, stringBuilder.toString());
-	}
+
+    public static void assertSqlCanBeParsedAndDeparsed(String statement) throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed(statement, false);
+    }
+
+    /**
+     * Tries to parse and deparse the given statement.
+     *
+     * @param statement
+     * @param laxDeparsingCheck removes all linefeeds from the original and
+     * removes all double spaces. The check is caseinsensitive.
+     * @throws JSQLParserException
+     */
+    public static void assertSqlCanBeParsedAndDeparsed(String statement, boolean laxDeparsingCheck) throws JSQLParserException {
+        Statement parsed = CCJSqlParserUtil.parse(new StringReader(statement));
+        assertStatementCanBeDeparsedAs(parsed, statement, laxDeparsingCheck);
+    }
+
+    public static void assertStatementCanBeDeparsedAs(Statement parsed, String statement) {
+        assertStatementCanBeDeparsedAs(parsed, statement, false);
+    }
+
+    public static void assertStatementCanBeDeparsedAs(Statement parsed, String statement, boolean laxDeparsingCheck) {
+        assertEquals(buildSqlString(statement, laxDeparsingCheck), 
+                buildSqlString(parsed.toString(), laxDeparsingCheck));
+
+        StatementDeParser deParser = new StatementDeParser(new StringBuilder());
+        parsed.accept(deParser);
+        assertEquals(buildSqlString(statement, laxDeparsingCheck), 
+                buildSqlString(deParser.getBuffer().toString(), laxDeparsingCheck));
+    }
+
+    public static String buildSqlString(String sql, boolean laxDeparsingCheck) {
+        if (laxDeparsingCheck) {
+            return sql.replaceAll("\\s", " ").replaceAll("\\s+", " ").toLowerCase().trim();
+        } else {
+            return sql;
+        }
+    }
+    
+    @Test
+    public void testBuildSqlString() {
+        assertEquals("select * from test", buildSqlString("   SELECT   * FROM  \r\n \t  TEST \n", true));
+        assertEquals("select  *  from test", buildSqlString("select  *  from test", false));
+    }
+
+    public static void assertExpressionCanBeDeparsedAs(final Expression parsed, String expression) {
+        ExpressionDeParser expressionDeParser = new ExpressionDeParser();
+        StringBuilder stringBuilder = new StringBuilder();
+        expressionDeParser.setBuffer(stringBuilder);
+        SelectDeParser selectDeParser = new SelectDeParser(expressionDeParser, stringBuilder);
+        expressionDeParser.setSelectVisitor(selectDeParser);
+        parsed.accept(expressionDeParser);
+
+        assertEquals(expression, stringBuilder.toString());
+    }
 }

src/test/java/net/sf/jsqlparser/test/select/SpecialOracleTests.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2014 JSQLParser.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package net.sf.jsqlparser.test.select;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.sf.jsqlparser.JSQLParserException;
+import static net.sf.jsqlparser.test.TestUtils.*;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+
+/**
+ * Tries to parse and deparse all statments in net.sf.jsqlparser.test.oracle-tests.
+ * @author toben
+ */
+public class SpecialOracleTests {
+    
+    private static final File SQLS_DIR = new File("target/test-classes/net/sf/jsqlparser/test/oracle-tests"); 
+    private static final Logger LOG = Logger.getLogger(SpecialOracleTests.class.getName());
+    
+    @Test
+    public void testAllSqls() throws IOException {
+        File[] sqlTestFiles = SQLS_DIR.listFiles();
+        
+        for (File file : sqlTestFiles) {
+            LOG.log(Level.INFO, "testing {0}", file.getName());
+            String sql = FileUtils.readFileToString(file);
+            try {
+                assertSqlCanBeParsedAndDeparsed(sql, true);
+                
+                LOG.info("   -> SUCCESS");
+            } catch (JSQLParserException ex) {
+                LOG.log(Level.SEVERE, null, ex);
+            }
+        }
+    }
+}

src/test/resources/net/sf/jsqlparser/test/oracle-tests/aggregate01.sql

@@ -0,0 +1,72 @@
+with
+	codes2codelocales as
+	(
+		select t6.cdl_name as cod_name, t7.cdl_name as cod_cod_name, t14.cod_oid
+		from servicedesk.itsm_codes t14
+		left outer join servicedesk.itsm_codes_locale t6 on (t6.cdl_cod_oid=t14.cod_oid)
+		left outer join servicedesk.itsm_codes_locale t7 on (t7.cdl_cod_oid=t14.cod_cod_oid)
+	)
+	, incident as
+	(
+		select t1.*,
+		       c2cl1.cod_name as "closure code", c2cl1.cod_cod_name as "closure code parent",
+		       c2cl2.cod_name as "reason caused code", c2cl2.cod_cod_name as "reason caused code parent",
+		       t11.cdl_name "severity", t13.cdl_name "business impact", t16.cdl_name "priority",
+		       t2.rct_name "status", t12.rct_name "category", t99.rct_name "folder"
+		from servicedesk.itsm_incidents t1
+		join servicedesk.itsm_codes_locale t11   on (t1.inc_sev_oid=t11.cdl_cod_oid)
+		join servicedesk.itsm_codes_locale t13   on (t1.inc_imp_oid=t13.cdl_cod_oid)
+		join servicedesk.itsm_codes_locale t16   on (t1.inc_pri_oid=t16.cdl_cod_oid)
+		join servicedeskrepo.rep_codes_text t2   on (t1.inc_sta_oid=t2.rct_rcd_oid)
+		join servicedeskrepo.rep_codes_text t12  on (t1.inc_cat_oid=t12.rct_rcd_oid)
+		join servicedeskrepo.rep_codes_text t99  on (t1.inc_poo_oid=t99.rct_rcd_oid)
+		left outer join codes2codelocales c2cl1  on (t1.inc_clo_oid=c2cl1.cod_oid)
+		left outer join codes2codelocales c2cl2  on (t1.inc_cla_oid=c2cl2.cod_oid) 
+		where t1."reg_created" between sysdate-1 and sysdate
+	)
+	, workgrouphistory as
+	(
+		select i.inc_id
+		, max(t101.hin_subject) keep (dense_rank first order by (t101.reg_created)) as "first"
+		, max(t101.hin_subject) keep (dense_rank last order by (t101.reg_created)) as "last"
+		from
+		servicedesk.itsm_historylines_incident t101
+		join incident i on (t101.hin_inc_oid = i.inc_oid)
+--		from servicedesk.itsm_incidents i (t101.hin_inc_oid = i.inc_oid)
+		where t101.hin_subject like 'to workgroup from%'
+--		and i."reg_created" between sysdate-1 and sysdate		
+		group by i.inc_id
+	)
+select
+  incident.inc_id "id"
+ ,incident."status"
+ ,incident.inc_description "description"
+ ,t4.wog_searchcode "workgroup"
+ ,t5.per_searchcode "person"
+ ,incident.inc_solution "solution"
+ ,incident."closure code"
+ ,incident."closure code parent"
+ ,incident."reason caused code"
+ ,incident."reason caused code parent"
+ ,t10.cit_searchcode "ci"
+ ,incident."severity"
+ ,incident."category"
+ ,incident."business impact"
+ ,incident."priority"
+ ,to_char(incident."reg_created", 'dd-mm-yy hh24:mi:ss') "registered"
+ ,to_char(incident."inc_deadline", 'dd-mm-yy hh24:mi:ss') "deadline"
+ ,to_char(incident."inc_actualfinish", 'dd-mm-yy hh24:mi:ss') "finish"
+ ,t3.icf_incshorttext3 "message group"
+ ,t3.icf_incshorttext4 "application"
+ ,t3.icf_incshorttext2 "msg id"
+ ,incident."folder"
+ ,workgrouphistory."first" "first wg"
+ ,workgrouphistory."last" "last wg"
+ ,t102.hin_subject "frirst pri"
+from incident
+join servicedesk.itsm_inc_custom_fields t3  on (incident.inc_oid=t3.icf_inc_oid)
+join servicedesk.itsm_workgroups t4         on (incident.inc_assign_workgroup=t4.wog_oid)
+join workgrouphistory                       on (incident.inc_id = workgrouphistory.inc_id)
+left outer join servicedesk.itsm_persons t5 on (incident.inc_assign_person_to=t5.per_oid)
+left outer join servicedesk.itsm_configuration_items t10 on (incident.inc_cit_oid=t10.cit_oid)
+left outer join servicedesk.itsm_historylines_incident t102 on (incident.inc_oid = t102.hin_inc_oid and t102.hin_subject like 'priority set to%')

src/test/resources/net/sf/jsqlparser/test/oracle-tests/analytic_query02.sql

@@ -0,0 +1,11 @@
+select time_id, product
+   , last_value(quantity ignore nulls) over (partition by product order by time_id) quantity
+   , last_value(quantity respect nulls) over (partition by product order by time_id) quantity
+   from ( select times.time_id, product, quantity 
+             from inventory partition by  (product) 
+                right outer join times on (times.time_id = inventory.time_id) 
+   where times.time_id between to_date('01/04/01', 'dd/mm/yy') 
+      and to_date('06/04/01', 'dd/mm/yy')) 
+   order by  2,1
+
+

src/test/resources/net/sf/jsqlparser/test/oracle-tests/analytic_query03.sql

@@ -0,0 +1,8 @@
+select times.time_id, product, quantity from inventory 
+   partition by  (product) 
+   right outer join times on (times.time_id = inventory.time_id) 
+   where times.time_id between to_date('01/04/01', 'dd/mm/yy') 
+      and to_date('06/04/01', 'dd/mm/yy') 
+   order by  2,1
+
+

src/test/resources/net/sf/jsqlparser/test/oracle-tests/analytic_query04.sql

@@ -0,0 +1,5 @@
+select deptno
+	, ename
+	, hiredate
+	, listagg(ename, ',') within group (order by hiredate) over (partition by deptno) as employees
+from emp