From 021dff0c5284fa82e007258c34f910b5bca3987a Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 11 Jul 2024 09:30:32 +0200 Subject: [PATCH] [jOOQ/jOOQ#14965] Java 8 fix Java 8 seemingly cannot infer the Exception type to be a RuntimeException (yet), so the functional approach won't work, regrettably. --- .../main/java/org/jooq/impl/SelectQueryImpl.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 446bbccd29..ca970f6225 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -629,7 +629,21 @@ final class SelectQueryImpl extends AbstractResultQuery imp } if (CopyClause.UNION.between(start, end)) { - result.union.addAll(map(union, l -> new QueryPartList<>(map(l, (Select s) -> apply(selectQueryImpl(s), q -> q.copy(x -> {})))))); + for (QueryPartList> u : union) { + QueryPartList> l = new QueryPartList<>(); + + for (Select s : u) { + SelectQueryImpl q = selectQueryImpl(s); + + if (q != null) + q = q.copy(x -> {}); + + l.add(q); + } + + result.union.add(l); + } + result.unionOp.addAll(unionOp); result.unionOrderBy.addAll(unionOrderBy);