[#4463] Add support for passing ROW value expressions to ROLLUP(), CU…

…BE(), and GROUPING SETS()
jOOQ · Aug 10, 2015 · 51f5447 · 51f5447
1 parent f360ade
commit 51f5447
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 13 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -118,6 +118,7 @@
 import org.jooq.DropTableStep;
 import org.jooq.DropViewFinalStep;
 import org.jooq.Field;
+import org.jooq.FieldOrRow;
 import org.jooq.GroupConcatOrderByStep;
 import org.jooq.GroupField;
 import org.jooq.Insert;
@@ -9446,6 +9447,16 @@ public static Field<Timestamp> timestamp(Field<? extends java.util.Date> field)
     // XXX Construction of GROUPING SET functions
     // ------------------------------------------------------------------------
 
+    /**
+     * Create a ROLLUP(field1, field2, .., fieldn) grouping field.
+     *
+     * @see #rollup(FieldOrRow...)
+     */
+    @Support({ CUBRID, MARIADB, MYSQL, POSTGRES_9_5 })
+    public static GroupField rollup(Field<?>... fields) {
+        return rollup((FieldOrRow[]) nullSafe(fields));
+    }
+
     /**
      * Create a ROLLUP(field1, field2, .., fieldn) grouping field.
      * <p>
@@ -9471,8 +9482,18 @@ public static Field<Timestamp> timestamp(Field<? extends java.util.Date> field)
      * @return A field to be used in a <code>GROUP BY</code> clause
      */
     @Support({ CUBRID, MARIADB, MYSQL, POSTGRES_9_5 })
-    public static GroupField rollup(Field<?>... fields) {
-        return new Rollup(nullSafe(fields));
+    public static GroupField rollup(FieldOrRow... fields) {
+        return new Rollup(fields);
+    }
+
+    /**
+     * Create a CUBE(field1, field2, .., fieldn) grouping field.
+     *
+     * @see #cube(Field...)
+     */
+    @Support({ POSTGRES_9_5 })
+    public static GroupField cube(Field<?>... fields) {
+        return cube((FieldOrRow[]) nullSafe(fields));
     }
 
     /**
@@ -9498,8 +9519,8 @@ public static GroupField rollup(Field<?>... fields) {
      * @return A field to be used in a <code>GROUP BY</code> clause
      */
     @Support({ POSTGRES_9_5 })
-    public static GroupField cube(Field<?>... fields) {
-        return function("cube", Object.class, nullSafe(fields));
+    public static GroupField cube(FieldOrRow... fields) {
+        return field("{cube}({0})", Object.class, new QueryPartList<FieldOrRow>(fields));
     }
 
     /**

diff --git a/jOOQ/src/main/java/org/jooq/impl/Rollup.java b/jOOQ/src/main/java/org/jooq/impl/Rollup.java
@@ -41,35 +41,43 @@
 package org.jooq.impl;
 
 import static org.jooq.impl.DSL.field;
-import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
-import org.jooq.Field;
+import org.jooq.Context;
+import org.jooq.FieldOrRow;
+import org.jooq.QueryPart;
 
 /**
  * @author Lukas Eder
  */
-class Rollup extends AbstractFunction<Object> {
+class Rollup extends AbstractField<Object> {
 
     /**
      * Generated UID
      */
-    private static final long serialVersionUID = -5820608758939548704L;
+    private static final long         serialVersionUID = -5820608758939548704L;
+    private QueryPartList<FieldOrRow> arguments;
 
-    Rollup(Field<?>... fields) {
-        super("rollup", SQLDataType.OTHER, fields);
+    Rollup(FieldOrRow... arguments) {
+        super("rollup", SQLDataType.OTHER);
+
+        this.arguments = new QueryPartList<FieldOrRow>(arguments);
     }
 
     @Override
-    final Field<Object> getFunction0(Configuration configuration) {
+    public final void accept(Context<?> ctx) {
+        ctx.visit(delegate(ctx.configuration()));
+    }
+
+    private final QueryPart delegate(Configuration configuration) {
         switch (configuration.dialect()) {
             case CUBRID:
             case MARIADB:
             case MYSQL:
-                return field("{0} {with rollup}", new QueryPartList<Field<?>>(getArguments()));
+                return field("{0} {with rollup}", arguments);
 
             default:
-                return function("rollup", Object.class, getArguments());
+                return field("{rollup}({0})", Object.class, arguments);
         }
     }
 }