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

[jOOQ/jOOQ#13563] INSERT .. RETURNING emulations shouldn't acquire

Browse Source 
multiple connections from ConnectionProvider when using
ThreadLocalTransactionProvider
This commit is contained in:
Lukas Eder 2022-05-17 16:23:25 +02:00
parent 3d4af4f206
commit 0b7e91c18b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
View File

@ -93,6 +93,7 @@ import org.jooq.VisitListenerProvider;
import org.jooq.conf.Settings;
import org.jooq.conf.SettingsTools;
import org.jooq.exception.ConfigurationException;
import org.jooq.impl.DefaultExecuteContext.ExecuteContextConnectionProvider;
import org.jooq.impl.ThreadLocalTransactionProvider.ThreadLocalConnectionProvider;
import org.jooq.migrations.xml.jaxb.MigrationsType;
@ -1309,9 +1310,8 @@ public class DefaultConfiguration extends AbstractConfiguration {
this.connectionProvider = newConnectionProvider;
}
else {
else
this.connectionProvider = new NoConnectionProvider();
}
return this;
}
@ -1353,7 +1353,9 @@ public class DefaultConfiguration extends AbstractConfiguration {
@Override
public final Configuration set(TransactionProvider newTransactionProvider) {
if (newTransactionProvider != null) {
// [#4277] [#13563] We're already in an ExecuteContext, no further
// transactions are needed.
if (newTransactionProvider != null && !(this.connectionProvider instanceof ExecuteContextConnectionProvider)) {
this.transactionProvider = newTransactionProvider;
if (newTransactionProvider instanceof ThreadLocalTransactionProvider)

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

@ -698,7 +698,7 @@ class DefaultExecuteContext implements ExecuteContext {
this.serverOutput = output;
}
private final class ExecuteContextConnectionProvider implements ConnectionProvider {
final class ExecuteContextConnectionProvider implements ConnectionProvider {
@NotNull
@Override