Skip to content

Commit 23e26e0

Browse files
committed
Merge branch 'release/0.3.2'
2 parents bee4d3f + 9a09a7b commit 23e26e0

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

core/src/main/scala/scalikejdbc/async/internal/AsyncResultSetImpl.scala

+4
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ private[scalikejdbc] class AsyncResultSetImpl(rows: IndexedSeq[RowData])
109109
case any => any.toString
110110
}
111111

112+
override def stringOpt(columnIndex: Int): Option[String] = Option(string(columnIndex))
113+
114+
override def stringOpt(columnLabel: String): Option[String] = Option(string(columnLabel))
115+
112116
override def time(columnIndex: Int): java.sql.Time = any(columnIndex) match {
113117
case null => null
114118
case t: java.sql.Time => t

core/src/test/scala/sample/AsyncLover.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ object AsyncLover extends SQLSyntaxSupport[AsyncLover] {
2323

2424
def apply(c: ResultName[AsyncLover])(rs: WrappedResultSet): AsyncLover = new AsyncLover(
2525
id = rs.long(c.id),
26-
name = rs.string(c.name),
26+
//name = rs.string(c.name),
27+
name = rs.stringOpt(c.name).get,
2728
rating = rs.int(c.rating),
2829
isReactive = rs.boolean(c.isReactive),
2930
lunchtime = rs.timeOpt(c.lunchtime),

project/Build.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import play.Project._
44

55
object ScalikeJDBCAsyncProject extends Build {
66

7-
lazy val _version = "0.3.1"
7+
lazy val _version = "0.3.2"
88
lazy val scalikejdbcVersion = "1.7.0"
99
lazy val mauricioVersion = "0.2.8"
1010
lazy val defaultPlayVersion = "2.2.1"

0 commit comments

Comments
 (0)