diff --git a/jOOQ/src/main/java/org/jooq/XMLExistsPassingStep.java b/jOOQ/src/main/java/org/jooq/XMLExistsPassingStep.java
index c0e0fcb743..bc7d045ed3 100644
--- a/jOOQ/src/main/java/org/jooq/XMLExistsPassingStep.java
+++ b/jOOQ/src/main/java/org/jooq/XMLExistsPassingStep.java
@@ -41,6 +41,7 @@ package org.jooq;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
+// ...
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/jOOQ/src/main/java/org/jooq/XMLQueryPassingStep.java b/jOOQ/src/main/java/org/jooq/XMLQueryPassingStep.java
index 59eb03fc68..62421c7938 100644
--- a/jOOQ/src/main/java/org/jooq/XMLQueryPassingStep.java
+++ b/jOOQ/src/main/java/org/jooq/XMLQueryPassingStep.java
@@ -41,6 +41,7 @@ package org.jooq;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
+// ...
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Keywords.java b/jOOQ/src/main/java/org/jooq/impl/Keywords.java
index b233f668ee..6739774964 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Keywords.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Keywords.java
@@ -169,6 +169,7 @@ final class Keywords {
     static final Keyword K_EXECUTE_BLOCK            = keyword("execute block");
     static final Keyword K_EXECUTE_IMMEDIATE        = keyword("execute immediate");
     static final Keyword K_EXECUTE_STATEMENT        = keyword("execute statement");
+    static final Keyword K_EXIST                    = keyword("exist");
     static final Keyword K_EXISTS                   = keyword("exists");
     static final Keyword K_EXIT                     = keyword("exit");
     static final Keyword K_EXPLICIT                 = keyword("explicit");
@@ -321,6 +322,7 @@ final class Keywords {
     static final Keyword K_PROCEDURE                = keyword("procedure");
     static final Keyword K_PUBLIC                   = keyword("public");
     static final Keyword K_QUALIFY                  = keyword("qualify");
+    static final Keyword K_QUERY                    = keyword("query");
     static final Keyword K_RAISE                    = keyword("raise");
     static final Keyword K_RAISERROR                = keyword("raiserror");
     static final Keyword K_RAW                      = keyword("raw");
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLExists.java b/jOOQ/src/main/java/org/jooq/impl/XMLExists.java
index 5f88b4e747..083c9a6460 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLExists.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLExists.java
@@ -37,6 +37,9 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.conf.ParamType.INLINED;
+import static org.jooq.impl.Keywords.K_EXIST;
+import static org.jooq.impl.Keywords.K_EXISTS;
 import static org.jooq.impl.Keywords.K_XMLEXISTS;
 import static org.jooq.impl.QOM.XMLPassingMechanism.BY_REF;
 import static org.jooq.impl.QOM.XMLPassingMechanism.BY_VALUE;
@@ -55,6 +58,7 @@ import org.jooq.QueryPart;
 // ...
 import org.jooq.XML;
 import org.jooq.XMLExistsPassingStep;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.UNotYetImplemented;
 import org.jooq.impl.QOM.XMLPassingMechanism;
 
@@ -116,10 +120,20 @@ final class XMLExists extends AbstractCondition implements XMLExistsPassingStep,
 
     @Override
     public final void accept(Context<?> ctx) {
-        ctx.visit(K_XMLEXISTS).sqlIndentStart('(');
-        acceptXPath(ctx, xpath);
-        acceptPassing(ctx, passing, passingMechanism);
-        ctx.sqlIndentEnd(')');
+        switch (ctx.family()) {
+
+
+
+
+
+
+            default:
+                ctx.visit(K_XMLEXISTS).sqlIndentStart('(');
+                acceptXPath(ctx, xpath);
+                acceptPassing(ctx, passing, passingMechanism);
+                ctx.sqlIndentEnd(')');
+                break;
+        }
     }
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java
index 3e62358fe4..d18f8eebbe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java
@@ -38,10 +38,13 @@
 package org.jooq.impl;
 
 // ...
+import static org.jooq.conf.ParamType.INLINED;
 import static org.jooq.impl.DSL.select;
 import static org.jooq.impl.DSL.unnest;
 import static org.jooq.impl.DSL.xmlagg;
 import static org.jooq.impl.Keywords.K_CONTENT;
+import static org.jooq.impl.Keywords.K_EXISTS;
+import static org.jooq.impl.Keywords.K_QUERY;
 import static org.jooq.impl.Keywords.K_RETURNING;
 import static org.jooq.impl.Names.N_XMLQUERY;
 import static org.jooq.impl.QOM.XMLPassingMechanism.BY_REF;
@@ -139,6 +142,12 @@ final class XMLQuery extends AbstractField<XML> implements XMLQueryPassingStep,
 
                 break;
 
+
+
+
+
+
+
             default:
                 ctx.visit(N_XMLQUERY).sqlIndentStart('(');
                 acceptXPath(ctx, xpath);