Fix problem with generated keys ResultSets not being iterable.

Author: David Pratt

src/main/scala/janus/Statement.scala

@@ -25,7 +25,7 @@ trait Statement {
   /**
    * Get the generated keys from the most recently executed statement.
    */
-  def generatedKeys[A](f: Traversable[Row] => A): A
+  def generatedKeys(): Traversable[Row]
 
   /**
    * Get the update count from the most recently executed statement.
@@ -80,7 +80,7 @@ trait PreparedStatement {
   /**
    * Get the generated keys from the most recently executed statement.
    */
-  def generatedKeys[A](f: Traversable[Row] => A): A
+  def generatedKeys(): Traversable[Row]
 
   /**
    * Get the update count from the most recently executed statement.
@@ -93,7 +93,7 @@ private[janus] class JdbcStatement(stmt: java.sql.Statement) extends Statement {
 
   def execute(sql: String): Boolean = stmt.execute(sql)
 
-  def executeQuery[A](sql: String)(f: Traversable[Row] => A): A = withResultSet(stmt.executeQuery(sql), f)
+  def executeQuery[A](sql: String)(f: Traversable[Row] => A): A = mapResultSet(stmt.executeQuery(sql), f)
 
   def executeUpdate(sql: String, returnAutoGeneratedKeys: Boolean = false): Int = {
     val generatedParams = if (returnAutoGeneratedKeys) {
@@ -104,7 +104,7 @@ private[janus] class JdbcStatement(stmt: java.sql.Statement) extends Statement {
     stmt.executeUpdate(sql, generatedParams)
   }
 
-  def generatedKeys[A](f: Traversable[Row] => A): A = withResultSet(stmt.getGeneratedKeys, f)
+  def generatedKeys() = copyResultSet(stmt.getGeneratedKeys)
 
   def updateCount() = stmt.getUpdateCount
 }
@@ -119,7 +119,7 @@ private[janus] class JdbcPreparedStatement(ps: java.sql.PreparedStatement) exten
 
   def execute(): Boolean = ps.execute()
 
-  def executeQuery[A](f: Traversable[Row] => A): A = withResultSet(ps.executeQuery, f)
+  def executeQuery[A](f: Traversable[Row] => A): A = mapResultSet(ps.executeQuery, f)
 
   def executeUpdate(): Int = ps.executeUpdate()
 
@@ -159,7 +159,7 @@ private[janus] class JdbcPreparedStatement(ps: java.sql.PreparedStatement) exten
     }
   }
 
-  def generatedKeys[A](f: Traversable[Row] => A): A = withResultSet(ps.getGeneratedKeys, f)
+  def generatedKeys(): Traversable[Row] = copyResultSet(ps.getGeneratedKeys)
 
   def updateCount(): Int = ps.getUpdateCount
 

src/main/scala/janus/package.scala

@@ -1,3 +1,4 @@
+import collection.mutable.ArrayBuffer
 import concurrent.ExecutionContext
 import java.sql.ResultSet
 import org.slf4j.LoggerFactory
@@ -35,16 +36,35 @@ package object janus {
 
   private val log = LoggerFactory.getLogger("janus")
 
-  private[janus] def withResultSet[A](rs: ResultSet, f: Traversable[Row] => A): A = {
-    import JdbcRow._
+  private[janus] def copyResultSet(resultSet: java.sql.ResultSet): Traversable[Row] = {
+
+    val meta = Metadata(resultSet)
+    val columnRange = 1 to meta.columns.size
+    def data(rs: java.sql.ResultSet) = {
+      for (i <- columnRange) yield rs.getObject(i)
+    }
+
+    val rows: ArrayBuffer[Row] = new ArrayBuffer[Row]
     try {
-      f(convertResultSet(rs))
+      while(resultSet.next()) {
+        rows.append(JdbcRow(data(resultSet), meta))
+      }
+      rows
+    } finally {
+      resultSet.close()
+    }
+  }
+
+  private[janus] def mapResultSet[A](rs: ResultSet, f: Traversable[Row] => A) = {
+    try {
+      val wrapped = convertResultSet(rs)
+      f(wrapped)
     } finally {
       rs.close()
     }
   }
 
-  def convertResultSet(resultSet: java.sql.ResultSet): Traversable[Row] = {
+  private def convertResultSet(resultSet: java.sql.ResultSet): Traversable[Row] = {
 
     val meta = Metadata(resultSet)
     val columnRange = 1 to meta.columns.size
@@ -65,5 +85,4 @@ package object janus {
       }
     }
   }
-
 }