From 44c026475da41dff930ebef8367f173c56d489bf Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 28 Feb 2024 16:51:38 +0100 Subject: [PATCH] [jOOQ/jOOQ#16367] Fix regression when projecting nested rows --- jOOQ/src/main/java/org/jooq/impl/SelectFieldList.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectFieldList.java b/jOOQ/src/main/java/org/jooq/impl/SelectFieldList.java index 2bdf8b5edb..a88309854c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectFieldList.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectFieldList.java @@ -92,11 +92,10 @@ final class SelectFieldList extends QueryPartLi @SuppressWarnings("unchecked") private void acceptElement0(Context ctx, F part) { - visitAutoAliased(ctx, part, Context::declareFields, (c, t) -> { - if (c.declareFields() && part instanceof Field f) - super.acceptElement(c, (F) Tools.castNullLiteralIfNeeded(c, f)); - else - super.acceptElement(c, t); - }); + if (ctx.declareFields() && part instanceof Field f) { + part = (F) Tools.castNullLiteralIfNeeded(ctx, f); + } + + visitAutoAliased(ctx, part, Context::declareFields, (c, t) -> super.acceptElement(c, t)); } }