diff options
| author | Paul Phillips <paulp@improving.org> | 2011-11-07 18:22:56 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-11-07 18:22:56 +0000 |
| commit | 106180d020d3436b29432235fffe098d15fa7422 (patch) | |
| tree | 50f29ff0057280fd1267bbcc49407481b26a0954 /src/dbc | |
| parent | 481096f2c56fbf1b14fff2142917a46668b7c3b2 (diff) | |
| download | scala-106180d020d3436b29432235fffe098d15fa7422.tar.gz scala-106180d020d3436b29432235fffe098d15fa7422.tar.bz2 scala-106180d020d3436b29432235fffe098d15fa7422.zip | |
Third collections commit from Todd Vierling.
Misc cleanups associated with the previous commits: limiting overly
expanded types, fixing externally visible types for scaladoc, utilizing
abstract collection classes where possible, etc.
Diffstat (limited to 'src/dbc')
| -rw-r--r-- | src/dbc/scala/dbc/result/Relation.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala index 4897cd1030..98d653d61e 100644 --- a/src/dbc/scala/dbc/result/Relation.scala +++ b/src/dbc/scala/dbc/result/Relation.scala @@ -14,7 +14,9 @@ package result /** An ISO-9075:2003 (SQL) table. This is equivalent to a relation in the * relational model. */ -@deprecated(DbcIsDeprecated, "2.9.0") abstract class Relation extends AnyRef with Iterable[Tuple] { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Relation +extends collection.AbstractIterable[Tuple] + with Iterable[Tuple] { /** The statement that generated this relation. */ def statement: scala.dbc.statement.Relation @@ -56,7 +58,7 @@ package result * <h3>Caution</h3> A Relation only has one single iterator, due to limitations * in DBMS. This means that if this method is called multiple times, all returned * iterators will share the same state. */ - def iterator: Iterator[Tuple] = new Iterator[Tuple] { + def iterator: Iterator[Tuple] = new collection.AbstractIterator[Tuple] { protected val result: java.sql.ResultSet = Relation.this.sqlResult def hasNext: Boolean = resultNext private var resultNext = result.next() |