fixes #869

Author: wumpz

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

@@ -36,6 +36,7 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private boolean distinct = false;
     private boolean ignoreNulls = false;
     private Expression filterExpression = null;
+    private WindowElement windowElement = null;
 
     public AnalyticExpression() {
     }
@@ -83,8 +84,6 @@ public KeepExpression getKeep() {
     public void setKeep(KeepExpression keep) {
         this.keep = keep;
     }
-    
-    
 
     public ExpressionList getPartitionExpressionList() {
         return partitionBy.getPartitionExpressionList();
@@ -93,10 +92,11 @@ public ExpressionList getPartitionExpressionList() {
     public void setPartitionExpressionList(ExpressionList partitionExpressionList) {
         setPartitionExpressionList(partitionExpressionList, false);
     }
+
     public void setPartitionExpressionList(ExpressionList partitionExpressionList, boolean brackets) {
         partitionBy.setPartitionExpressionList(partitionExpressionList, brackets);
     }
-    
+
     public boolean isPartitionByBrackets() {
         return partitionBy.isBrackets();
     }
@@ -134,11 +134,11 @@ public void setDefaultValue(Expression defaultValue) {
     }
 
     public WindowElement getWindowElement() {
-        return orderBy.getWindowElement();
+        return windowElement;
     }
 
     public void setWindowElement(WindowElement windowElement) {
-        orderBy.setWindowElement(windowElement);
+        this.windowElement = windowElement;
     }
 
     public AnalyticType getType() {
@@ -197,7 +197,7 @@ public String toString() {
             b.append(filterExpression.toString());
             b.append(") ");
         }
-        
+
         switch (type) {
             case WITHIN_GROUP:
                 b.append("WITHIN GROUP");
@@ -210,6 +210,13 @@ public String toString() {
         partitionBy.toStringPartitionBy(b);
         orderBy.toStringOrderByElements(b);
 
+        if (windowElement != null) {
+            if (orderBy != null && orderBy.getOrderByElements()!=null) {
+                b.append(' ');
+            }
+            b.append(windowElement);
+        }
+
         b.append(")");
 
         return b.toString();

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

@@ -15,7 +15,6 @@
 
 public class OrderByClause {
     private List<OrderByElement> orderByElements;
-    private WindowElement windowElement;
 
     public List<OrderByElement> getOrderByElements() {
         return orderByElements;
@@ -25,14 +24,6 @@ public void setOrderByElements(List<OrderByElement> orderByElements) {
         this.orderByElements = orderByElements;
     }
 
-    public WindowElement getWindowElement() {
-        return windowElement;
-    }
-
-    public void setWindowElement(WindowElement windowElement) {
-        this.windowElement = windowElement;
-    }
-
     void toStringOrderByElements(StringBuilder b) {
         if (orderByElements != null && !orderByElements.isEmpty()) {
             b.append("ORDER BY ");
@@ -42,11 +33,6 @@ void toStringOrderByElements(StringBuilder b) {
                 }
                 b.append(orderByElements.get(i).toString());
             }
-
-            if (windowElement != null) {
-                b.append(' ');
-                b.append(windowElement);
-            }
         }
     }
 }

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -642,7 +642,7 @@ public void visit(AnalyticExpression aexpr) {
             keep.accept(this);
             buffer.append(" ");
         }
-        
+
         if (aexpr.getFilterExpression() != null) {
             buffer.append("FILTER (WHERE ");
             aexpr.getFilterExpression().accept(this);
@@ -685,11 +685,13 @@ public void visit(AnalyticExpression aexpr) {
                 }
                 orderByDeParser.deParseElement(orderByElements.get(i));
             }
+        }
 
-            if (windowElement != null) {
+        if (windowElement != null) {
+            if (orderByElements != null && !orderByElements.isEmpty()) {
                 buffer.append(' ');
-                buffer.append(windowElement);
             }
+            buffer.append(windowElement);
         }
 
         buffer.append(")");

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -3129,7 +3129,8 @@ AnalyticExpression AnalyticExpression(Function function) :
         [<K_PARTITION> <K_BY> 
             (LOOKAHEAD(3) expressionList=SimpleExpressionList() | "(" {partitionByBrackets = true;} expressionList=SimpleExpressionList() ")" ) 
         ]
-        [olist=OrderByElements() [windowElement = WindowElement() ] ]
+        [olist=OrderByElements() ]
+        [windowElement = WindowElement() ]
 
     {
         retval.setPartitionExpressionList(expressionList, partitionByBrackets);

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

@@ -3897,4 +3897,9 @@ public void testWithAsRecursiveIssue874() throws JSQLParserException {
     public void testSessionKeywordIssue876() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT ID_COMPANY FROM SESSION.COMPANY");
     }
+    
+    @Test
+    public void testWindowClauseWithoutOrderByIssue869() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT subject_id, student_id, mark, sum(mark) OVER (PARTITION BY (subject_id) ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM marks");
+    }
 }