github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#11265] Internal DataKey.DATA_PREPEND_SQL functionality should

Browse Source 
be cumulative
This commit is contained in:
Lukas Eder 2021-01-29 18:21:10 +01:00
parent 4672fc15bc
commit 50c32272e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ/src/main/java/org/jooq/impl/ForLock.java
View File

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

4
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -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;