diff options
Diffstat (limited to 'src/dbc')
-rw-r--r-- | src/dbc/scala/dbc/Database.scala | 2 | ||||
-rw-r--r-- | src/dbc/scala/dbc/result/Relation.scala | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/dbc/scala/dbc/Database.scala b/src/dbc/scala/dbc/Database.scala index 0dfcc850af..a92d94d97e 100644 --- a/src/dbc/scala/dbc/Database.scala +++ b/src/dbc/scala/dbc/Database.scala @@ -77,7 +77,7 @@ case class Database(dbms: Vendor) { connection.close() } else { lock.acquire - usedConnections = usedConnections.remove(e => (e.equals(connection))); + usedConnections = usedConnections.filterNot(e => (e.equals(connection))); if (availableConnections.length < vendor.retainedConnections) availableConnections = connection :: availableConnections else diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala index 63881daff7..0d7ea28b76 100644 --- a/src/dbc/scala/dbc/result/Relation.scala +++ b/src/dbc/scala/dbc/result/Relation.scala @@ -56,7 +56,7 @@ abstract class Relation extends AnyRef with Iterable[Tuple] { * <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 elements: Iterator[Tuple] = new Iterator[Tuple] { + def iterator: Iterator[Tuple] = new Iterator[Tuple] { protected val result: java.sql.ResultSet = Relation.this.sqlResult def hasNext: Boolean = resultNext private var resultNext = result.next() @@ -78,4 +78,7 @@ abstract class Relation extends AnyRef with Iterable[Tuple] { else error("next on empty iterator") } } + + @deprecated def elements = iterator + } |