From 63d761a16d8b35900259482e577e900a53d4246a Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 17 Sep 2014 17:49:27 +0200 Subject: [PATCH] [#3638] Let ResultQuery extend Iterable --- jOOQ/src/main/java/org/jooq/ResultQuery.java | 2 +- jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java | 6 ++++++ jOOQ/src/main/java/org/jooq/impl/SelectImpl.java | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java index 4f4f071ac4..e2ca1a37fd 100644 --- a/jOOQ/src/main/java/org/jooq/ResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java @@ -73,7 +73,7 @@ import org.jooq.impl.DefaultRecordMapper; * * @author Lukas Eder */ -public interface ResultQuery extends Query { +public interface ResultQuery extends Query, Iterable { /** * Return the result generated by a previous call to execute(). diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java index c921bd55ea..32f86d88d0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java @@ -55,6 +55,7 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -338,6 +339,11 @@ abstract class AbstractResultQuery extends AbstractQuery imple return fetchLazy().resultSet(); } + @Override + public final Iterator iterator() { + return fetchLazy().iterator(); + } + @Override public final Cursor fetchLazy() { return fetchLazy(fetchSize); diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java index 04fa33c476..1724347554 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java @@ -48,6 +48,7 @@ import static org.jooq.impl.DSL.table; import java.sql.ResultSet; import java.util.Arrays; import java.util.Collection; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -2314,6 +2315,11 @@ class SelectImpl iterator() { + return getDelegate().iterator(); + } + @Override public final Cursor fetchLazy() { return getDelegate().fetchLazy();