Assorted fixes (#1666)

* fix: add missing public Getter Add public Getter for `updateSets` Fixes #1630 * feat: LISTAGG() with OVER() clause fixes issue #1652 fixes 3 more Special Oracle Tests * fix: White-list CURRENT_DATE and CURRENT_TIMESTAMP tokens allows CURRENT_DATE(3) and CURRENT_TIMESTAMP(3) as regular functions fixes #1507 fixes #1607 * feat: Deparser for Expression Lists Visit each Expression of a List instead ExpressionList.toString() fixes #1608 * fix: Lookahead needed
JSQLParser · Nov 20, 2022 · bff268a · bff268a
1 parent e186588
commit bff268a
Show file tree

Hide file tree

Showing 20 changed files with 250 additions and 58 deletions.
diff --git a/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java b/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java
@@ -253,13 +253,20 @@ public String toString() {
  case WITHIN_GROUP:
  b.append("WITHIN GROUP");
  break;
+ case WITHIN_GROUP_OVER:
+ b.append("WITHIN GROUP (");
+ windowDef.orderBy.toStringOrderByElements(b);
+ b.append(") OVER (");
+ windowDef.partitionBy.toStringPartitionBy(b);
+ b.append(")");
+ break;
  default:
  b.append("OVER");
  }
 
  if (windowName != null) {
  b.append(" ").append(windowName);
- } else {
+ } else if (type!=AnalyticType.WITHIN_GROUP_OVER) {
  b.append(" ");
  b.append(windowDef.toString());
  }

diff --git a/src/main/java/net/sf/jsqlparser/expression/AnalyticType.java b/src/main/java/net/sf/jsqlparser/expression/AnalyticType.java
@@ -12,5 +12,7 @@
 public enum AnalyticType {
  OVER,
  WITHIN_GROUP,
+
+ WITHIN_GROUP_OVER,
  FILTER_ONLY
 }
diff --git a/src/main/java/net/sf/jsqlparser/expression/OrderByClause.java b/src/main/java/net/sf/jsqlparser/expression/OrderByClause.java
@@ -27,7 +27,7 @@ public void setOrderByElements(List<OrderByElement> orderByElements) {
  this.orderByElements = orderByElements;
  }
 
- void toStringOrderByElements(StringBuilder b) {
+ public void toStringOrderByElements(StringBuilder b) {
  if (orderByElements != null && !orderByElements.isEmpty()) {
  b.append("ORDER BY ");
  for (int i = 0; i < orderByElements.size(); i++) {

diff --git a/src/main/java/net/sf/jsqlparser/expression/PartitionByClause.java b/src/main/java/net/sf/jsqlparser/expression/PartitionByClause.java
@@ -29,7 +29,7 @@ public void setPartitionExpressionList(ExpressionList partitionExpressionList, b
  this.brackets = brackets;
  }
 
- void toStringPartitionBy(StringBuilder b) {
+ public void toStringPartitionBy(StringBuilder b) {
  if (partitionExpressionList != null && !partitionExpressionList.getExpressions().isEmpty()) {
  b.append("PARTITION BY ");
  b.append(PlainSelect.

diff --git a/src/main/java/net/sf/jsqlparser/expression/WindowDefinition.java b/src/main/java/net/sf/jsqlparser/expression/WindowDefinition.java
@@ -15,11 +15,20 @@
 
 public class WindowDefinition {
 
+
  final OrderByClause orderBy = new OrderByClause();
  final PartitionByClause partitionBy = new PartitionByClause();
  WindowElement windowElement = null;
  private String windowName;
 
+ public OrderByClause getOrderBy() {
+ return orderBy;
+ }
+
+ public PartitionByClause getPartitionBy() {
+ return partitionBy;
+ }
+
  public WindowElement getWindowElement() {
  return windowElement;
  }

diff --git a/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java b/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java
@@ -365,7 +365,7 @@ public static void buildGrammarForRelObjectNameWithoutValue(File file) throws Ex
  + "{ Token tk = null; }\n"
  + "{\n"
  //@todo: find a way to avoid those hardcoded compound tokens
- + " ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> \n"
+ + " ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR> \n"
  + " ");
 
  for (String keyword: allKeywords) {

diff --git a/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java b/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java
@@ -572,7 +572,7 @@ public static String getStringList(List<?> list, boolean useComma, boolean useBr
  */
  public static StringBuilder appendStringListTo(StringBuilder builder, List<?> list, boolean useComma, boolean useBrackets) {
  if (list != null) {
- String comma = useComma ? "," : "";
+ String comma = useComma ? ", " : " ";
 
  if (useBrackets) {
  builder.append("(");
@@ -581,7 +581,7 @@ public static StringBuilder appendStringListTo(StringBuilder builder, List<?> li
  int size = list.size();
  for (int i = 0; i < size; i++) {
  builder.append(list.get(i)).append(i < size - 1
- ? comma + " "
+ ? comma
  : "");
  }
 

diff --git a/src/main/java/net/sf/jsqlparser/statement/select/ValuesList.java b/src/main/java/net/sf/jsqlparser/statement/select/ValuesList.java
@@ -88,7 +88,7 @@ public String toString() {
  StringBuilder b = new StringBuilder();
 
  b.append("(VALUES ");
- for (Iterator<ExpressionList> it = getMultiExpressionList().getExprList().iterator(); it.
+ for (Iterator<ExpressionList> it = getMultiExpressionList().getExpressionLists().iterator(); it.
  hasNext();) {
  b.append(PlainSelect.getStringList(it.next().getExpressions(), true, !isNoBrackets()));
  if (it.hasNext()) {
@@ -97,7 +97,7 @@ public String toString() {
  }
  b.append(")");
  if (alias != null) {
- b.append(alias.toString());
+ b.append(alias);
 
  if (columnNames != null) {
  b.append("(");

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
@@ -465,19 +465,7 @@ public void visit(Function function) {
 
  @Override
  public void visit(ExpressionList expressionList) {
- if (expressionList.isUsingBrackets()) {
- buffer.append("(");
- }
- for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
- Expression expression = iter.next();
- expression.accept(this);
- if (iter.hasNext()) {
- buffer.append(", ");
- }
- }
- if (expressionList.isUsingBrackets()) {
- buffer.append(")");
- }
+ new ExpressionListDeParser(this, buffer, expressionList.isUsingBrackets(), true).deParse(expressionList.getExpressions());
  }
 
  @Override
@@ -709,13 +697,20 @@ public void visit(AnalyticExpression aexpr) {
  case WITHIN_GROUP:
  buffer.append("WITHIN GROUP");
  break;
+ case WITHIN_GROUP_OVER:
+ buffer.append("WITHIN GROUP (");
+ aexpr.getWindowDefinition().getOrderBy().toStringOrderByElements(buffer);
+ buffer.append(") OVER (");
+ aexpr.getWindowDefinition().getPartitionBy().toStringPartitionBy(buffer);
+ buffer.append(")");
+ break;
  default:
  buffer.append("OVER");
  }
 
  if (aexpr.getWindowName() != null) {
  buffer.append(" ").append(aexpr.getWindowName());
- } else {
+ } else if (aexpr.getType()!=AnalyticType.WITHIN_GROUP_OVER) {
  buffer.append(" (");
 
  if (partitionExpressionList != null && !partitionExpressionList.getExpressions().isEmpty()) {
@@ -833,7 +828,8 @@ public void visit(MySQLGroupConcat groupConcat) {
 
  @Override
  public void visit(ValueListExpression valueList) {
- buffer.append(valueList.toString());
+ ExpressionList expressionList = valueList.getExpressionList();
+ expressionList.accept(this);
  }
 
  @Override

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionListDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionListDeParser.java
@@ -0,0 +1,52 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.util.deparser;
+
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.ExpressionVisitor;
+
+import java.util.Collection;
+
+public class ExpressionListDeParser extends AbstractDeParser<Collection<Expression>> {
+
+ private final ExpressionVisitor expressionVisitor;
+ private final boolean useBrackets;
+ private final boolean useComma;
+
+ public ExpressionListDeParser(ExpressionVisitor expressionVisitor, StringBuilder builder, boolean useBrackets, boolean useComma) {
+ super(builder);
+ this.expressionVisitor = expressionVisitor;
+ this.useBrackets = useBrackets;
+ this.useComma = useComma;
+ }
+
+ @Override
+ public void deParse(Collection<Expression> expressions) {
+ if (expressions != null) {
+ String comma = useComma ? ", " : " ";
+ if (useBrackets) {
+ buffer.append("(");
+ }
+ int i=0;
+ int size = expressions.size() - 1;
+ for (Expression expression: expressions) {
+ expression.accept(expressionVisitor);
+ if (i<size) {
+ buffer.append(comma);
+ }
+ i++;
+ }
+
+ if (useBrackets) {
+ buffer.append(")");
+ }
+ }
+ }
+}
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.util.deparser;
 
 import java.util.Iterator;
+import java.util.List;
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
@@ -20,6 +21,7 @@
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.insert.Insert;
 import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.SelectBody;
 import net.sf.jsqlparser.statement.select.SelectVisitor;
 import net.sf.jsqlparser.statement.select.SubSelect;
 import net.sf.jsqlparser.statement.select.WithItem;
@@ -93,7 +95,8 @@ public void deParse(Insert insert) {
  }
  buffer.append(" ");
  }
- insert.getSelect().getSelectBody().accept(selectVisitor);
+ SelectBody selectBody = insert.getSelect().getSelectBody();
+ selectBody.accept(selectVisitor);
  if (insert.getSelect().isUsingWithBrackets()) {
  buffer.append(")");
  }
@@ -147,15 +150,7 @@ public void deParse(Insert insert) {
 
  @Override
  public void visit(ExpressionList expressionList) {
- buffer.append(" VALUES (");
- for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
- Expression expression = iter.next();
- expression.accept(expressionVisitor);
- if (iter.hasNext()) {
- buffer.append(", ");
- }
- }
- buffer.append(")");
+ new ExpressionListDeParser(expressionVisitor, buffer, expressionList.isUsingBrackets(), true).deParse(expressionList.getExpressions());
  }
 
  @Override
@@ -165,20 +160,15 @@ public void visit(NamedExpressionList NamedExpressionList) {
 
  @Override
  public void visit(MultiExpressionList multiExprList) {
- buffer.append(" VALUES ");
- for (Iterator<ExpressionList> it = multiExprList.getExprList().iterator(); it.hasNext();) {
- buffer.append("(");
- for (Iterator<Expression> iter = it.next().getExpressions().iterator(); iter.hasNext();) {
- Expression expression = iter.next();
- expression.accept(expressionVisitor);
- if (iter.hasNext()) {
- buffer.append(", ");
- }
- }
- buffer.append(")");
- if (it.hasNext()) {
+ List<ExpressionList> expressionLists = multiExprList.getExpressionLists();
+ int n = expressionLists.size() - 1;
+ int i = 0;
+ for (ExpressionList expressionList : expressionLists) {
+ new ExpressionListDeParser(expressionVisitor, buffer, expressionList.isUsingBrackets(), true).deParse(expressionList.getExpressions());
+ if (i<n) {
  buffer.append(", ");
  }
+ i++;
  }
  }
 

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -535,7 +535,32 @@ public void visit(LateralSubSelect lateralSubSelect) {
 
  @Override
  public void visit(ValuesList valuesList) {
- buffer.append(valuesList.toString());
+ buffer.append("(VALUES ");
+ List<ExpressionList> expressionLists = valuesList.getMultiExpressionList().getExpressionLists();
+ int n = expressionLists.size() - 1;
+ int i = 0;
+ for (ExpressionList expressionList : expressionLists) {
+ new ExpressionListDeParser(expressionVisitor, buffer, !valuesList.isNoBrackets(), true).deParse(expressionList.getExpressions());
+ if (i<n) {
+ buffer.append(", ");
+ }
+ i++;
+ }
+ buffer.append(")");
+ if (valuesList.getAlias() != null) {
+ buffer.append(valuesList.getAlias());
+
+ if (valuesList.getColumnNames() != null) {
+ buffer.append("(");
+ for (Iterator<String> it = valuesList.getColumnNames().iterator(); it.hasNext();) {
+ buffer.append(it.next());
+ if (it.hasNext()) {
+ buffer.append(", ");
+ }
+ }
+ buffer.append(")");
+ }
+ }
  }
 
  @Override
@@ -577,16 +602,41 @@ void deParse(PlainSelect statement) {
 
  @Override
  public void visit(ExpressionList expressionList) {
- buffer.append(expressionList.toString());
+ new ExpressionListDeParser(expressionVisitor, buffer, expressionList.isUsingBrackets(), true).deParse(expressionList.getExpressions());
  }
 
  @Override
  public void visit(NamedExpressionList namedExpressionList) {
  buffer.append(namedExpressionList.toString());
+
+ buffer.append("(");
+ List<Expression> expressions = namedExpressionList.getExpressions();
+ List<String> names = namedExpressionList.getNames();
+ for (int i = 0; i < expressions.size(); i++) {
+ Expression expression = expressions.get(i);
+ String name = names.get(i);
+ if (i > 0) {
+ buffer.append(" ");
+ }
+ if (!name.equals("")) {
+ buffer.append(name).append(" ");
+ }
+ expression.accept(expressionVisitor);
+ }
+ buffer.append(")");
  }
 
  @Override
  public void visit(MultiExpressionList multiExprList) {
- buffer.append(multiExprList.toString());
+ List<ExpressionList> expressionLists = multiExprList.getExpressionLists();
+ int n = expressionLists.size() - 1;
+ int i = 0;
+ for (ExpressionList expressionList : expressionLists) {
+ new ExpressionListDeParser(expressionVisitor, buffer, expressionList.isUsingBrackets(), true).deParse(expressionList.getExpressions());
+ if (i<n) {
+ buffer.append(", ");
+ }
+ i++;
+ }
  }
 }