subArray support arr[1:3] (#1109)

Author: tvar

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

@@ -15,14 +15,19 @@ public class ArrayExpression extends ASTNodeAccessImpl implements Expression {
 
     private Expression objExpression;
     private Expression indexExpression;
+    private Expression startIndexExpression;
+    private Expression stopIndexExpression;
+
 
     public ArrayExpression() {
         // empty constructor
     }
 
-    public ArrayExpression(Expression objExpression, Expression indexExpression) {
+    public ArrayExpression(Expression objExpression, Expression indexExpression, Expression startIndexExpression, Expression stopIndexExpression) {
         this.objExpression = objExpression;
         this.indexExpression = indexExpression;
+        this.startIndexExpression = startIndexExpression;
+        this.stopIndexExpression = stopIndexExpression;
     }
 
     public Expression getObjExpression() {
@@ -41,14 +46,38 @@ public void setIndexExpression(Expression indexExpression) {
         this.indexExpression = indexExpression;
     }
 
+    public Expression getStartIndexExpression() {
+        return startIndexExpression;
+    }
+
+    public void setStartIndexExpression(Expression startIndexExpression) {
+        this.startIndexExpression = startIndexExpression;
+    }
+
+    public Expression getStopIndexExpression() {
+        return stopIndexExpression;
+    }
+
+    public void setStopIndexExpression(Expression stopIndexExpression) {
+        this.stopIndexExpression = stopIndexExpression;
+    }
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
     }
 
     @Override
     public String toString() {
-        return objExpression.toString() + "[" + indexExpression.toString() + "]";
+        if (indexExpression != null) {
+            return objExpression.toString() + "[" + indexExpression.toString() + "]";
+        } else {
+            return objExpression.toString() + "[" +
+                    (startIndexExpression == null ? "" : startIndexExpression.toString()) +
+                    ":" +
+                    (stopIndexExpression == null ? "" : stopIndexExpression.toString()) +
+                    "]";
+        }
     }
 
     public ArrayExpression withObjExpression(Expression objExpression) {
@@ -61,6 +90,12 @@ public ArrayExpression withIndexExpression(Expression indexExpression) {
         return this;
     }
 
+    public ArrayExpression withRangeExpression(Expression startIndexExpression, Expression stopIndexExpression) {
+        this.setStartIndexExpression(startIndexExpression);
+        this.setStopIndexExpression(stopIndexExpression);
+        return this;
+    }
+
     public <E extends Expression> E getObjExpression(Class<E> type) {
         return type.cast(getObjExpression());
     }

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

@@ -539,7 +539,15 @@ public void visit(SimilarToExpression expr) {
     @Override
     public void visit(ArrayExpression array) {
         array.getObjExpression().accept(this);
-        array.getIndexExpression().accept(this);
+        if (array.getIndexExpression() != null) {
+            array.getIndexExpression().accept(this);
+        }
+        if (array.getStartIndexExpression() != null) {
+            array.getStartIndexExpression().accept(this);
+        }
+        if (array.getStopIndexExpression() != null) {
+            array.getStopIndexExpression().accept(this);
+        }
     }
 
     @Override

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -873,7 +873,15 @@ public void visit(Grant grant) {
     @Override
     public void visit(ArrayExpression array) {
         array.getObjExpression().accept(this);
-        array.getIndexExpression().accept(this);
+        if (array.getStartIndexExpression() != null){
+            array.getIndexExpression().accept(this);
+        }
+        if (array.getStartIndexExpression() != null) {
+            array.getStartIndexExpression().accept(this);
+        }
+        if (array.getStopIndexExpression() != null) {
+            array.getStopIndexExpression().accept(this);
+        }
     }
 
     @Override

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

@@ -894,7 +894,18 @@ public void visit(SimilarToExpression expr) {
     public void visit(ArrayExpression array) {
         array.getObjExpression().accept(this);
         buffer.append("[");
-        array.getIndexExpression().accept(this);
+        if (array.getIndexExpression() != null) {
+            array.getIndexExpression().accept(this);
+        } else {
+            if (array.getStartIndexExpression() != null) {
+                array.getStartIndexExpression().accept(this);
+            }
+            buffer.append(":");
+            if (array.getStopIndexExpression() != null) {
+                array.getStopIndexExpression().accept(this);
+            }
+        }
+
         buffer.append("]");
     }
 

src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java

@@ -530,7 +530,15 @@ public void visit(SimilarToExpression expr) {
     @Override
     public void visit(ArrayExpression array) {
         array.getObjExpression().accept(this);
-        array.getIndexExpression().accept(this);
+        if (array.getIndexExpression() != null) {
+            array.getIndexExpression().accept(this);
+        }
+        if (array.getStartIndexExpression() != null) {
+            array.getStartIndexExpression().accept(this);
+        }
+        if (array.getStopIndexExpression() != null) {
+            array.getStopIndexExpression().accept(this);
+        }
     }
 
     @Override

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

@@ -3271,6 +3271,21 @@ Expression BitwiseXor():
     { return result; }
 }
 
+Expression ArrayExpression(Expression obj): {
+    Expression idxExpr = null;
+    Expression startExpr = null;
+    Expression stopExpr = null;
+} {
+    "["
+        [LOOKAHEAD(3) idxExpr = SimpleExpression()]
+        [
+          (":" { startExpr=idxExpr; idxExpr=null; })
+          [stopExpr = SimpleExpression()]
+        ]
+    "]"
+    { return new ArrayExpression(obj, idxExpr, startExpr, stopExpr); }
+}
+
 Expression PrimaryExpression() #PrimaryExpression:
 {
     Expression retval = null;
@@ -3282,7 +3297,6 @@ Expression PrimaryExpression() #PrimaryExpression:
     boolean not = false;
     boolean exclamationMarkNot = false;
     boolean dateExpressionAllowed = true;
-    Expression idxExpr;
     ExpressionList list;
 }
 {
@@ -3364,7 +3378,7 @@ Expression PrimaryExpression() #PrimaryExpression:
         LOOKAHEAD(2, { dateExpressionAllowed } ) retval = IntervalExpressionWithoutInterval(retval)
     ]
 
-    [ "[" idxExpr = SimpleExpression() "]" { retval = new ArrayExpression(retval, idxExpr); } ]
+    [ retval = ArrayExpression(retval) ]
 
     ( "::" type=ColDataType() {
         castExpr = new CastExpression();

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

@@ -4005,6 +4005,11 @@ public void testArrayIssue378() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("select ta.attname, ia.attnum, ic.relname, n.nspname, tc.relname from pg_catalog.pg_attribute ta, pg_catalog.pg_attribute ia, pg_catalog.pg_class tc, pg_catalog.pg_index i, pg_catalog.pg_namespace n, pg_catalog.pg_class ic where tc.relname = 'business' and n.nspname = 'public' and tc.oid = i.indrelid and n.oid = tc.relnamespace and i.indisprimary = 't' and ia.attrelid = i.indexrelid and ta.attrelid = i.indrelid and ta.attnum = i.indkey[ia.attnum-1] and (not ta.attisdropped) and (not ia.attisdropped) and ic.oid = i.indexrelid order by ia.attnum", true);
     }
 
+    @Test
+    public void testArrayRange() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT (arr[1:3])[1] FROM MYTABLE");
+    }
+
     @Test
     public void testIssue842() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT a.id lendId, "