Verify a statement execution returns a ResultSet zio#63

apolloisggg · Mar 29, 2021 · d60fd1e · d60fd1e
1 parent cfedbf3
commit d60fd1e
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/jdbc/src/main/scala/zio/sql/SqlDriverLiveModule.scala b/jdbc/src/main/scala/zio/sql/SqlDriverLiveModule.scala
@@ -60,22 +60,24 @@ trait SqlDriverLiveModule { self: Jdbc =>
 
  val statement = conn.createStatement()
 
- val _ = statement.execute(query) // TODO: Check boolean return value
-
- val resultSet = statement.getResultSet()
-
- ZStream
- .unfoldM(resultSet) { rs =>
- if (rs.next()) {
- try unsafeExtractRow[read.ResultType](resultSet, schema) match {
- case Left(error) => ZIO.fail(error)
- case Right(value) => ZIO.succeed(Some((value, rs)))
- } catch {
- case e: SQLException => ZIO.fail(e)
- }
- } else ZIO.succeed(None)
- }
- .map(read.mapper)
+ val hasResultSet = statement.execute(query)
+
+ if (hasResultSet) {
+ val resultSet = statement.getResultSet()
+
+ ZStream
+ .unfoldM(resultSet) { rs =>
+ if (rs.next()) {
+ try unsafeExtractRow[read.ResultType](resultSet, schema) match {
+ case Left(error) => ZIO.fail(error)
+ case Right(value) => ZIO.succeed(Some((value, rs)))
+ } catch {
+ case e: SQLException => ZIO.fail(e)
+ }
+ } else ZIO.succeed(None)
+ }
+ .map(read.mapper)
+ } else ZStream.empty
 
  }.refineToOrDie[Exception]
  }