Move AggregateType to the top level

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

@@ -177,7 +177,7 @@ import org.h2.expression.Variable;
 import org.h2.expression.Wildcard;
 import org.h2.expression.aggregate.AbstractAggregate;
 import org.h2.expression.aggregate.Aggregate;
-import org.h2.expression.aggregate.Aggregate.AggregateType;
+import org.h2.expression.aggregate.AggregateType;
 import org.h2.expression.aggregate.JavaAggregate;
 import org.h2.expression.analysis.DataAnalysisOperation;
 import org.h2.expression.analysis.Window;

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

@@ -48,113 +48,6 @@ import org.h2.value.ValueString;
  */
 public class Aggregate extends AbstractAggregate {
 
-    public enum AggregateType {
-        /**
-         * The aggregate type for COUNT(*).
-         */
-        COUNT_ALL,
-
-        /**
-         * The aggregate type for COUNT(expression).
-         */
-        COUNT,
-
-        /**
-         * The aggregate type for GROUP_CONCAT(...).
-         */
-        GROUP_CONCAT,
-
-        /**
-         * The aggregate type for SUM(expression).
-         */
-        SUM,
-
-        /**
-         * The aggregate type for MIN(expression).
-         */
-        MIN,
-
-        /**
-         * The aggregate type for MAX(expression).
-         */
-        MAX,
-
-        /**
-         * The aggregate type for AVG(expression).
-         */
-        AVG,
-
-        /**
-         * The aggregate type for STDDEV_POP(expression).
-         */
-        STDDEV_POP,
-
-        /**
-         * The aggregate type for STDDEV_SAMP(expression).
-         */
-        STDDEV_SAMP,
-
-        /**
-         * The aggregate type for VAR_POP(expression).
-         */
-        VAR_POP,
-
-        /**
-         * The aggregate type for VAR_SAMP(expression).
-         */
-        VAR_SAMP,
-
-        /**
-         * The aggregate type for ANY(expression).
-         */
-        ANY,
-
-        /**
-         * The aggregate type for EVERY(expression).
-         */
-        EVERY,
-
-        /**
-         * The aggregate type for BOOL_OR(expression).
-         */
-        BIT_OR,
-
-        /**
-         * The aggregate type for BOOL_AND(expression).
-         */
-        BIT_AND,
-
-        /**
-         * The aggregate type for SELECTIVITY(expression).
-         */
-        SELECTIVITY,
-
-        /**
-         * The aggregate type for HISTOGRAM(expression).
-         */
-        HISTOGRAM,
-
-        /**
-         * The aggregate type for MEDIAN(expression).
-         */
-        MEDIAN,
-
-        /**
-         * The aggregate type for ARRAY_AGG(expression).
-         */
-        ARRAY_AGG,
-
-        /**
-         * The aggregate type for MODE(expression).
-         */
-        MODE,
-
-        /**
-         * The aggregate type for ENVELOPE(expression).
-         */
-        ENVELOPE,
-    }
-
     private static final HashMap<String, AggregateType> AGGREGATES = new HashMap<>(64);
 
     private final AggregateType aggregateType;

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

@@ -7,7 +7,6 @@ package org.h2.expression.aggregate;
 
 import org.h2.engine.Constants;
 import org.h2.engine.Database;
-import org.h2.expression.aggregate.Aggregate.AggregateType;
 import org.h2.message.DbException;
 import org.h2.value.Value;
 

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

@@ -6,7 +6,6 @@
 package org.h2.expression.aggregate;
 
 import org.h2.engine.Database;
-import org.h2.expression.aggregate.Aggregate.AggregateType;
 import org.h2.message.DbException;
 import org.h2.value.DataType;
 import org.h2.value.Value;

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

+/*
+ * Copyright 2004-2019 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (http://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.expression.aggregate;
+
+/**
+ * The type of an aggregate function.
+ */
+public enum AggregateType {
+
+    /**
+     * The aggregate type for COUNT(*).
+     */
+    COUNT_ALL,
+
+    /**
+     * The aggregate type for COUNT(expression).
+     */
+    COUNT,
+
+    /**
+     * The aggregate type for GROUP_CONCAT(...).
+     */
+    GROUP_CONCAT,
+
+    /**
+     * The aggregate type for SUM(expression).
+     */
+    SUM,
+
+    /**
+     * The aggregate type for MIN(expression).
+     */
+    MIN,
+
+    /**
+     * The aggregate type for MAX(expression).
+     */
+    MAX,
+
+    /**
+     * The aggregate type for AVG(expression).
+     */
+    AVG,
+
+    /**
+     * The aggregate type for STDDEV_POP(expression).
+     */
+    STDDEV_POP,
+
+    /**
+     * The aggregate type for STDDEV_SAMP(expression).
+     */
+    STDDEV_SAMP,
+
+    /**
+     * The aggregate type for VAR_POP(expression).
+     */
+    VAR_POP,
+
+    /**
+     * The aggregate type for VAR_SAMP(expression).
+     */
+    VAR_SAMP,
+
+    /**
+     * The aggregate type for ANY(expression).
+     */
+    ANY,
+
+    /**
+     * The aggregate type for EVERY(expression).
+     */
+    EVERY,
+
+    /**
+     * The aggregate type for BOOL_OR(expression).
+     */
+    BIT_OR,
+
+    /**
+     * The aggregate type for BOOL_AND(expression).
+     */
+    BIT_AND,
+
+    /**
+     * The aggregate type for SELECTIVITY(expression).
+     */
+    SELECTIVITY,
+
+    /**
+     * The aggregate type for HISTOGRAM(expression).
+     */
+    HISTOGRAM,
+
+    /**
+     * The aggregate type for MEDIAN(expression).
+     */
+    MEDIAN,
+
+    /**
+     * The aggregate type for ARRAY_AGG(expression).
+     */
+    ARRAY_AGG,
+
+    /**
+     * The aggregate type for MODE(expression).
+     */
+    MODE,
+
+    /**
+     * The aggregate type for ENVELOPE(expression).
+     */
+    ENVELOPE,
+
+}

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

@@ -15,7 +15,7 @@ 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.expression.aggregate.AggregateType;
 import org.h2.index.IndexCondition;
 import org.h2.message.DbException;
 import org.h2.table.Column;