From 50c32272e934de9230ed4da7c0499fdf6174fb6e Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 29 Jan 2021 18:21:10 +0100
Subject: [PATCH] [jOOQ/jOOQ#11265] Internal DataKey.DATA_PREPEND_SQL
 functionality should be cumulative

---
 jOOQ/src/main/java/org/jooq/impl/ForLock.java | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Tools.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/ForLock.java b/jOOQ/src/main/java/org/jooq/impl/ForLock.java
index 18dd958c5d..03ad2b7f24 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ForLock.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ForLock.java
@@ -176,7 +176,7 @@ final class ForLock extends AbstractQueryPart {
 
             // [#11243] PostgreSQL FOR UPDATE WAIT <n> emulation
             if (forLockWaitMode == ForLockWaitMode.WAIT && EMULATE_FOR_UPDATE_WAIT.contains(ctx.dialect())) {
-                prependSQL(ctx.skipUpdateCount(), ctx.dsl().queries(ctx.dsl().setLocal(N_LOCK_TIMEOUT, inline(forLockWait * 1000))));
+                prependSQL(ctx.skipUpdateCount(), ctx.dsl().setLocal(N_LOCK_TIMEOUT, inline(forLockWait * 1000)));
             }
             else {
                 ctx.sql(' ').visit(forLockWaitMode.toKeyword());
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index a4b1497ae3..535f223f4a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -5070,9 +5070,9 @@ final class Tools {
         return VARCHAR(length).nullability(type.nullability()).defaultValue((Field) type.defaultValue());
     }
 
-    static <C extends Context<? extends C>> C prependSQL(C ctx, Queries queries) {
+    static <C extends Context<? extends C>> C prependSQL(C ctx, Query... queries) {
         ctx.data().compute(DataKey.DATA_PREPEND_SQL, (k, v) -> {
-            String sql = ctx.dsl().renderInlined(queries);
+            String sql = ctx.dsl().renderInlined(ctx.dsl().queries(queries));
 
             if (v == null)
                 return sql;