diff --git a/jOOQ/src/main/java/org/jooq/SelectForStep.java b/jOOQ/src/main/java/org/jooq/SelectForStep.java
index 93a0082947..c024cf69b8 100644
--- a/jOOQ/src/main/java/org/jooq/SelectForStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectForStep.java
@@ -40,10 +40,12 @@ package org.jooq;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.H2;
 import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
 // ...
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectForXMLCommonDirectivesStep.java b/jOOQ/src/main/java/org/jooq/SelectForXMLCommonDirectivesStep.java
index 3c15437be3..41edff374a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectForXMLCommonDirectivesStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectForXMLCommonDirectivesStep.java
@@ -37,6 +37,10 @@
  */
 package org.jooq;
 
+// ...
+// ...
+import static org.jooq.SQLDialect.POSTGRES;
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectForXMLRawDirectivesStep.java b/jOOQ/src/main/java/org/jooq/SelectForXMLRawDirectivesStep.java
index 851fa6b315..1966ac634b 100644
--- a/jOOQ/src/main/java/org/jooq/SelectForXMLRawDirectivesStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectForXMLRawDirectivesStep.java
@@ -37,6 +37,10 @@
  */
 package org.jooq;
 
+// ...
+// ...
+import static org.jooq.SQLDialect.POSTGRES;
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectForXMLStep.java b/jOOQ/src/main/java/org/jooq/SelectForXMLStep.java
index df09e89084..6e0046916a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectForXMLStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectForXMLStep.java
@@ -37,6 +37,10 @@
  */
 package org.jooq;
 
+// ...
+// ...
+import static org.jooq.SQLDialect.POSTGRES;
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index b7fc5353ed..514707875b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -100,10 +100,19 @@ import static org.jooq.impl.DSL.asterisk;
 import static org.jooq.impl.DSL.falseCondition;
 import static org.jooq.impl.DSL.inline;
 import static org.jooq.impl.DSL.jsonArrayAgg;
+import static org.jooq.impl.DSL.jsonEntry;
+import static org.jooq.impl.DSL.jsonObject;
+import static org.jooq.impl.DSL.length;
 import static org.jooq.impl.DSL.name;
 import static org.jooq.impl.DSL.one;
 import static org.jooq.impl.DSL.orderBy;
 import static org.jooq.impl.DSL.row;
+import static org.jooq.impl.DSL.select;
+import static org.jooq.impl.DSL.substring;
+import static org.jooq.impl.DSL.table;
+import static org.jooq.impl.DSL.xmlagg;
+import static org.jooq.impl.DSL.xmlattributes;
+import static org.jooq.impl.DSL.xmlelement;
 import static org.jooq.impl.JSONObject.NO_SUPPORT_ABSENT_ON_NULL;
 import static org.jooq.impl.Keywords.K_AND;
 import static org.jooq.impl.Keywords.K_BY;
@@ -133,6 +142,7 @@ import static org.jooq.impl.ScopeMarkers.BEFORE_FIRST_TOP_LEVEL_CTE;
 import static org.jooq.impl.Tools.EMPTY_FIELD;
 import static org.jooq.impl.Tools.fieldArray;
 import static org.jooq.impl.Tools.hasAmbiguousNames;
+import static org.jooq.impl.Tools.qualify;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_COLLECT_SEMI_ANTI_JOIN;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_INSERT_SELECT_WITHOUT_INSERT_COLUMN_LIST;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_NESTED_SET_OPERATIONS;
@@ -152,7 +162,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -191,6 +203,7 @@ import org.jooq.TableOnStep;
 import org.jooq.TableOptionalOnStep;
 import org.jooq.TablePartitionByStep;
 import org.jooq.WindowDefinition;
+import org.jooq.XML;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.ForLock.ForLockMode;
 import org.jooq.impl.ForLock.ForLockWaitMode;
@@ -557,6 +570,60 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+