feat: add Order Suffixes to AggregatePipeOperator and support some weird BigQuery Syntax

- Order Suffixes for the `AggregatePipeOperator`
- `ArrayConstructor` with data type, e.g. `ARRAY<type>[]`
- `SetOperation` with `BY NAME` or `STRICT CORRESPONDING`
- fixes starlake-ai/jsqltranspiler#74

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

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

@@ -11,10 +11,12 @@
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+import net.sf.jsqlparser.statement.create.table.ColDataType;
 
 public class ArrayConstructor extends ASTNodeAccessImpl implements Expression {
     private ExpressionList<?> expressions;
     private boolean arrayKeyword;
+    private ColDataType dataType;
 
     public ArrayConstructor(ExpressionList<?> expressions, boolean arrayKeyword) {
         this.expressions = expressions;
@@ -41,6 +43,15 @@ public void setArrayKeyword(boolean arrayKeyword) {
         this.arrayKeyword = arrayKeyword;
     }
 
+    public ColDataType getDataType() {
+        return dataType;
+    }
+
+    public ArrayConstructor setDataType(ColDataType dataType) {
+        this.dataType = dataType;
+        return this;
+    }
+
     @Override
     public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
         return expressionVisitor.visit(this, context);
@@ -51,6 +62,10 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         if (arrayKeyword) {
             sb.append("ARRAY");
+
+            if (dataType != null) {
+                sb.append("<").append(dataType).append(">");
+            }
         }
         sb.append("[");
         sb.append(expressions.toString());

src/main/java/net/sf/jsqlparser/statement/piped/AggregatePipeOperator.java

@@ -6,11 +6,15 @@
 
 public class AggregatePipeOperator extends PipeOperator {
     private final ArrayList<SelectItem<?>> selectItems = new ArrayList<>();
+    private final ArrayList<String> selectItemsOrderSuffices = new ArrayList<>();
+
     private final ArrayList<SelectItem<?>> groupItems = new ArrayList<>();
+    private final ArrayList<String> groupItemsOrderSuffices = new ArrayList<>();
     private boolean usingShortHandOrdering = false;
 
-    public AggregatePipeOperator(SelectItem<?> selectItem) {
+    public AggregatePipeOperator(SelectItem<?> selectItem, String orderSuffix) {
         selectItems.add(selectItem);
+        selectItemsOrderSuffices.add(orderSuffix);
     }
 
     public ArrayList<SelectItem<?>> getSelectItems() {
@@ -21,22 +25,31 @@ public ArrayList<SelectItem<?>> getGroupItems() {
         return groupItems;
     }
 
-    public AggregatePipeOperator add(SelectItem<?> selectItem) {
+    public ArrayList<String> getSelectItemsOrderSuffices() {
+        return selectItemsOrderSuffices;
+    }
+
+    public ArrayList<String> getGroupItemsOrderSuffices() {
+        return groupItemsOrderSuffices;
+    }
+
+    public AggregatePipeOperator add(SelectItem<?> selectItem, String orderSuffix) {
         selectItems.add(selectItem);
         return this;
     }
 
-    public AggregatePipeOperator with(SelectItem<?> selectItem) {
-        return this.add(selectItem);
+    public AggregatePipeOperator with(SelectItem<?> selectItem, String orderSuffix) {
+        return this.add(selectItem, orderSuffix);
     }
 
-    public AggregatePipeOperator addGroupItem(SelectItem<?> selectItem) {
+    public AggregatePipeOperator addGroupItem(SelectItem<?> selectItem, String orderSuffix) {
         groupItems.add(selectItem);
+        groupItemsOrderSuffices.add(orderSuffix);
         return this;
     }
 
-    public AggregatePipeOperator withGroupItem(SelectItem<?> selectItem) {
-        return this.addGroupItem(selectItem);
+    public AggregatePipeOperator withGroupItem(SelectItem<?> selectItem, String orderSuffix) {
+        return this.addGroupItem(selectItem, orderSuffix);
     }
 
     public boolean isUsingShortHandOrdering() {
@@ -58,7 +71,12 @@ public StringBuilder appendTo(StringBuilder builder) {
         builder.append("|> ").append("AGGREGATE");
         int i = 0;
         for (SelectItem<?> selectItem : selectItems) {
-            builder.append(i++ > 0 ? ", " : " ").append(selectItem);
+            builder.append(i > 0 ? ", " : " ").append(selectItem);
+            if (i < selectItemsOrderSuffices.size() && selectItemsOrderSuffices.get(i) != null
+                    && !selectItemsOrderSuffices.get(i).isEmpty()) {
+                builder.append(" ").append(selectItemsOrderSuffices.get(i));
+            }
+            i++;
         }
         builder.append("\n");
 
@@ -70,7 +88,12 @@ public StringBuilder appendTo(StringBuilder builder) {
             builder.append(" BY");
             i = 0;
             for (SelectItem<?> selectItem : groupItems) {
-                builder.append(i++ > 0 ? ", " : " ").append(selectItem);
+                builder.append(i > 0 ? ", " : " ").append(selectItem);
+                if (i < groupItemsOrderSuffices.size() && groupItemsOrderSuffices.get(i) != null
+                        && !groupItemsOrderSuffices.get(i).isEmpty()) {
+                    builder.append(" ").append(groupItemsOrderSuffices.get(i));
+                }
+                i++;
             }
             builder.append("\n");
         }

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

@@ -1539,13 +1539,18 @@ public <S> StringBuilder visit(ArrayExpression array, S context) {
     }
 
     @Override
-    public <S> StringBuilder visit(ArrayConstructor aThis, S context) {
-        if (aThis.isArrayKeyword()) {
+    public <S> StringBuilder visit(ArrayConstructor arrayConstructor, S context) {
+        if (arrayConstructor.isArrayKeyword()) {
             builder.append("ARRAY");
+
+            ColDataType dataType = arrayConstructor.getDataType();
+            if (dataType != null) {
+                builder.append("<").append(dataType).append(">");
+            }
         }
         builder.append("[");
         boolean first = true;
-        for (Expression expression : aThis.getExpressions()) {
+        for (Expression expression : arrayConstructor.getExpressions()) {
             if (!first) {
                 builder.append(", ");
             } else {

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

@@ -71,6 +71,7 @@
 import net.sf.jsqlparser.statement.update.UpdateSet;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
@@ -901,8 +902,14 @@ public StringBuilder visit(AggregatePipeOperator aggregate, Void context) {
         builder.append("|> ").append("AGGREGATE");
         int i = 0;
         for (SelectItem<?> selectItem : aggregate.getSelectItems()) {
-            builder.append(i++ > 0 ? ", " : " ");
+            builder.append(i > 0 ? ", " : " ");
             selectItem.accept(this, context);
+            ArrayList<String> selectItemsOrderSuffices = aggregate.getSelectItemsOrderSuffices();
+            if (i < selectItemsOrderSuffices.size() && selectItemsOrderSuffices.get(i) != null
+                    && !selectItemsOrderSuffices.get(i).isEmpty()) {
+                builder.append(" ").append(selectItemsOrderSuffices.get(i));
+            }
+            i++;
         }
         builder.append("\n");
 
@@ -914,8 +921,16 @@ public StringBuilder visit(AggregatePipeOperator aggregate, Void context) {
             builder.append(" BY");
             i = 0;
             for (SelectItem<?> selectItem : aggregate.getGroupItems()) {
-                builder.append(i++ > 0 ? ", " : " ");
+                builder.append(i > 0 ? ", " : " ");
                 selectItem.accept(this, context);
+
+                ArrayList<String> groupItemsOrderSuffices = aggregate.getGroupItemsOrderSuffices();
+                if (i < groupItemsOrderSuffices.size() && groupItemsOrderSuffices.get(i) != null
+                        && !groupItemsOrderSuffices.get(i).isEmpty()) {
+                    builder.append(" ").append(groupItemsOrderSuffices.get(i));
+                }
+
+                i++;
             }
             builder.append("\n");
         }