Author: wumpz

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 externalBuffer;
 
     protected char[] buffer;
     protected int maxNextCharInd = 0;
@@ -97,7 +98,7 @@ protected void ExpandBuff(boolean wrapAround) {
     }
 
     protected void FillBuff() throws java.io.IOException {
-        if (maxNextCharInd == available) {
+        if (!externalBuffer && maxNextCharInd == available) {
             if (available == bufsize) {
                 if (tokenBegin > 2048) {
                     bufpos = maxNextCharInd = 0;
@@ -287,13 +288,21 @@ public void backup(int amount) {
     public SimpleCharStream(Provider dstream, int startline,
             int startcolumn, int buffersize) {
         inputStream = dstream;
+        externalBuffer = dstream instanceof StringProvider;
         line = startline;
         column = startcolumn - 1;
 
-        available = bufsize = buffersize;
-        buffer = new char[buffersize];
-        bufline = new int[buffersize];
-        bufcolumn = new int[buffersize];
+        if (externalBuffer) {
+            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];
+        }
     }
 
     /**
@@ -317,14 +326,21 @@ public SimpleCharStream(Provider dstream) {
     public void ReInit(Provider dstream, int startline,
             int startcolumn, int buffersize) {
         inputStream = dstream;
+        externalBuffer = 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 (externalBuffer) {
+            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;
@@ -350,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 (externalBuffer) {
+            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) {

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

@@ -9,7 +9,6 @@
  */
 package net.sf.jsqlparser.test;
 
-import java.io.StringReader;
 import java.util.regex.Pattern;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
@@ -49,7 +48,7 @@ public static void assertSqlCanBeParsedAndDeparsed(String statement) throws JSQL
      * @throws JSQLParserException
      */
     public static void assertSqlCanBeParsedAndDeparsed(String statement, boolean laxDeparsingCheck) throws JSQLParserException {
-        Statement parsed = CCJSqlParserUtil.parse(new StringReader(statement));
+        Statement parsed = CCJSqlParserUtil.parse(statement);
         assertStatementCanBeDeparsedAs(parsed, statement, laxDeparsingCheck);
     }