Use another approach to distinguish between quantified comparison and aggregate

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

@@ -1405,18 +1405,21 @@ public class Parser {
         return prep;
     }
 
-    private boolean isSelect() {
+    private boolean isSelectDeep() {
         int start = lastParseIndex;
         while (readIf(OPEN_PAREN)) {
             // need to read ahead, it could be a nested union:
             // ((select 1) union (select 1))
         }
-        boolean select = isToken(SELECT) || isToken(FROM) || isToken(WITH);
+        boolean select = isSelect();
         parseIndex = start;
         read();
         return select;
     }
 
+    private boolean isSelect() {
+        return isToken(SELECT) || isToken(FROM) || isToken(WITH);
+    }
 
     private Prepared parseMerge() {
         int start = lastParseIndex;
@@ -1431,7 +1434,7 @@ public class Parser {
         command.setTargetTableFilter(targetTableFilter);
         Table table = command.getTargetTable();
         if (readIf(OPEN_PAREN)) {
-            if (isSelect()) {
+            if (isSelectDeep()) {
                 command.setQuery(parseSelect());
                 read(CLOSE_PAREN);
                 return command;
@@ -1461,7 +1464,7 @@ public class Parser {
 
         if (readIf(OPEN_PAREN)) {
             /* a select query is supplied */
-            if (isSelect()) {
+            if (isSelectDeep()) {
                 command.setQuery(parseSelect());
                 read(CLOSE_PAREN);
             }
@@ -1616,7 +1619,7 @@ public class Parser {
     private Insert parseInsertGivenTable(Insert command, Table table) {
         Column[] columns = null;
         if (readIf(OPEN_PAREN)) {
-            if (isSelect()) {
+            if (isSelectDeep()) {
                 command.setQuery(parseSelect());
                 read(CLOSE_PAREN);
                 return command;
@@ -1669,7 +1672,7 @@ public class Parser {
         Table table = readTableOrView();
         command.setTable(table);
         if (readIf(OPEN_PAREN)) {
-            if (isSelect()) {
+            if (isSelectDeep()) {
                 command.setQuery(parseSelect());
                 read(CLOSE_PAREN);
                 return command;
@@ -1706,7 +1709,7 @@ public class Parser {
         Table table;
         String alias = null;
         label: if (readIf(OPEN_PAREN)) {
-            if (isSelect()) {
+            if (isSelectDeep()) {
                 Query query = parseSelectUnion();
                 read(CLOSE_PAREN);
                 query.setParameterList(new ArrayList<>(parameters));
@@ -2822,7 +2825,7 @@ public class Parser {
                     }
                     r = ValueExpression.get(ValueBoolean.FALSE);
                 } else {
-                    if (isSelect()) {
+                    if (isSelectDeep()) {
                         Query query = parseSelect();
                         r = new ConditionInSelect(database, r, query, false,
                                 Comparison.EQUAL);
@@ -2862,23 +2865,33 @@ public class Parser {
                     break;
                 }
                 read();
+                int start = lastParseIndex;
                 if (readIf(ALL)) {
                     read(OPEN_PAREN);
+                    if (isSelect()) {
                         Query query = parseSelect();
-                    r = new ConditionInSelect(database, r, query, true,
-                            compareType);
+                        r = new ConditionInSelect(database, r, query, true, compareType);
                         read(CLOSE_PAREN);
+                    } else {
+                        parseIndex = start;
+                        read();
+                        r = new Comparison(session, compareType, r, readConcat());
+                    }
                 } else if (readIf("ANY") || readIf("SOME")) {
                     read(OPEN_PAREN);
                     if (currentTokenType == PARAMETER && compareType == 0) {
                         Parameter p = readParameter();
                         r = new ConditionInParameter(database, r, p);
-                    } else {
+                        read(CLOSE_PAREN);
+                    } else if (isSelect()) {
                         Query query = parseSelect();
-                        r = new ConditionInSelect(database, r, query, false,
-                                compareType);
-                    }
+                        r = new ConditionInSelect(database, r, query, false, compareType);
                         read(CLOSE_PAREN);
+                    } else {
+                        parseIndex = start;
+                        read();
+                        r = new Comparison(session, compareType, r, readConcat());
+                    }
                 } else {
                     r = new Comparison(session, compareType, r, readConcat());
                 }

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

@@ -19,6 +19,7 @@ import org.h2.engine.Session;
 import org.h2.expression.Expression;
 import org.h2.expression.ExpressionColumn;
 import org.h2.expression.ExpressionVisitor;
+import org.h2.expression.Subquery;
 import org.h2.expression.analysis.Window;
 import org.h2.index.Cursor;
 import org.h2.index.Index;
@@ -812,7 +813,12 @@ public class Aggregate extends AbstractAggregate {
             on.getSQL(builder).append(')');
         } else {
             builder.append('(');
-            on.getUnenclosedSQL(builder).append(')');
+            if (on instanceof Subquery) {
+                on.getSQL(builder);
+            } else {
+                on.getUnenclosedSQL(builder);
+            }
+            builder.append(')');
         }
         return appendTailConditions(builder);
     }

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

@@ -19,3 +19,15 @@ 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 */))
+> ---------------------------------------------------------------------------------------------
+> TRUE
+> rows: 1
+
+SELECT TRUE = ANY((SELECT FALSE));
+> TRUE = ANY((SELECT FALSE FROM SYSTEM_RANGE(1, 1) /* PUBLIC.RANGE_INDEX */ /* scanCount: 2 */))
+> ----------------------------------------------------------------------------------------------
+> FALSE
+> rows: 1