diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList.java
index ed443d684c..6d646d5465 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList.java
@@ -92,7 +92,7 @@ public interface DerivedColumnList extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -104,7 +104,7 @@ public interface DerivedColumnList extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -116,6 +116,6 @@ public interface DerivedColumnList extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java
index 415cfb2d2d..f1d8065fb4 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList1 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record1<?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record1<?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList1 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record1<?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record1<?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList1 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record1<?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record1<?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java
index 9250ab5f30..60f18fb8e6 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList10 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList10 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList10 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java
index ad4f29b834..d57d94a80c 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList11 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList11 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList11 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java
index 197780461f..2bb7199c51 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList12 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList12 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList12 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java
index dea29f8b1a..8800ca4171 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList13 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList13 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList13 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java
index 3e6ccbdcef..0babba4b49 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList14 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList14 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList14 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java
index 34b58347fb..de62204e72 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList15 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList15 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList15 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java
index 324b7cddd7..23b41bbbd7 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList16 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList16 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList16 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java
index 5619bf317d..a67eeef73b 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList17 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList17 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList17 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java
index be83f4097c..c97208f4d9 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList18 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList18 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList18 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java
index bfeb3c93cd..851bded644 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList19 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList19 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList19 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java
index 244bcf1ba3..07dd320b8c 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList2 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record2<?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record2<?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList2 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record2<?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record2<?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList2 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record2<?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record2<?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java
index 68910287cd..c34355d950 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList20 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList20 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList20 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java
index ea23b22b71..d328d9dfcb 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList21 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList21 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList21 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java
index c05d786062..86c7b9873b 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList22 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList22 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList22 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java
index b42b14394e..a05e2bfd21 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList3 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record3<?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record3<?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList3 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record3<?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record3<?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList3 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record3<?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record3<?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java
index f9a27ab144..d6cebae841 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList4 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record4<?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record4<?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList4 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record4<?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record4<?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList4 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record4<?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record4<?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java
index 7cdb12ddf4..aa43a64b64 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList5 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record5<?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record5<?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList5 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record5<?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record5<?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList5 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record5<?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record5<?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java
index 024e6e5de7..d0d356de5e 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList6 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record6<?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record6<?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList6 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record6<?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record6<?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList6 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record6<?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record6<?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java
index 9ff4eba5d7..a5a1c8a2c9 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList7 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record7<?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record7<?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList7 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record7<?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record7<?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList7 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record7<?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record7<?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java
index a2579298b8..d33b2741b1 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList8 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList8 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList8 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java
index 0c014f7ed0..71b2fef97d 100644
--- a/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java
+++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java
@@ -74,7 +74,7 @@ public interface DerivedColumnList9 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the
@@ -86,7 +86,7 @@ public interface DerivedColumnList9 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the
@@ -98,6 +98,6 @@ public interface DerivedColumnList9 extends QueryPart {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/Name.java b/jOOQ/src/main/java/org/jooq/Name.java
index 634ea36a06..c053e6d33d 100644
--- a/jOOQ/src/main/java/org/jooq/Name.java
+++ b/jOOQ/src/main/java/org/jooq/Name.java
@@ -262,7 +262,7 @@ public interface Name extends QueryPart, Comparable<Name> {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record> CommonTableExpression<R> as(Select<R> select);
+    <R extends Record> CommonTableExpression<R> as(ResultQuery<R> query);
 
     /**
      * Specify a materialized subselect to refer to by the <code>Name</code> to
@@ -277,7 +277,7 @@ public interface Name extends QueryPart, Comparable<Name> {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record> CommonTableExpression<R> asMaterialized(Select<R> select);
+    <R extends Record> CommonTableExpression<R> asMaterialized(ResultQuery<R> query);
 
     /**
      * Specify a non-materialized subselect to refer to by the <code>Name</code>
@@ -292,7 +292,7 @@ public interface Name extends QueryPart, Comparable<Name> {
      */
     @NotNull
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    <R extends Record> CommonTableExpression<R> asNotMaterialized(Select<R> select);
+    <R extends Record> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query);
 
     /**
      * Add a list of fields to this name to make this name a
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep.java b/jOOQ/src/main/java/org/jooq/WithAsStep.java
index 4782f72233..817d1cc761 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep.java
@@ -106,7 +106,7 @@ public interface WithAsStep {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<?> select);
+    WithStep as(ResultQuery<?> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -118,7 +118,7 @@ public interface WithAsStep {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<?> select);
+    WithStep asMaterialized(ResultQuery<?> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -130,6 +130,6 @@ public interface WithAsStep {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<?> select);
+    WithStep asNotMaterialized(ResultQuery<?> query);
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep1.java b/jOOQ/src/main/java/org/jooq/WithAsStep1.java
index ff196babda..6d71107a07 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep1.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep1.java
@@ -66,7 +66,7 @@ public interface WithAsStep1 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record1<?>> select);
+    WithStep as(ResultQuery<? extends Record1<?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep1 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record1<?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record1<?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep1 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record1<?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record1<?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep10.java b/jOOQ/src/main/java/org/jooq/WithAsStep10.java
index 679291774e..656f29d54b 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep10.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep10.java
@@ -66,7 +66,7 @@ public interface WithAsStep10 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep10 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep10 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record10<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep11.java b/jOOQ/src/main/java/org/jooq/WithAsStep11.java
index 1eab21d111..14ee40b7ac 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep11.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep11.java
@@ -66,7 +66,7 @@ public interface WithAsStep11 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep11 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep11 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record11<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep12.java b/jOOQ/src/main/java/org/jooq/WithAsStep12.java
index b01930c9f9..56a4c7878c 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep12.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep12.java
@@ -66,7 +66,7 @@ public interface WithAsStep12 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep12 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep12 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record12<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep13.java b/jOOQ/src/main/java/org/jooq/WithAsStep13.java
index be6fcf8891..a1d1747aaf 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep13.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep13.java
@@ -66,7 +66,7 @@ public interface WithAsStep13 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep13 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep13 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record13<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep14.java b/jOOQ/src/main/java/org/jooq/WithAsStep14.java
index ee12ac4714..eb54c79df4 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep14.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep14.java
@@ -66,7 +66,7 @@ public interface WithAsStep14 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep14 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep14 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record14<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep15.java b/jOOQ/src/main/java/org/jooq/WithAsStep15.java
index a65cc4308a..23e419138c 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep15.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep15.java
@@ -66,7 +66,7 @@ public interface WithAsStep15 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep15 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep15 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record15<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep16.java b/jOOQ/src/main/java/org/jooq/WithAsStep16.java
index 77b66ae73c..43dffb0495 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep16.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep16.java
@@ -66,7 +66,7 @@ public interface WithAsStep16 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep16 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep16 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record16<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep17.java b/jOOQ/src/main/java/org/jooq/WithAsStep17.java
index 4d266f38d2..929f9e534b 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep17.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep17.java
@@ -66,7 +66,7 @@ public interface WithAsStep17 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep17 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep17 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record17<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep18.java b/jOOQ/src/main/java/org/jooq/WithAsStep18.java
index b82d063734..ee5d515d05 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep18.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep18.java
@@ -66,7 +66,7 @@ public interface WithAsStep18 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep18 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep18 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record18<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep19.java b/jOOQ/src/main/java/org/jooq/WithAsStep19.java
index f7e67fab5e..a38ad08b33 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep19.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep19.java
@@ -66,7 +66,7 @@ public interface WithAsStep19 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep19 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep19 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record19<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep2.java b/jOOQ/src/main/java/org/jooq/WithAsStep2.java
index 485304ee1d..477edac676 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep2.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep2.java
@@ -66,7 +66,7 @@ public interface WithAsStep2 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record2<?, ?>> select);
+    WithStep as(ResultQuery<? extends Record2<?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep2 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record2<?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record2<?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep2 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record2<?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record2<?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep20.java b/jOOQ/src/main/java/org/jooq/WithAsStep20.java
index 655b7419a0..b53f1f609c 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep20.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep20.java
@@ -66,7 +66,7 @@ public interface WithAsStep20 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep20 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep20 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record20<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep21.java b/jOOQ/src/main/java/org/jooq/WithAsStep21.java
index 7fcd4772c9..0cdfd0c1bf 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep21.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep21.java
@@ -66,7 +66,7 @@ public interface WithAsStep21 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep21 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep21 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record21<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep22.java b/jOOQ/src/main/java/org/jooq/WithAsStep22.java
index f5a1c5b13a..e5634cab3e 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep22.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep22.java
@@ -66,7 +66,7 @@ public interface WithAsStep22 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep22 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep22 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep3.java b/jOOQ/src/main/java/org/jooq/WithAsStep3.java
index 22ca228540..e7d8ab441a 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep3.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep3.java
@@ -66,7 +66,7 @@ public interface WithAsStep3 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record3<?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record3<?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep3 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record3<?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record3<?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep3 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record3<?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record3<?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep4.java b/jOOQ/src/main/java/org/jooq/WithAsStep4.java
index a69fc7608f..819d6c9037 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep4.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep4.java
@@ -66,7 +66,7 @@ public interface WithAsStep4 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record4<?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record4<?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep4 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record4<?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record4<?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep4 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record4<?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record4<?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep5.java b/jOOQ/src/main/java/org/jooq/WithAsStep5.java
index cdffc6d422..532c45d920 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep5.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep5.java
@@ -66,7 +66,7 @@ public interface WithAsStep5 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record5<?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record5<?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep5 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record5<?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record5<?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep5 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record5<?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record5<?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep6.java b/jOOQ/src/main/java/org/jooq/WithAsStep6.java
index a4235d90f8..11ef9d4c1a 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep6.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep6.java
@@ -66,7 +66,7 @@ public interface WithAsStep6 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record6<?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record6<?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep6 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record6<?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record6<?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep6 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record6<?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record6<?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep7.java b/jOOQ/src/main/java/org/jooq/WithAsStep7.java
index ef1c0808d3..0bed95787c 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep7.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep7.java
@@ -66,7 +66,7 @@ public interface WithAsStep7 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record7<?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record7<?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep7 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record7<?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record7<?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep7 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record7<?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record7<?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep8.java b/jOOQ/src/main/java/org/jooq/WithAsStep8.java
index 0cfa83dae4..e27a33b0f4 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep8.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep8.java
@@ -66,7 +66,7 @@ public interface WithAsStep8 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep8 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep8 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record8<?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep9.java b/jOOQ/src/main/java/org/jooq/WithAsStep9.java
index d415cbb074..0d1ba4f755 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep9.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep9.java
@@ -66,7 +66,7 @@ public interface WithAsStep9 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep as(Select<? extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep as(ResultQuery<? extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a materialized subselect with a common table expression's table
@@ -78,7 +78,7 @@ public interface WithAsStep9 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asMaterialized(Select<? extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asMaterialized(ResultQuery<? extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 
     /**
      * Associate a non-materialized subselect with a common table expression's
@@ -90,5 +90,5 @@ public interface WithAsStep9 {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE })
-    WithStep asNotMaterialized(Select<? extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> select);
+    WithStep asNotMaterialized(ResultQuery<? extends Record9<?, ?, ?, ?, ?, ?, ?, ?, ?>> query);
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractName.java b/jOOQ/src/main/java/org/jooq/impl/AbstractName.java
index 2875276429..f44f82c157 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractName.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractName.java
@@ -45,7 +45,7 @@ import org.jooq.CommonTableExpression;
 import org.jooq.Field;
 import org.jooq.Name;
 import org.jooq.Record;
-import org.jooq.Select;
+import org.jooq.ResultQuery;
 import org.jooq.WindowDefinition;
 import org.jooq.WindowSpecification;
 
@@ -89,20 +89,20 @@ abstract class AbstractName extends AbstractQueryPart implements Name, SimpleQue
 
     @SuppressWarnings("unchecked")
     @Override
-    public final <R extends Record> CommonTableExpression<R> as(Select<R> select) {
-        return fields(new String[0]).as(select);
+    public final <R extends Record> CommonTableExpression<R> as(ResultQuery<R> query) {
+        return fields(new String[0]).as(query);
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public final <R extends Record> CommonTableExpression<R> asMaterialized(Select<R> select) {
-        return fields(new String[0]).asMaterialized(select);
+    public final <R extends Record> CommonTableExpression<R> asMaterialized(ResultQuery<R> query) {
+        return fields(new String[0]).asMaterialized(query);
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public final <R extends Record> CommonTableExpression<R> asNotMaterialized(Select<R> select) {
-        return fields(new String[0]).asNotMaterialized(select);
+    public final <R extends Record> CommonTableExpression<R> asNotMaterialized(ResultQuery<R> query) {
+        return fields(new String[0]).asNotMaterialized(query);
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java
index 311062bb15..be9671d62a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java
@@ -56,6 +56,7 @@ import org.jooq.Field;
 // ...
 import org.jooq.QueryPart;
 import org.jooq.Record;
+import org.jooq.ResultQuery;
 import org.jooq.SQLDialect;
 import org.jooq.Select;
 import org.jooq.TableOptions;
@@ -73,22 +74,22 @@ final class CommonTableExpressionImpl<R extends Record> extends AbstractTable<R>
 
 
     private final DerivedColumnListImpl  name;
-    private final Select<R>              select;
+    private final ResultQuery<R>         query;
     private final FieldsImpl<R>          fields;
     private final Boolean                materialized;
 
-    CommonTableExpressionImpl(DerivedColumnListImpl name, Select<R> select, Boolean materialized) {
+    CommonTableExpressionImpl(DerivedColumnListImpl name, ResultQuery<R> query, Boolean materialized) {
         super(TableOptions.expression(), name.name);
 
         this.name = name;
-        this.select = select;
+        this.query = query;
         this.fields = fields1();
         this.materialized = materialized;
     }
 
     @Override
     public final Class<? extends R> getRecordType() {
-        return select.getRecordType();
+        return query.getRecordType();
     }
 
     @Override
@@ -104,7 +105,8 @@ final class CommonTableExpressionImpl<R extends Record> extends AbstractTable<R>
 
 
         if (ctx.declareCTE()) {
-            QueryPart s = select;
+            QueryPart s = query;
+
 
 
 
@@ -147,8 +149,8 @@ final class CommonTableExpressionImpl<R extends Record> extends AbstractTable<R>
     }
 
     final FieldsImpl<R> fields1() {
-        List<Field<?>> s = select.getSelect();
-        Field<?>[] f = new Field[Tools.degree(select)];
+        Field<?>[] s = query.fields();
+        Field<?>[] f = new Field[Tools.degree(query)];
 
         for (int i = 0; i < f.length; i++) {
             f[i] = DSL.field(
@@ -158,8 +160,8 @@ final class CommonTableExpressionImpl<R extends Record> extends AbstractTable<R>
                     // If the CTE has no explicit column names, inherit those of the subquery
                     name.fieldNames.length > 0
                         ? name.fieldNames[i]
-                        : s.get(i).getUnqualifiedName()),
-                (DataType<?>) (f.length == 1 ? Tools.scalarType(select) : s.get(i).getDataType())
+                        : s[i].getUnqualifiedName()),
+                (DataType<?>) (f.length == 1 ? Tools.scalarType(query) : s[i].getDataType())
             );
         }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
index 0317571405..98981769ec 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
@@ -69,7 +69,7 @@ import org.jooq.DerivedColumnList8;
 import org.jooq.DerivedColumnList9;
 import org.jooq.Field;
 import org.jooq.Name;
-import org.jooq.Select;
+import org.jooq.ResultQuery;
 
 /**
  * @author Lukas Eder
@@ -122,36 +122,36 @@ implements
         this.fieldNameFunction = fieldNameFunction;
     }
 
-    final CommonTableExpression as0(Select select, Boolean materialized) {
-        Select<?> s = select;
+    final CommonTableExpression as0(ResultQuery query, Boolean materialized) {
+        ResultQuery<?> q = query;
 
         if (fieldNameFunction != null)
             return new CommonTableExpressionImpl(
                 new DerivedColumnListImpl(name, map(
-                    s.getSelect(),
-                    (f, i) -> DSL.name(fieldNameFunction.apply(s.getSelect().get(i), i)),
+                    q.fields(),
+                    (f, i) -> DSL.name(fieldNameFunction.apply(f, i)),
                     Name[]::new
                 )),
-                s,
+                q,
                 materialized
             );
         else
-            return new CommonTableExpressionImpl(this, s, materialized);
+            return new CommonTableExpressionImpl(this, q, materialized);
     }
 
     @Override
-    public final CommonTableExpression as(Select select) {
-        return as0(select, null);
+    public final CommonTableExpression as(ResultQuery query) {
+        return as0(query, null);
     }
 
     @Override
-    public final CommonTableExpression asMaterialized(Select select) {
-        return as0(select, true);
+    public final CommonTableExpression asMaterialized(ResultQuery query) {
+        return as0(query, true);
     }
 
     @Override
-    public final CommonTableExpression asNotMaterialized(Select select) {
-        return as0(select, false);
+    public final CommonTableExpression asNotMaterialized(ResultQuery query) {
+        return as0(query, false);
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 56497ce302..800687d9ff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -2002,8 +2002,6 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
 
 
-
-
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index 27ab0f55c6..5c348409f2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -271,6 +271,7 @@ import org.jooq.RenderContext;
 import org.jooq.RenderContext.CastMode;
 import org.jooq.Result;
 import org.jooq.ResultOrRows;
+import org.jooq.ResultQuery;
 import org.jooq.Results;
 import org.jooq.Row;
 import org.jooq.SQLDialect;
@@ -3282,7 +3283,7 @@ final class Tools {
             return null;
     }
 
-    static final int degree(Select<?> select) {
+    static final int degree(ResultQuery<?> query) {
 
 
 
@@ -3290,10 +3291,10 @@ final class Tools {
 
 
 
-        return select.getSelect().size();
+        return query.fields().length;
     }
 
-    static final List<DataType<?>> dataTypes(Select<?> select) {
+    static final List<DataType<?>> dataTypes(ResultQuery<?> query) {
 
 
 
@@ -3305,11 +3306,11 @@ final class Tools {
 
 
 
-        return map(select.getSelect(), f -> f.getDataType());
+        return map(query.fields(), f -> f.getDataType());
     }
 
-    static final DataType<?> scalarType(Select<?> select) {
-        List<DataType<?>> list = dataTypes(select);
+    static final DataType<?> scalarType(ResultQuery<?> query) {
+        List<DataType<?>> list = dataTypes(query);
 
         if (list.size() != 1)
             throw new IllegalStateException("Only single-column selects have a scalar type");
diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
index 65d7c2e6ab..a2b2b17ef8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
@@ -94,9 +94,9 @@ import org.jooq.Record6;
 import org.jooq.Record7;
 import org.jooq.Record8;
 import org.jooq.Record9;
+import org.jooq.ResultQuery;
 import org.jooq.SQL;
 import org.jooq.SQLDialect;
-import org.jooq.Select;
 import org.jooq.SelectField;
 import org.jooq.SelectFieldOrAsterisk;
 import org.jooq.SelectSelectStep;
@@ -252,7 +252,7 @@ implements
     // XXX With API
     // -------------------------------------------------------------------------
 
-    private final WithStep as0(Select select, Boolean materialized) {
+    private final WithStep as0(ResultQuery query, Boolean materialized) {
         DerivedColumnList dcl;
 
         if (fieldNameFunction != null)
@@ -263,11 +263,11 @@ implements
         CommonTableExpression cte;
 
         if (materialized == null)
-            cte = dcl.as(select);
+            cte = dcl.as(query);
         else if (materialized)
-            cte = dcl.asMaterialized(select);
+            cte = dcl.asMaterialized(query);
         else
-            cte = dcl.asNotMaterialized(select);
+            cte = dcl.asNotMaterialized(query);
 
         this.ctes.add(cte);
         this.alias = null;
@@ -278,18 +278,18 @@ implements
     }
 
     @Override
-    public final WithStep as(Select select) {
-        return as0(select, null);
+    public final WithStep as(ResultQuery query) {
+        return as0(query, null);
     }
 
     @Override
-    public final WithStep asMaterialized(Select select) {
-        return as0(select, true);
+    public final WithStep asMaterialized(ResultQuery query) {
+        return as0(query, true);
     }
 
     @Override
-    public final WithStep asNotMaterialized(Select select) {
-        return as0(select, false);
+    public final WithStep asNotMaterialized(ResultQuery query) {
+        return as0(query, false);
     }
 
     @Override