backported analytic expressions from fork

Author: wumpz

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

@@ -43,6 +43,7 @@ public class AnalyticExpression implements Expression {
     private Expression offset;
     private Expression defaultValue;
 	private boolean allColumns = false;
+    private WindowElement windowElement;
 
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {
@@ -97,6 +98,14 @@ public void setDefaultValue(Expression defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    public WindowElement getWindowElement() {
+        return windowElement;
+    }
+
+    public void setWindowElement(WindowElement windowElement) {
+        this.windowElement = windowElement;
+    }
+
     @Override
 	public String toString() {
 		StringBuilder b = new StringBuilder();
@@ -153,6 +162,11 @@ private void toStringOrderByElements(StringBuilder b) {
 				}
 				b.append(orderByElements.get(i).toString());
 			}
+            
+            if(windowElement != null){
+                b.append(' ');
+                b.append(windowElement);
+            }
 		}
 	}
 }

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

@@ -0,0 +1,73 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2014 JSQLParser
+ * %%
+ * This program 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 program 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 General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+public class WindowElement {
+
+    public enum Type {
+
+        ROWS,
+        RANGE
+    }
+
+    private Type type;
+    private WindowOffset offset;
+    private WindowRange range;
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public WindowOffset getOffset() {
+        return offset;
+    }
+
+    public void setOffset(WindowOffset offset) {
+        this.offset = offset;
+    }
+
+    public WindowRange getRange() {
+        return range;
+    }
+
+    public void setRange(WindowRange range) {
+        this.range = range;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder buffer = new StringBuilder(type.toString());
+
+        if (offset != null) {
+            buffer.append(offset.toString());
+        } else if (range != null) {
+            buffer.append(range.toString());
+        }
+
+        return buffer.toString();
+    }
+
+}

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

@@ -0,0 +1,83 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2014 JSQLParser
+ * %%
+ * This program 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 program 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 General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+public class WindowOffset {
+
+    public enum Type {
+
+        PRECEDING,
+        FOLLOWING,
+        CURRENT,
+        EXPR
+    }
+    
+    private Expression expression;
+    private Type type;
+
+    public Expression getExpression() {
+        return expression;
+    }
+
+    public void setExpression(Expression expression) {
+        this.expression = expression;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder buffer = new StringBuilder();
+        if (expression != null) {
+            buffer.append(' ');
+            buffer.append(expression);
+            if (type != null) {
+                buffer.append(' ');
+                buffer.append(type);
+            }
+            buffer.append(' ');
+        } else {
+            switch (type) {
+                case PRECEDING:
+                    buffer.append(" UNBOUNDED PRECEDING");
+                    break;
+                case FOLLOWING:
+                    buffer.append(" UNBOUNDED FOLLOWING");
+                    break;
+                case CURRENT:
+                    buffer.append(" CURRENT ROW ");
+                    break;
+                default:
+                    break;
+            }
+
+        }
+
+        return buffer.toString();
+    }
+}

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

@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2014 JSQLParser
+ * %%
+ * This program 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 program 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 General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+public class WindowRange {
+
+    private WindowOffset start;
+    private WindowOffset end;
+
+    public WindowOffset getEnd() {
+        return end;
+    }
+
+    public void setEnd(WindowOffset end) {
+        this.end = end;
+    }
+
+    public WindowOffset getStart() {
+        return start;
+    }
+
+    public void setStart(WindowOffset start) {
+        this.start = start;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder buffer = new StringBuilder();
+        buffer.append(" BETWEEN");
+        buffer.append(start);
+        buffer.append(" AND ");
+        buffer.append(end);
+        return buffer.toString();
+    }
+}

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

@@ -187,6 +187,13 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_NULLS: "NULLS">
 |   <K_FIRST: "FIRST">
 |   <K_LAST: "LAST">
+|   <K_ROWS: "ROWS">
+|   <K_RANGE: "RANGE">
+|   <K_UNBOUNDED: "UNBOUNDED"> 
+|   <K_PRECEDING: "PRECEDING">
+|   <K_FOLLOWING: "FOLLOWING">
+|   <K_CURRENT: "CURRENT">
+|   <K_ROW: "ROW"> 
 }
 
 TOKEN : /* Numeric Constants */
@@ -1679,25 +1686,76 @@ AnalyticExpression AnalyticExpression() :
 	Expression expr = null;
 	Expression offset = null;
 	Expression defaultValue = null;
+    WindowElement windowElement = null;
 }
 {
 	token=<S_IDENTIFIER> { retval.setName(token.image); }
 	    "(" [ expr=SimpleExpression() ["," offset=SimpleExpression() ["," defaultValue=SimpleExpression() ]] | "*" { retval.setAllColumns(true); } ] ")" <K_OVER> "("
         [<K_PARTITION> <K_BY> column=Column() {plist.add(column);}  ("," column=Column() {plist.add(column);} )* ]
-        [olist=OrderByElements() ]
+        [olist=OrderByElements() [windowElement = WindowElement() ] ]
+        
 	{
 		retval.setExpression(expr);
 		retval.setOffset(offset);
 		retval.setDefaultValue(defaultValue);
 		retval.setPartitionByColumns(plist);
 		retval.setOrderByElements(olist);
+        retval.setWindowElement(windowElement);
 	}
 	")"
 	{
 		return retval;
 	}
 }
 
+WindowElement WindowElement():
+{
+    WindowElement windowElement = new WindowElement();
+    WindowRange range = new WindowRange();
+    WindowOffset offset = null;
+}
+{
+    (<K_ROWS> { windowElement.setType(WindowElement.Type.ROWS); }  |  <K_RANGE> { windowElement.setType(WindowElement.Type.RANGE); } )
+    ( (
+      <K_BETWEEN> { windowElement.setRange(range); } 
+      offset = WindowOffset() { range.setStart(offset); } 
+      <K_AND> offset = WindowOffset() { range.setEnd(offset); }
+      )
+    | 
+      offset = WindowOffset() { windowElement.setOffset(offset); } 
+    )
+ 
+    {
+        return windowElement;
+    }
+}
+
+WindowOffset WindowOffset():
+{
+    WindowOffset offset = new WindowOffset();
+    Expression expr = null;
+}
+{
+    (
+  
+        <K_UNBOUNDED> (<K_PRECEDING> { offset.setType(WindowOffset.Type.PRECEDING); return offset; } |
+   									 <K_FOLLOWING> { offset.setType(WindowOffset.Type.FOLLOWING); return offset; } )
+    ) 
+    |
+    ( <K_CURRENT> <K_ROW> { offset.setType(WindowOffset.Type.CURRENT); return offset;} ) 
+    |
+    ( expr = SimpleExpression() {
+        offset.setType(WindowOffset.Type.EXPR); 
+        offset.setExpression(expr); 
+        } 
+        (<K_PRECEDING> { offset.setType(WindowOffset.Type.PRECEDING); } | <K_FOLLOWING> { offset.setType(WindowOffset.Type.FOLLOWING);  } )
+    )
+  
+    {
+        return offset;
+    }
+} 
+
 ExtractExpression ExtractExpression() :
 {
 	ExtractExpression retval = new ExtractExpression();

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

@@ -980,7 +980,7 @@ public void testProblemSqlAnalytic7Count() throws JSQLParserException {
     }
 
     public void testProblemSqlAnalytic8Complex() throws JSQLParserException {
-        String stmt = "SELECT ID, NAME, SALARY, SUM(SALARY) OVER () AS SUM_SAL, AVG(SALARY) OVER () AS AVG_SAL, MIN(SALARY) OVER () AS MIN_SAL, MAX(SALARY) OVER () AS MAX_SAL, COUNT(*) OVER () AS ROWS FROM STAFF WHERE ID < 60 ORDER BY ID";
+        String stmt = "SELECT ID, NAME, SALARY, SUM(SALARY) OVER () AS SUM_SAL, AVG(SALARY) OVER () AS AVG_SAL, MIN(SALARY) OVER () AS MIN_SAL, MAX(SALARY) OVER () AS MAX_SAL, COUNT(*) OVER () AS ROWS2 FROM STAFF WHERE ID < 60 ORDER BY ID";
         assertSqlCanBeParsedAndDeparsed(stmt);
     }