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:18:24 +01:00
parent 6a0b4714cd
commit 4672fc15bc
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java
View File

@ -144,9 +144,6 @@ package org.jooq.impl;

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

@ -253,8 +253,6 @@ package org.jooq.impl;

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

@ -55,19 +55,17 @@ import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.impl.DSL.inline;
import static org.jooq.impl.DSL.sql;
import static org.jooq.impl.Keywords.K_FOR;
import static org.jooq.impl.Keywords.K_LOCAL;
import static org.jooq.impl.Keywords.K_LOCK_IN_SHARE_MODE;
import static org.jooq.impl.Keywords.K_NOWAIT;
import static org.jooq.impl.Keywords.K_OF;
import static org.jooq.impl.Keywords.K_READPAST;
import static org.jooq.impl.Keywords.K_ROWLOCK;
import static org.jooq.impl.Keywords.K_SET;
import static org.jooq.impl.Keywords.K_UPDLOCK;
import static org.jooq.impl.Keywords.K_WITH;
import static org.jooq.impl.Keywords.K_WITH_LOCK;
import static org.jooq.impl.Names.N_LOCK_TIMEOUT;
import static org.jooq.impl.QueryPartCollectionView.wrap;
import static org.jooq.impl.Tools.DataKey.DATA_PREPEND_SQL;
import static org.jooq.impl.Tools.prependSQL;
import java.util.Set;
@ -79,7 +77,6 @@ import org.jooq.QueryPart;
import org.jooq.SQLDialect;
import org.jooq.Select;
import org.jooq.Table;
import org.jooq.impl.ForLock.ForLockWaitMode;
import org.jooq.impl.Tools.DataExtendedKey;
/**
@ -179,18 +176,13 @@ final class ForLock extends AbstractQueryPart {
// [#11243] PostgreSQL FOR UPDATE WAIT <n> emulation
if (forLockWaitMode == ForLockWaitMode.WAIT && EMULATE_FOR_UPDATE_WAIT.contains(ctx.dialect())) {
ctx.skipUpdateCount().data(DATA_PREPEND_SQL, ctx.dsl().renderInlined(
ctx.dsl().queries(ctx.dsl().setLocal(N_LOCK_TIMEOUT, inline(forLockWait * 1000)))
));
prependSQL(ctx.skipUpdateCount(), ctx.dsl().queries(ctx.dsl().setLocal(N_LOCK_TIMEOUT, inline(forLockWait * 1000))));
}
else {
ctx.sql(' ');
ctx.visit(forLockWaitMode.toKeyword());
ctx.sql(' ').visit(forLockWaitMode.toKeyword());
if (forLockWaitMode == ForLockWaitMode.WAIT) {
ctx.sql(' ');
ctx.sql(forLockWait);
}
if (forLockWaitMode == ForLockWaitMode.WAIT)
ctx.sql(' ').sql(forLockWait);
}
}
}

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

@ -253,6 +253,7 @@ import org.jooq.OrderField;
import org.jooq.Param;
// ...
import org.jooq.QualifiedAsterisk;
import org.jooq.Queries;
import org.jooq.Query;
import org.jooq.QueryPart;
import org.jooq.Record;
@ -302,6 +303,8 @@ import org.jooq.types.UInteger;
import org.jooq.types.ULong;
import org.jooq.types.UShort;
import org.jetbrains.annotations.NotNull;
/**
* General internal jOOQ utilities
*
@ -5067,6 +5070,19 @@ 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) {
ctx.data().compute(DataKey.DATA_PREPEND_SQL, (k, v) -> {
String sql = ctx.dsl().renderInlined(queries);
if (v == null)
return sql;
else
return v + sql;
});
return ctx;
}
// -------------------------------------------------------------------------
// XXX: ForkJoinPool ManagedBlock implementation
// -------------------------------------------------------------------------