Merge origin/master

Author: wumpz

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: https://paypal.me/wumpz

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 jdk:
-  - openjdk7
-  - oraclejdk8
+  - openjdk8
+  - openjdk11
 
 after_success:
   - mvn clean cobertura:cobertura coveralls:report

README.md

@@ -5,8 +5,6 @@
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser/badge.svg)](http://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser)
 [![Javadocs](https://www.javadoc.io/badge/com.github.jsqlparser/jsqlparser.svg)](https://www.javadoc.io/doc/com.github.jsqlparser/jsqlparser)
 
-[![PayPal donate button](http://img.shields.io/paypal/donate.png?color=blue)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=64CCN9JJANZXA "Help this JSqlParser version using Paypal")  
-
 [![Gitter](https://badges.gitter.im/JSQLParser/JSqlParser.svg)](https://gitter.im/JSQLParser/JSqlParser?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Code Quality: Java](https://img.shields.io/lgtm/grade/java/g/JSQLParser/JSqlParser.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/JSQLParser/JSqlParser/context:java)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/JSQLParser/JSqlParser.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/JSQLParser/JSqlParser/alerts)
@@ -25,6 +23,7 @@ Please provide feedback on:
 * 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
+* JSqlParser uses now Java 8 at the minimum
 * 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**
@@ -55,15 +54,21 @@ To help JSqlParser's development you are encouraged to provide
 * bugreports
 * pull requests for new features
 * improvement requests
-* fund new features
-* a little donation
+* fund new features or sponsor JSqlParser ([**Sponsor**](https://www.paypal.me/wumpz))
 
 **Please write in English, since it's the language most of the dev team knows.**
 
 Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 2.2
 
+* allow empty double quotes
+* allow **year**, **month** ... as column data type for **create table**
+* allow **duplicate** as object name
+* make it JDK 11 buildable
+* switched to minimum JDK 8 
+* avoid buffer copy of input data if a normal String input is used
+* allow **limit** and **offset** as keywords in specific places
 * DIV operator
 * improved performance for SQLCondition production
 * support for full text search (MATCH..AGAINST)

pom.xml

@@ -28,7 +28,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
+            <version>2.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.16.0</version>
+            <version>2.28.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -87,8 +87,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <showWarnings>true</showWarnings>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
@@ -110,7 +110,7 @@
                     <dependency>
                         <groupId>net.java.dev.javacc</groupId>
                         <artifactId>javacc</artifactId>
-                        <version>7.0.3</version>
+                        <version>7.0.4</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -353,7 +353,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>2.17</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>verify-style</id>
@@ -366,7 +366,7 @@
                         <configuration>
                             <logViolationsToConsole>true</logViolationsToConsole>
                             <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                            <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
                             <checkstyleRules>
                                 <module name="Checker">
                                     <module name="SuppressWarningsFilter" />
@@ -405,7 +405,7 @@
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>
                                 <artifactId>checkstyle</artifactId>
-                                <version>6.19</version>
+                                <version>8.22</version>
                             </dependency>
                         </dependencies>
                     </plugin>

src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java

@@ -33,6 +33,7 @@ public class SimpleCharStream {
     protected boolean prevCharIsLF = false;
 
     protected Provider inputStream;
+    private boolean isStringProvider;
 
     protected char[] buffer;
     protected int maxNextCharInd = 0;
@@ -88,7 +89,7 @@ protected void ExpandBuff(boolean wrapAround) {
                 maxNextCharInd = bufpos -= tokenBegin;
             }
         } catch (Throwable t) {
-            throw new Error(t.getMessage());
+            throw new RuntimeException(t.getMessage());
         }
 
         bufsize += 2048;
@@ -97,7 +98,7 @@ protected void ExpandBuff(boolean wrapAround) {
     }
 
     protected void FillBuff() throws java.io.IOException {
-        if (maxNextCharInd == available) {
+        if (!isStringProvider && maxNextCharInd == available) {
             if (available == bufsize) {
                 if (tokenBegin > 2048) {
                     bufpos = maxNextCharInd = 0;
@@ -118,11 +119,19 @@ protected void FillBuff() throws java.io.IOException {
 
         int i;
         try {
-            if ((i = inputStream.read(buffer, maxNextCharInd, available - maxNextCharInd)) == -1) {
-                inputStream.close();
-                throw new java.io.IOException();
+            if (inputStream instanceof StringProvider) {
+                i = ((StringProvider) inputStream)._string.length();
+                if (maxNextCharInd == i) {
+                    throw new java.io.IOException();
+                }
+                maxNextCharInd = i;
             } else {
-                maxNextCharInd += i;
+                if ((i = inputStream.read(buffer, maxNextCharInd, available - maxNextCharInd)) == -1) {
+                    inputStream.close();
+                    throw new java.io.IOException();
+                } else {
+                    maxNextCharInd += i;
+                }
             }
             return;
         } catch (java.io.IOException e) {
@@ -180,6 +189,14 @@ protected void UpdateLineColumn(char c) {
         bufcolumn[bufpos] = column;
     }
 
+    private char readChar(int pos) {
+        if (this.inputStream instanceof StringProvider) {
+            return ((StringProvider) inputStream)._string.charAt(pos);
+        } else {
+            return buffer[pos];
+        }
+    }
+
     /**
      * Read a character.
      */
@@ -192,7 +209,7 @@ public char readChar() throws java.io.IOException {
             }
 
             totalCharsRead++;
-            return buffer[bufpos];
+            return readChar(bufpos);
         }
 
         if (++bufpos >= maxNextCharInd) {
@@ -201,7 +218,7 @@ public char readChar() throws java.io.IOException {
 
         totalCharsRead++;
 
-        char c = buffer[bufpos];
+        char c = readChar(bufpos);
 
         UpdateLineColumn(c);
         return c;
@@ -271,13 +288,21 @@ public void backup(int amount) {
     public SimpleCharStream(Provider dstream, int startline,
             int startcolumn, int buffersize) {
         inputStream = dstream;
+        isStringProvider = dstream instanceof StringProvider;
         line = startline;
         column = startcolumn - 1;
 
-        available = bufsize = buffersize;
-        buffer = new char[buffersize];
-        bufline = new int[buffersize];
-        bufcolumn = new int[buffersize];
+        if (isStringProvider) {
+            int bs = ((StringProvider) inputStream)._string.length();
+            available = bufsize = bs;
+            bufline = new int[bs];
+            bufcolumn = new int[bs];
+        } else {
+            available = bufsize = buffersize;
+            buffer = new char[buffersize];
+            bufline = new int[buffersize];
+            bufcolumn = new int[buffersize];
+        }
     }
 
     /**
@@ -301,14 +326,21 @@ public SimpleCharStream(Provider dstream) {
     public void ReInit(Provider dstream, int startline,
             int startcolumn, int buffersize) {
         inputStream = dstream;
+        isStringProvider = dstream instanceof StringProvider;
         line = startline;
         column = startcolumn - 1;
-
-        if (buffer == null || buffersize != buffer.length) {
-            available = bufsize = buffersize;
-            buffer = new char[buffersize];
-            bufline = new int[buffersize];
-            bufcolumn = new int[buffersize];
+        if (isStringProvider) {
+            int bs = ((StringProvider) inputStream)._string.length();
+            available = bufsize = bs;
+            bufline = new int[bs];
+            bufcolumn = new int[bs];
+        } else {
+            if (buffer == null || buffersize != buffer.length) {
+                available = bufsize = buffersize;
+                buffer = new char[buffersize];
+                bufline = new int[buffersize];
+                bufcolumn = new int[buffersize];
+            }
         }
         prevCharIsLF = prevCharIsCR = false;
         tokenBegin = inBuf = maxNextCharInd = 0;
@@ -334,18 +366,29 @@ public void ReInit(Provider dstream) {
      * Get token literal value.
      */
     public String GetImage() {
-        if (bufpos >= tokenBegin) {
-            return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+        if (isStringProvider) {
+            String data = ((StringProvider) inputStream)._string;
+            if (bufpos >= tokenBegin) {
+                return data.substring(tokenBegin, bufpos + 1);
+            } else {
+                return data.substring(tokenBegin, bufsize)
+                        + data.substring(0, bufpos + 1);
+            }
         } else {
-            return new String(buffer, tokenBegin, bufsize - tokenBegin)
-                    + new String(buffer, 0, bufpos + 1);
+            if (bufpos >= tokenBegin) {
+                return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+            } else {
+                return new String(buffer, tokenBegin, bufsize - tokenBegin)
+                        + new String(buffer, 0, bufpos + 1);
+            }
         }
     }
 
     /**
      * Get the suffix.
      */
     public char[] GetSuffix(int len) {
+
         char[] ret = new char[len];
 
         if ((bufpos + 1) >= len) {
@@ -385,7 +428,7 @@ public void adjustBeginLineColumn(int newLine, int newCol) {
         int i = 0;
         int j = 0;
         int k = 0;
-        int nextColDiff = 0; 
+        int nextColDiff = 0;
         int columnDiff = 0;
 
         while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize]) {

src/main/java/net/sf/jsqlparser/parser/StatementListener.java

@@ -7,24 +7,6 @@
  * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
  * #L%
  */
-/*
- * Copyright (C) 2019 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.parser;
 
 import net.sf.jsqlparser.statement.Statement;