From 7d00425231f19f307178a7d772d805dff7510c81 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 11 Jan 2013 17:50:46 +0100 Subject: [PATCH] [#2118] Let Row extend Iterable> --- jOOQ-tools/src/org/jooq/xtend/Rows.xtend | 10 ++++++++++ jOOQ/src/main/java/org/jooq/Row.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RowImpl.java | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend index 58c450197a..62db2d474a 100644 --- a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend +++ b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend @@ -1117,11 +1117,13 @@ class Rows extends Generators { «classHeader» package org.jooq.impl; + import static java.util.Arrays.asList; import static org.jooq.impl.Factory.row; import static org.jooq.impl.Factory.vals; import java.util.Arrays; import java.util.Collection; + import java.util.Iterator; import javax.annotation.Generated; @@ -2114,6 +2116,14 @@ class Rows extends Generators { public final Condition overlaps(Row2 row) { return new RowOverlapsCondition(this, row); } + + // ------------------------------------------------------------------------ + // XXX: Other + // ------------------------------------------------------------------------ + @Override + public final Iterator> iterator() { + return asList(fields).iterator(); + } } '''); diff --git a/jOOQ/src/main/java/org/jooq/Row.java b/jOOQ/src/main/java/org/jooq/Row.java index 574aa30856..44e07c64ab 100644 --- a/jOOQ/src/main/java/org/jooq/Row.java +++ b/jOOQ/src/main/java/org/jooq/Row.java @@ -44,7 +44,7 @@ package org.jooq; * * @author Lukas Eder */ -public interface Row extends QueryPart { +public interface Row extends QueryPart, Iterable> { /** * Get the degree of this row value expression diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java index 351acc7e84..fbfcec9e02 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java @@ -35,11 +35,13 @@ */ package org.jooq.impl; +import static java.util.Arrays.asList; import static org.jooq.impl.Factory.row; import static org.jooq.impl.Factory.vals; import java.util.Arrays; import java.util.Collection; +import java.util.Iterator; import javax.annotation.Generated; @@ -9508,4 +9510,12 @@ implements public final Condition overlaps(Row2 row) { return new RowOverlapsCondition(this, row); } + + // ------------------------------------------------------------------------ + // XXX: Other + // ------------------------------------------------------------------------ + @Override + public final Iterator> iterator() { + return asList(fields).iterator(); + } }