From ca8d516e6028649405da8a70046f8e0a9d780a36 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 17 Sep 2020 11:44:18 +0200 Subject: [PATCH] [jOOQ/jOOQ#7312] Fix regression --- jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java index 95a2026a8f..234d5b32c4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java @@ -521,25 +521,26 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query { int i = 0; forceSettingsLoop: for (;;) { - render = new DefaultRenderContext(c); - render.data(DATA_FORCE_SETTINGS, true); - try { if (ctx.type() == DDL) { ctx.data(DATA_FORCE_STATIC_STATEMENT, true); + render = render(c); result = new Rendered(render.paramType(INLINED).visit(this).render(), null, render.peekSkipUpdateCounts()); } else if (executePreparedStatements(configuration().settings())) { try { + render = render(c); render.data(DATA_COUNT_BIND_VALUES, true); result = new Rendered(render.visit(this).render(), render.bindValues(), render.peekSkipUpdateCounts()); } catch (DefaultRenderContext.ForceInlineSignal e) { ctx.data(DATA_FORCE_STATIC_STATEMENT, true); + render = render(c); result = new Rendered(render.paramType(INLINED).visit(this).render(), null, render.peekSkipUpdateCounts()); } } else { + render = render(c); result = new Rendered(render.paramType(INLINED).visit(this).render(), null, render.peekSkipUpdateCounts()); } @@ -582,6 +583,12 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query { return result; } + private final DefaultRenderContext render(Configuration c) { + DefaultRenderContext render = new DefaultRenderContext(c); + render.data(DATA_FORCE_SETTINGS, true); + return render; + } +