Initial conversion of aggregates to functions

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java

@@ -331,19 +331,19 @@ static CountDistinct countDistinct(BasicColumn column) {
         return CountDistinct.of(column);
     }
 
-    static Max max(BasicColumn column) {
+    static <T> Max<T> max(BindableColumn<T> column) {
         return Max.of(column);
     }
 
-    static Min min(BasicColumn column) {
+    static <T> Min<T> min(BindableColumn<T> column) {
         return Min.of(column);
     }
 
-    static Avg avg(BasicColumn column) {
+    static <T> Avg<T> avg(BindableColumn<T> column) {
         return Avg.of(column);
     }
 
-    static Sum sum(BasicColumn column) {
+    static <T> Sum<T> sum(BindableColumn<T> column) {
         return Sum.of(column);
     }
 

src/main/java/org/mybatis/dynamic/sql/select/aggregate/Avg.java

@@ -15,25 +15,27 @@
  */
 package org.mybatis.dynamic.sql.select.aggregate;
 
-import org.mybatis.dynamic.sql.BasicColumn;
+import org.mybatis.dynamic.sql.BindableColumn;
+import org.mybatis.dynamic.sql.render.TableAliasCalculator;
+import org.mybatis.dynamic.sql.select.function.AbstractUniTypeFunction;
 
-public class Avg extends AbstractAggregate<Avg> {
+public class Avg<T> extends AbstractUniTypeFunction<T, Avg<T>> {
 
-    private Avg(BasicColumn column) {
+    private Avg(BindableColumn<T> column) {
         super(column);
     }
-    
+
     @Override
-    protected String render(String columnName) {
-        return "avg(" + columnName + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+    public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
+        return "avg(" + column.renderWithTableAlias(tableAliasCalculator) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
-    protected Avg copy() {
-        return new Avg(column);
+    protected Avg<T> copy() {
+        return new Avg<>(column);
     }
 
-    public static Avg of(BasicColumn column) {
-        return new Avg(column);
+    public static <T> Avg<T> of(BindableColumn<T> column) {
+        return new Avg<>(column);
     }
 }

src/main/java/org/mybatis/dynamic/sql/select/aggregate/Max.java

@@ -15,25 +15,27 @@
  */
 package org.mybatis.dynamic.sql.select.aggregate;
 
-import org.mybatis.dynamic.sql.BasicColumn;
+import org.mybatis.dynamic.sql.BindableColumn;
+import org.mybatis.dynamic.sql.render.TableAliasCalculator;
+import org.mybatis.dynamic.sql.select.function.AbstractUniTypeFunction;
 
-public class Max extends AbstractAggregate<Max> {
+public class Max<T> extends AbstractUniTypeFunction<T, Max<T>> {
 
-    private Max(BasicColumn column) {
+    private Max(BindableColumn<T> column) {
         super(column);
     }
-    
+
     @Override
-    protected String render(String columnName) {
-        return "max(" + columnName + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+    public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
+        return "max(" + column.renderWithTableAlias(tableAliasCalculator) + ")"; //$NON-NLS-1$ //$NON-NLS-2$;
     }
 
     @Override
-    protected Max copy() {
-        return new Max(column);
+    protected Max<T> copy() {
+        return new Max<T>(column);
     }
 
-    public static Max of(BasicColumn column) {
-        return new Max(column);
+    public static <T> Max<T> of(BindableColumn<T> column) {
+        return new Max<>(column);
     }
 }

src/main/java/org/mybatis/dynamic/sql/select/aggregate/Min.java

@@ -15,25 +15,27 @@
  */
 package org.mybatis.dynamic.sql.select.aggregate;
 
-import org.mybatis.dynamic.sql.BasicColumn;
+import org.mybatis.dynamic.sql.BindableColumn;
+import org.mybatis.dynamic.sql.render.TableAliasCalculator;
+import org.mybatis.dynamic.sql.select.function.AbstractUniTypeFunction;
 
-public class Min extends AbstractAggregate<Min> {
+public class Min<T> extends AbstractUniTypeFunction<T, Min<T>> {
 
-    private Min(BasicColumn column) {
+    private Min(BindableColumn<T> column) {
         super(column);
     }
-    
+
     @Override
-    protected String render(String columnName) {
-        return "min(" + columnName + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+    public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
+        return "min(" + column.renderWithTableAlias(tableAliasCalculator) + ")"; //$NON-NLS-1$ //$NON-NLS-2$;
     }
 
     @Override
-    protected Min copy() {
-        return new Min(column);
+    protected Min<T> copy() {
+        return new Min<>(column);
     }
 
-    public static Min of(BasicColumn column) {
-        return new Min(column);
+    public static <T> Min<T> of(BindableColumn<T> column) {
+        return new Min<>(column);
     }
 }

src/main/java/org/mybatis/dynamic/sql/select/aggregate/Sum.java

@@ -15,25 +15,27 @@
  */
 package org.mybatis.dynamic.sql.select.aggregate;
 
-import org.mybatis.dynamic.sql.BasicColumn;
+import org.mybatis.dynamic.sql.BindableColumn;
+import org.mybatis.dynamic.sql.render.TableAliasCalculator;
+import org.mybatis.dynamic.sql.select.function.AbstractUniTypeFunction;
 
-public class Sum extends AbstractAggregate<Sum> {
+public class Sum<T> extends AbstractUniTypeFunction<T, Sum<T>> {
 
-    private Sum(BasicColumn column) {
+    private Sum(BindableColumn<T> column) {
         super(column);
     }
-    
+
     @Override
-    protected String render(String columnName) {
-        return "sum(" + columnName + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+    public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
+        return "sum(" + column.renderWithTableAlias(tableAliasCalculator) + ")"; //$NON-NLS-1$ //$NON-NLS-2$;
     }
 
     @Override
-    protected Sum copy() {
-        return new Sum(column);
+    protected Sum<T> copy() {
+        return new Sum<>(column);
     }
 
-    public static Sum of(BasicColumn column) {
-        return new Sum(column);
+    public static <T> Sum<T> of(BindableColumn<T> column) {
+        return new Sum<>(column);
     }
 }