Merge origin/master

Author: wumpz

README.md

@@ -19,9 +19,13 @@ JSqlParser is dual licensed under **LGPL V2.1** or **Apache Software License, Ve
 
 ## Discussion
 
-Please provide feedback on https://github.com/JSQLParser/JSqlParser/issues/677, about removing bracket identifier quotation to support array processing.
+Please provide feedback on:
+
+* https://github.com/JSQLParser/JSqlParser/issues/677, about removing bracket identifier quotation to support array processing.
+* Is there any need for a Java 7 JSqlParser build, or can we move on to at least Java 8? (https://github.com/JSQLParser/JSqlParser/issues/814)
 
 ## News
+* Released version **2.1** of JSqlParser
 * Released version **2.0** of JSqlParser
 * breaking **API** change: to support chained functions attribute type was changed to **Expression**
 * Released version **1.4** of JSqlParser
@@ -58,12 +62,7 @@ To help JSqlParser's development you are encouraged to provide
 
 Also I would like to know about needed examples or documentation stuff.
 
-## Extensions in the latest SNAPSHOT version 2.1
-
-* support for **similar to** statement
-* support for **show** statment (API - change)
-* introduces Statement streaming support by **CCJSqlParserUtil.streamStatements**
-* improved nested bracket parsing performance by a large scale
+## Extensions in the latest SNAPSHOT version 2.2
 
 ## Extensions of JSqlParser releases
 

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.jsqlparser</groupId>
     <artifactId>jsqlparser</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
     <name>JSQLParser library</name>
     <inceptionYear>2004</inceptionYear>
     <organization>

src/main/java/net/sf/jsqlparser/schema/Table.java

@@ -64,7 +64,9 @@ public Database getDatabase() {
 
     public void setDatabase(Database database) {
         setIndex(DATABASE_IDX, database.getDatabaseName());
-        setIndex(SERVER_IDX, database.getServer().getFullyQualifiedName());
+        if (database.getServer() != null) {
+            setIndex(SERVER_IDX, database.getServer().getFullyQualifiedName());
+        }
     }
 
     public String getSchemaName() {
@@ -113,7 +115,7 @@ private String getIndex(int idx) {
     public String getFullyQualifiedName() {
         StringBuilder fqn = new StringBuilder();
 
-        for (int i = partItems.size()-1 ; i >=0; i--) {
+        for (int i = partItems.size() - 1; i >= 0; i--) {
             String part = partItems.get(i);
             if (part == null) {
                 part = "";
@@ -162,4 +164,3 @@ public String toString() {
                 + ((hint != null) ? hint.toString() : "");
     }
 }
-

src/main/java/net/sf/jsqlparser/statement/select/KSQLWindow.java

@@ -0,0 +1,133 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement.select;
+
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class KSQLWindow extends ASTNodeAccessImpl {
+
+    public enum TimeUnit {
+        DAY ("DAY"),
+        HOUR ("HOUR"),
+        MINUTE ("MINUTE"),
+        SECOND ("SECOND"),
+        MILLISECOND ("MILLISECOND"),
+        DAYS ("DAYS"),
+        HOURS ("HOURS"),
+        MINUTES ("MINUTES"),
+        SECONDS ("SECONDS"),
+        MILLISECONDS ("MILLISECONDS");
+
+        private String timeUnit;
+
+        TimeUnit(String timeUnit) {
+            this.timeUnit = timeUnit;
+        }
+
+        public String getTimeUnit() {
+            return timeUnit;
+        }
+    }
+
+    public enum WindowType {
+        HOPPING ("HOPPING"),
+        SESSION ("SESSION"),
+        TUMBLING ("TUMBLING");
+
+        private String windowType;
+
+        WindowType(String windowType) {
+            this.windowType = windowType;
+        }
+
+        public String getWindowType() {
+            return windowType;
+        }
+    }
+
+    private boolean hopping;
+    private boolean tumbling;
+    private boolean session;
+    private long sizeDuration;
+    private TimeUnit sizeTimeUnit;
+    private long advanceDuration;
+    private TimeUnit advanceTimeUnit;
+
+    public boolean isHoppingWindow() {
+        return hopping;
+    }
+
+    public void setHoppingWindow(boolean hopping) {
+        this.hopping = hopping;
+    }
+
+    public boolean isTumblingWindow() {
+        return tumbling;
+    }
+
+    public void setTumblingWindow(boolean tumbling) {
+        this.tumbling = tumbling;
+    }
+
+    public boolean isSessionWindow() {
+        return session;
+    }
+
+    public void setSessionWindow(boolean session) {
+        this.session = session;
+    }
+
+    public long getSizeDuration() {
+        return sizeDuration;
+    }
+
+    public void setSizeDuration(long sizeDuration) {
+        this.sizeDuration = sizeDuration;
+    }
+
+    public TimeUnit getSizeTimeUnit() {
+        return sizeTimeUnit;
+    }
+
+    public void setSizeTimeUnit(TimeUnit sizeTimeUnit) {
+        this.sizeTimeUnit = sizeTimeUnit;
+    }
+
+    public long getAdvanceDuration() {
+        return advanceDuration;
+    }
+
+    public void setAdvanceDuration(long advanceDuration) {
+        this.advanceDuration = advanceDuration;
+    }
+
+    public TimeUnit getAdvanceTimeUnit() {
+        return advanceTimeUnit;
+    }
+
+    public void setAdvanceTimeUnit(TimeUnit advanceTimeUnit) {
+        this.advanceTimeUnit = advanceTimeUnit;
+    }
+
+    public KSQLWindow() {
+    }
+
+    @Override
+    public String toString() {
+        if (isHoppingWindow()) {
+            return "HOPPING (" + "SIZE " + sizeDuration + " " + sizeTimeUnit + ", " +
+                    "ADVANCE BY " + advanceDuration + " " + advanceTimeUnit + ")";
+        } else if (isSessionWindow()) {
+            return "SESSION (" + sizeDuration + " " + sizeTimeUnit + ")";
+        } else {
+            return "TUMBLING (" + "SIZE " + sizeDuration + " " + sizeTimeUnit + ")";
+        }
+    }
+}

src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java

@@ -47,6 +47,7 @@ public class PlainSelect extends ASTNodeAccessImpl implements SelectBody {
     private boolean mySqlSqlCalcFoundRows = false;
     private boolean sqlNoCacheFlag = false;
     private String forXmlPath;
+    private KSQLWindow ksqlWindow = null;
 
     public boolean isUseBrackets() {
         return useBrackets;
@@ -280,6 +281,14 @@ public void setForXmlPath(String forXmlPath) {
         this.forXmlPath = forXmlPath;
     }
 
+    public KSQLWindow getKsqlWindow() {
+        return ksqlWindow;
+    }
+
+    public void setKsqlWindow(KSQLWindow ksqlWindow) {
+        this.ksqlWindow = ksqlWindow;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder();
@@ -337,6 +346,10 @@ public String toString() {
                     }
                 }
             }
+
+            if (ksqlWindow != null) {
+                sql.append(" WINDOW ").append(ksqlWindow.toString());
+            }
             if (where != null) {
                 sql.append(" WHERE ").append(where);
             }

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

@@ -114,6 +114,11 @@ public void visit(PlainSelect plainSelect) {
             }
         }
 
+        if (plainSelect.getKsqlWindow() != null) {
+            buffer.append(" WINDOW ");
+            buffer.append(plainSelect.getKsqlWindow().toString());
+        }
+
         if (plainSelect.getWhere() != null) {
             buffer.append(" WHERE ");
             plainSelect.getWhere().accept(expressionVisitor);

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

@@ -106,6 +106,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 {
     <K_ACTION: "ACTION">
 |   <K_ADD:"ADD">
+|   <K_ADVANCE:"ADVANCE">
 |   <K_ALGORITHM: "ALGORITHM">
 |   <K_ALL:"ALL">
 |   <K_ALTER:"ALTER">
@@ -177,6 +178,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_GROUP_CONCAT:"GROUP_CONCAT">
 |   <K_HAVING:"HAVING">
 |   <K_HIGH_PRIORITY : "HIGH_PRIORITY">
+|   <K_HOPPING:"HOPPING">
 |   <K_IF:"IF">
 |   <K_IIF:"IIF">
 |   <K_IGNORE : "IGNORE">
@@ -248,11 +250,13 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_SELECT: ("SELECT" | "SEL")>
 |   <K_SEMI : "SEMI">
 |   <K_SEPARATOR:"SEPARATOR">
+|   <K_SESSION:"SESSION">
 |   <K_SET:"SET">
 |   <K_SETS:"SETS">
 |   <K_SHOW : "SHOW">
 |   <K_SIBLINGS:"SIBLINGS">
 |   <K_SIMILAR:"SIMILAR">
+|   <K_SIZE:"SIZE">
 |   <K_SKIP: "SKIP">
 |   <K_SOME:"SOME">
 |   <K_START:"START">
@@ -266,6 +270,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_TOP:"TOP">
 |   <K_TRAILING:"TRAILING">
 |   <K_TRUNCATE:"TRUNCATE">
+|   <K_TUMBLING:"TUMBLING">
 |   <K_TYPE:"TYPE">
 |   <K_UNBOUNDED: "UNBOUNDED"> 
 |   <K_UNION:"UNION">
@@ -287,6 +292,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_WAIT : "WAIT">
 |   <K_WHEN:"WHEN">
 |   <K_WHERE:"WHERE">
+|   <K_WINDOW:"WINDOW">
 |   <K_WITH:"WITH">
 |   <K_WITHIN:"WITHIN">
 |   <K_WITHOUT:"WITHOUT">
@@ -1186,6 +1192,7 @@ PlainSelect PlainSelect() #PlainSelect:
     Wait wait = null;
     boolean mySqlSqlCalcFoundRows = false;
     Token token;
+    KSQLWindow ksqlWindow=null;
 }
 {
     <K_SELECT>
@@ -1226,6 +1233,7 @@ PlainSelect PlainSelect() #PlainSelect:
       fromItem=FromItem()
       joins=JoinsList() ]
 
+    [ ksqlWindow=KSQLWindowClause() { plainSelect.setKsqlWindow(ksqlWindow); } ]
     [ where=WhereClause() { plainSelect.setWhere(where); }]
     [ oracleHierarchicalQueryClause=OracleHierarchicalQueryClause() { plainSelect.setOracleHierarchical(oracleHierarchicalQueryClause); } ]
     [ groupBy=GroupByColumnReferences() { plainSelect.setGroupByElement(groupBy); }]
@@ -1779,6 +1787,49 @@ KSQLJoinWindow JoinWindow():
     })
 }
 
+KSQLWindow KSQLWindowClause():
+{
+    KSQLWindow retval = null;
+    Token sizeDurationToken = null;
+    Token sizeTimeUnitToken = null;
+    Token advanceDurationToken = null;
+    Token advanceTimeUnitToken = null;
+}
+{
+    <K_WINDOW>
+    {
+        retval=new KSQLWindow();
+        retval.setHoppingWindow(false);
+        retval.setSessionWindow(false);
+        retval.setTumblingWindow(false);
+    }
+    (
+        <K_HOPPING> "("
+            <K_SIZE> sizeDurationToken=<S_LONG> sizeTimeUnitToken=<S_IDENTIFIER> ","
+            <K_ADVANCE> <K_BY> advanceDurationToken=<S_LONG> advanceTimeUnitToken=<S_IDENTIFIER> ")"
+        {
+            retval.setHoppingWindow(true);
+        } |
+        <K_SESSION> "(" sizeDurationToken=<S_LONG> sizeTimeUnitToken=<S_IDENTIFIER> ")"
+        {
+            retval.setSessionWindow(true);
+        } |
+        <K_TUMBLING> "(" <K_SIZE> sizeDurationToken=<S_LONG> sizeTimeUnitToken=<S_IDENTIFIER> ")"
+        {
+            retval.setTumblingWindow(true);
+        }
+    )
+    {
+            retval.setSizeDuration(Long.parseLong(sizeDurationToken.image));
+            retval.setSizeTimeUnit(KSQLWindow.TimeUnit.valueOf(sizeTimeUnitToken.image));
+            if (advanceDurationToken != null) {
+                retval.setAdvanceDuration(Long.parseLong(advanceDurationToken.image));
+                retval.setAdvanceTimeUnit(KSQLWindow.TimeUnit.valueOf(advanceTimeUnitToken.image));
+            }
+            return retval;
+    }
+}
+
 Expression WhereClause():
 {
     Expression retval = null;