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

[#1157] Add SQL / JDBC tracing capabilities in addition to logging - fixed broken ResultQuery.fetchMany()

Browse Source
This commit is contained in:
Lukas Eder 2012-02-26 18:18:02 +00:00
parent 35b85c26e1
commit 3cb4363c5f
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
for (;;) {
FieldProvider fields = new MetaDataFieldProvider(ctx, ctx.resultSet().getMetaData());
Cursor<Record> c = new CursorImpl<Record>(ctx, listener, fields);
Cursor<Record> c = new CursorImpl<Record>(ctx, listener, fields, true);
results.add(c.fetch());
if (ctx.statement().getMoreResults()) {

26
jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
View File

@ -83,17 +83,25 @@ class CursorImpl<R extends Record> implements Cursor<R> {
private transient CursorResultSet rs;
private transient Iterator<R> iterator;
@SuppressWarnings("unchecked")
CursorImpl(ExecuteContext ctx, ExecuteListener listener, FieldProvider fields) {
this(ctx, listener, fields, (Class<? extends R>) RecordImpl.class);
this(ctx, listener, fields, false);
}
@SuppressWarnings("unchecked")
CursorImpl(ExecuteContext ctx, ExecuteListener listener, FieldProvider fields, boolean keepStatementOpen) {
this(ctx, listener, fields, (Class<? extends R>) RecordImpl.class, keepStatementOpen);
}
CursorImpl(ExecuteContext ctx, ExecuteListener listener, FieldProvider fields, Class<? extends R> type) {
this(ctx, listener, fields, type, false);
}
CursorImpl(ExecuteContext ctx, ExecuteListener listener, FieldProvider fields, Class<? extends R> type, boolean keepStatementOpen) {
this.ctx = ctx;
this.listener = (listener != null ? listener : new ExecuteListeners(ctx));
this.fields = fields;
this.type = type;
this.rs = new CursorResultSet();
this.rs = new CursorResultSet(keepStatementOpen);
}
@Override
@ -225,6 +233,12 @@ class CursorImpl<R extends Record> implements Cursor<R> {
*/
private final class CursorResultSet implements ResultSet {
private final boolean keepStatementOpen;
CursorResultSet(boolean keepStatementOpen) {
this.keepStatementOpen = keepStatementOpen;
}
@Override
public final <T> T unwrap(Class<T> iface) throws SQLException {
return ctx.resultSet().unwrap(iface);
@ -243,7 +257,11 @@ class CursorImpl<R extends Record> implements Cursor<R> {
@Override
public final void close() throws SQLException {
ctx.resultSet().close();
ctx.statement().close();
if (!keepStatementOpen) {
ctx.statement().close();
}
listener.fetchEnd(ctx);
}