fixes #648

fixes #638

Author: wumpz

README.md

@@ -23,6 +23,8 @@ 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
+* The array parsing is the default behaviour. Square bracket quotation has to be enabled using 
+  a parser flag (**CCJSqlParser.withSquareBracketQuotation**).
 * due to an API change the version will be 3.0
 * JSqlParser uses now Java 8 at the minimum
 * Released version **2.1** of JSqlParser
@@ -63,6 +65,8 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 3.0
 
+* support for array constructs using square brackets. This collides with square bracket 
+  quotation of SqlServer. The parser has now a flag to enable this quotation again (**CCJSqlParser.withSquareBracketQuotation**).
 * support for **update table1 inner join table2 ...** (API change)
 * support for **declare** statement
 * allow empty double quotes

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

@@ -11,6 +11,7 @@
 
 import java.io.InputStream;
 import java.io.Reader;
+import java.util.function.Consumer;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.statement.Statement;
@@ -36,7 +37,14 @@ public static Statement parse(Reader statementReader) throws JSQLParserException
     }
 
     public static Statement parse(String sql) throws JSQLParserException {
+        return parse(sql, null);
+    }
+
+    public static Statement parse(String sql, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
         CCJSqlParser parser = new CCJSqlParser(new StringProvider(sql));
+        if (consumer != null) {
+            consumer.accept(parser);
+        }
         try {
             return parser.Statement();
         } catch (Exception ex) {
@@ -96,7 +104,8 @@ public static Expression parseCondExpression(String condExpr) throws JSQLParserE
     }
 
     /**
-     * Parse an conditional expression. This is the expression after a where clause.
+     * Parse an conditional expression. This is the expression after a where
+     * clause.
      *
      * @param condExpr
      * @param allowPartialParse false: needs the whole string to be processed.

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

@@ -812,6 +812,8 @@ public void visit(SimilarToExpression expr) {
     @Override
     public void visit(ArrayExpression array) {
         array.getObjExpression().accept(this);
+        buffer.append("[");
         array.getIndexExpression().accept(this);
+        buffer.append("]");
     }
 }

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

@@ -88,7 +88,7 @@ public class CCJSqlParser {
 PARSER_END(CCJSqlParser)
 
 TOKEN_MGR_DECLS : {
-    public boolean allowSquareBracketQuotation = true;
+    public boolean allowSquareBracketQuotation = false;
 
     public void CommonTokenAction(Token t)
 	{
@@ -2848,7 +2848,7 @@ Expression PrimaryExpression() #PrimaryExpression:
     ColDataType type = null;
     boolean not = false;
     boolean exclamationMarkNot = false;
-    boolean dateExpressionAllowed = true
+    boolean dateExpressionAllowed = true;
     Expression idxExpr;
 }
 {

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

@@ -48,25 +48,23 @@ public void setup() {
     @Test
     public void testMultiPartTableNameWithServerNameAndDatabaseNameAndSchemaName() throws Exception {
         final String statement = "SELECT columnName FROM [server-name\\server-instance].databaseName.schemaName.tableName";
-        Select select = (Select) parserManager.parse(new StringReader(statement));
-
-        assertStatementCanBeDeparsedAs(select, statement);
+        assertSqlCanBeParsedAndDeparsed(statement, false, 
+                parser -> parser.withSquareBracketQuotation(true));
     }
 
     @Test
     public void testMultiPartTableNameWithServerNameAndDatabaseName() throws Exception {
         final String statement = "SELECT columnName FROM [server-name\\server-instance].databaseName..tableName";
-        Select select = (Select) parserManager.parse(new StringReader(statement));
 
-        assertStatementCanBeDeparsedAs(select, statement);
+        assertSqlCanBeParsedAndDeparsed(statement, false, 
+                parser -> parser.withSquareBracketQuotation(true));
     }
 
     @Test
     public void testMultiPartTableNameWithServerNameAndSchemaName() throws Exception {
         final String statement = "SELECT columnName FROM [server-name\\server-instance]..schemaName.tableName";
-        Select select = (Select) parserManager.parse(new StringReader(statement));
-
-        assertStatementCanBeDeparsedAs(select, statement);
+        assertSqlCanBeParsedAndDeparsed(statement, false, 
+                parser -> parser.withSquareBracketQuotation(true));
     }
 
     @Test
@@ -78,9 +76,8 @@ public void testMultiPartTableNameWithServerProblem() throws Exception {
     @Test
     public void testMultiPartTableNameWithServerName() throws Exception {
         final String statement = "SELECT columnName FROM [server-name\\server-instance]...tableName";
-        Select select = (Select) parserManager.parse(new StringReader(statement));
-
-        assertStatementCanBeDeparsedAs(select, statement);
+        assertSqlCanBeParsedAndDeparsed(statement, false, 
+                parser -> parser.withSquareBracketQuotation(true));
     }
 
     @Test
@@ -1679,13 +1676,15 @@ public void testCaseElseAddition() throws JSQLParserException {
     @Test
     public void testBrackets() throws JSQLParserException {
         String stmt = "SELECT table_a.name AS [Test] FROM table_a";
-        assertSqlCanBeParsedAndDeparsed(stmt);
+        assertSqlCanBeParsedAndDeparsed(stmt, false, 
+                parser -> parser.withSquareBracketQuotation(true));
     }
 
     @Test
     public void testBrackets2() throws JSQLParserException {
         String stmt = "SELECT [a] FROM t";
-        assertSqlCanBeParsedAndDeparsed(stmt);
+        assertSqlCanBeParsedAndDeparsed(stmt, false, 
+                parser -> parser.withSquareBracketQuotation(true));
     }
 
     @Test
@@ -3754,4 +3753,9 @@ public void testInnerWithBlock() throws JSQLParserException {
     public void testArrayIssue648() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("select * from a join b on a.id = b.id[1]", true);
     }
+    
+    @Test
+    public void testArrayIssue638() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT PAYLOAD[0] FROM MYTABLE");
+    }
 }

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

@@ -9,10 +9,12 @@
  */
 package net.sf.jsqlparser.test;
 
+import java.util.function.Consumer;
 import java.util.regex.Pattern;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.OracleHint;
+import net.sf.jsqlparser.parser.CCJSqlParser;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -43,12 +45,16 @@ public static void assertSqlCanBeParsedAndDeparsed(String statement) throws JSQL
      * Tries to parse and deparse the given statement.
      *
      * @param statement
-     * @param laxDeparsingCheck removes all linefeeds from the original and removes all double
-     * spaces. The check is caseinsensitive.
+     * @param laxDeparsingCheck removes all linefeeds from the original and
+     * removes all double spaces. The check is caseinsensitive.
      * @throws JSQLParserException
      */
     public static void assertSqlCanBeParsedAndDeparsed(String statement, boolean laxDeparsingCheck) throws JSQLParserException {
-        Statement parsed = CCJSqlParserUtil.parse(statement);
+        assertSqlCanBeParsedAndDeparsed(statement, laxDeparsingCheck, null);
+    }
+
+    public static void assertSqlCanBeParsedAndDeparsed(String statement, boolean laxDeparsingCheck, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
+        Statement parsed = CCJSqlParserUtil.parse(statement, consumer);
         assertStatementCanBeDeparsedAs(parsed, statement, laxDeparsingCheck);
     }