From 5e0d00afece73b1737538b2020c83b9c0e8de0c8 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 31 Oct 2022 10:22:12 +0100
Subject: [PATCH] [jOOQ/jOOQ#14153] Make NullStatement a UTransient QueryPart

---
 jOOQ/src/main/java/org/jooq/impl/BlockImpl.java     | 5 ++++-
 jOOQ/src/main/java/org/jooq/impl/NullStatement.java | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
index d602f80746..23b31b1569 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
@@ -73,7 +73,9 @@ import static org.jooq.impl.Keywords.K_IF;
 import static org.jooq.impl.Keywords.K_NOT;
 import static org.jooq.impl.Keywords.K_THEN;
 import static org.jooq.impl.Keywords.K_TRUE;
+import static org.jooq.impl.Tools.collect;
 import static org.jooq.impl.Tools.decrement;
+import static org.jooq.impl.Tools.filter;
 import static org.jooq.impl.Tools.increment;
 import static org.jooq.impl.Tools.toplevel;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_FORCE_STATIC_STATEMENT;
@@ -138,7 +140,8 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
     BlockImpl(Configuration configuration, Collection<? extends Statement> statements, boolean alwaysWrapInBeginEnd) {
         super(configuration);
 
-        this.statements = statements;
+        // [#14153] Remove NullStatement as it is UTransient
+        this.statements = collect(filter(statements, s -> !(s instanceof NullStatement)));
         this.alwaysWrapInBeginEnd = alwaysWrapInBeginEnd;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/NullStatement.java b/jOOQ/src/main/java/org/jooq/impl/NullStatement.java
index c2c6248757..e7a5c614bb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NullStatement.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NullStatement.java
@@ -46,7 +46,7 @@ import static org.jooq.impl.Keywords.K_IF;
 import static org.jooq.impl.Keywords.K_NULL;
 
 import org.jooq.Context;
-import org.jooq.impl.QOM.UEmpty;
+import org.jooq.impl.QOM.UTransient;
 
 /**
  * @author Lukas Eder
@@ -56,7 +56,7 @@ extends
     AbstractStatement
 implements
     QOM.NullStatement,
-    UEmpty
+    UTransient
 {
 
     static final NullStatement INSTANCE = new NullStatement();