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 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();