Partially revert 99c866a3 and use parentheses instead

h2/src/main/org/h2/command/Parser.java

@@ -1405,22 +1405,18 @@ public class Parser {
         return prep;
     }
 
-    private boolean isSelectDeep() {
+    private boolean isSelect() {
         int start = lastParseIndex;
         while (readIf(OPEN_PAREN)) {
             // need to read ahead, it could be a nested union:
             // ((select 1) union (select 1))
         }
-        boolean select = isSelect();
+        boolean select = isToken(SELECT) || isToken(FROM) || isToken(WITH);
         parseIndex = start;
         read();
         return select;
     }
 
-    private boolean isSelect() {
-        return isToken(SELECT) || isToken(FROM) || isToken(WITH);
-    }
-
     private Prepared parseMerge() {
         int start = lastParseIndex;
         read("INTO");
@@ -1434,7 +1430,7 @@ public class Parser {
         command.setTargetTableFilter(targetTableFilter);
         Table table = command.getTargetTable();
         if (readIf(OPEN_PAREN)) {
-            if (isSelectDeep()) {
+            if (isSelect()) {
                 command.setQuery(parseSelect());
                 read(CLOSE_PAREN);
                 return command;
@@ -1464,7 +1460,7 @@ public class Parser {
 
         if (readIf(OPEN_PAREN)) {
             /* a select query is supplied */
-            if (isSelectDeep()) {
+            if (isSelect()) {
                 command.setQuery(parseSelect());
                 read(CLOSE_PAREN);
             }
@@ -1619,7 +1615,7 @@ public class Parser {
     private Insert parseInsertGivenTable(Insert command, Table table) {
         Column[] columns = null;
         if (readIf(OPEN_PAREN)) {
-            if (isSelectDeep()) {
+            if (isSelect()) {
                 command.setQuery(parseSelect());
                 read(CLOSE_PAREN);
                 return command;
@@ -1672,7 +1668,7 @@ public class Parser {
         Table table = readTableOrView();
         command.setTable(table);
         if (readIf(OPEN_PAREN)) {
-            if (isSelectDeep()) {
+            if (isSelect()) {
                 command.setQuery(parseSelect());
                 read(CLOSE_PAREN);
                 return command;
@@ -1709,7 +1705,7 @@ public class Parser {
         Table table;
         String alias = null;
         label: if (readIf(OPEN_PAREN)) {
-            if (isSelectDeep()) {
+            if (isSelect()) {
                 Query query = parseSelectUnion();
                 read(CLOSE_PAREN);
                 query.setParameterList(new ArrayList<>(parameters));
@@ -2825,7 +2821,7 @@ public class Parser {
                     }
                     r = ValueExpression.get(ValueBoolean.FALSE);
                 } else {
-                    if (isSelectDeep()) {
+                    if (isSelect()) {
                         Query query = parseSelect();
                         r = new ConditionInSelect(database, r, query, false,
                                 Comparison.EQUAL);

h2/src/main/org/h2/expression/aggregate/Aggregate.java

@@ -266,6 +266,15 @@ public class Aggregate extends AbstractAggregate {
         this.groupConcatSeparator = separator;
     }
 
+    /**
+     * Returns the type of this aggregate.
+     *
+     * @return the type of this aggregate
+     */
+    public AggregateType getAggregateType() {
+        return type;
+    }
+
     private void sortWithOrderBy(Value[] array) {
         final SortOrder sortOrder = orderBySort;
         if (sortOrder != null) {

h2/src/main/org/h2/expression/condition/Comparison.java

@@ -14,6 +14,8 @@ import org.h2.expression.ExpressionColumn;
 import org.h2.expression.ExpressionVisitor;
 import org.h2.expression.Parameter;
 import org.h2.expression.ValueExpression;
+import org.h2.expression.aggregate.Aggregate;
+import org.h2.expression.aggregate.Aggregate.AggregateType;
 import org.h2.index.IndexCondition;
 import org.h2.message.DbException;
 import org.h2.table.Column;
@@ -130,6 +132,7 @@ public class Comparison extends Condition {
 
     @Override
     public StringBuilder getSQL(StringBuilder builder) {
+        boolean encloseRight = false;
         builder.append('(');
         switch (compareType) {
         case IS_NULL:
@@ -143,9 +146,25 @@ public class Comparison extends Condition {
             left.getSQL(builder).append(", ");
             right.getSQL(builder).append(')');
             break;
+        case EQUAL:
+        case BIGGER_EQUAL:
+        case BIGGER:
+        case SMALLER_EQUAL:
+        case SMALLER:
+        case NOT_EQUAL:
+            if (right instanceof Aggregate && ((Aggregate) right).getAggregateType() == AggregateType.ANY) {
+                encloseRight = true;
+            }
+            //$FALL-THROUGH$
         default:
             left.getSQL(builder).append(' ').append(getCompareOperator(compareType)).append(' ');
+            if (encloseRight) {
+                builder.append('(');
+            }
             right.getSQL(builder);
+            if (encloseRight) {
+                builder.append(')');
+            }
         }
         return builder.append(')');
     }

h2/src/test/org/h2/test/scripts/functions/aggregate/any.sql

@@ -20,14 +20,14 @@ SELECT A, ANY(B < 2), SOME(B > 3), BOOL_OR(B = 1), ANY(B = 1) FILTER (WHERE A =
 DROP TABLE TEST;
 > ok
 
-SELECT TRUE = ANY((SELECT TRUE));
-> TRUE = ANY((SELECT TRUE FROM SYSTEM_RANGE(1, 1) /* PUBLIC.RANGE_INDEX */ /* scanCount: 2 */))
-> ---------------------------------------------------------------------------------------------
+SELECT TRUE = (ANY((SELECT TRUE)));
+> TRUE = (ANY((SELECT TRUE FROM SYSTEM_RANGE(1, 1) /* PUBLIC.RANGE_INDEX */ /* scanCount: 2 */)))
+> -----------------------------------------------------------------------------------------------
 > TRUE
 > rows: 1
 
-SELECT TRUE = ANY((SELECT FALSE));
-> TRUE = ANY((SELECT FALSE FROM SYSTEM_RANGE(1, 1) /* PUBLIC.RANGE_INDEX */ /* scanCount: 2 */))
-> ----------------------------------------------------------------------------------------------
+SELECT TRUE = (ANY((SELECT FALSE)));
+> TRUE = (ANY((SELECT FALSE FROM SYSTEM_RANGE(1, 1) /* PUBLIC.RANGE_INDEX */ /* scanCount: 2 */)))
+> ------------------------------------------------------------------------------------------------
 > FALSE
 > rows: 1