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

[#5666] Add support for Oracle 12c result sets returned from procedures

Browse Source
This commit is contained in:
lukaseder 2017-02-07 15:58:41 +01:00
parent c0de46eef8
commit 505a424ef0
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
View File

@ -40,6 +40,7 @@ import static java.util.Arrays.asList;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
// ...
import static org.jooq.SQLDialect.CUBRID;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
import static org.jooq.impl.DSL.field;
@ -251,6 +252,9 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
protected final int execute(ExecuteContext ctx, ExecuteListener listener) throws SQLException {
listener.executeStart(ctx);
// [#5666] Avoid calling Statement.getUpdateCount() twice
Integer updateCount = null;
// [#4511] [#4753] PostgreSQL doesn't like fetchSize with autoCommit == true
int f = SettingsTools.getFetchSize(fetchSize, ctx.settings());
if (ctx.family() == POSTGRES && f != 0 && ctx.connection().getAutoCommit())
@ -265,6 +269,28 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
if (ctx.statement().execute()) {
ctx.resultSet(ctx.statement().getResultSet());
}
@ -281,9 +307,9 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
// not a result set.
if (ctx.resultSet() == null) {
DSLContext dsl = DSL.using(ctx.configuration());
Field<Integer> updateCount = field(name("UPDATE_COUNT"), int.class);
Result<Record1<Integer>> r = dsl.newResult(updateCount);
r.add(dsl.newRecord(updateCount).values(ctx.statement().getUpdateCount()));
Field<Integer> c = field(name("UPDATE_COUNT"), int.class);
Result<Record1<Integer>> r = dsl.newResult(c);
r.add(dsl.newRecord(c).values(updateCount != null ? updateCount : ctx.statement().getUpdateCount()));
ctx.resultSet(new MockResultSet(r));
}