Skip to content

Commit 99ead57

Browse files
seratchseratch
committed
Merge branch 'release/0.3.5'
2 parents b780cbe + f935292 commit 99ead57

File tree

7 files changed

+269
-307
lines changed

7 files changed

+269
-307
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Add `scalikejdbc-async` to your dependencies.
3131
```scala
3232
libraryDependencies ++= Seq(
3333
"org.scalikejdbc" %% "scalikejdbc-async" % "[0.3,)",
34-
"com.github.mauricio" %% "postgresql-async" % "0.2.10",
35-
"com.github.mauricio" %% "mysql-async" % "0.2.10",
34+
"com.github.mauricio" %% "postgresql-async" % "0.2.11",
35+
"com.github.mauricio" %% "mysql-async" % "0.2.11",
3636
"org.slf4j" % "slf4j-simple" % "[1.7,)" // slf4j implementation
3737
)
3838
```
@@ -43,7 +43,7 @@ If you're a Play2 user, use play-plugin too!
4343
val appDependencies = Seq(
4444
"org.scalikejdbc" %% "scalikejdbc-async" % "[0.3,)",
4545
"org.scalikejdbc" %% "scalikejdbc-async-play-plugin" % "[0.3,)",
46-
"com.github.mauricio" %% "postgresql-async" % "0.2.10"
46+
"com.github.mauricio" %% "postgresql-async" % "0.2.11"
4747
)
4848
```
4949

‎core/src/main/scala/scalikejdbc/async/AsyncResultSet.scala

Lines changed: 98 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
package scalikejdbc.async
1717

1818
import scalikejdbc._
19-
20-
import java.util.Calendar
21-
import org.joda.time.{ LocalTime, LocalDateTime, DateTime }
22-
import scala.concurrent.duration.FiniteDuration
19+
import org.joda.time.{ LocalDateTime, DateTime, LocalDate, LocalTime }
2320

2421
/**
2522
* WrappedResultSet for Asynchronous DB Session
@@ -30,95 +27,129 @@ trait AsyncResultSet extends WrappedResultSet {
3027

3128
def tail(): AsyncResultSet
3229

33-
override def ensureCursor(): Unit = {}
30+
override final def get[A: TypeBinder](columnLabel: String): A = throw new UnsupportedOperationException
31+
override final def get[A: TypeBinder](columnIndex: Int): A = throw new UnsupportedOperationException
32+
33+
override final def ensureCursor(): Unit = {}
3434

35-
override def array(columnIndex: Int): java.sql.Array = throw new UnsupportedOperationException
36-
override def array(columnLabel: String): java.sql.Array = throw new UnsupportedOperationException
35+
override final def fetchDirection: Int = throw new UnsupportedOperationException
36+
override final def fetchSize: Int = throw new UnsupportedOperationException
37+
override final def holdability: Int = throw new UnsupportedOperationException
38+
override final def metaData: java.sql.ResultSetMetaData = throw new UnsupportedOperationException
39+
override final def row: Int = throw new UnsupportedOperationException
40+
override final def statement: java.sql.Statement = throw new UnsupportedOperationException
41+
override final def warnings: java.sql.SQLWarning = throw new UnsupportedOperationException
3742

38-
override def asciiStream(columnIndex: Int): java.io.InputStream = throw new UnsupportedOperationException
39-
override def asciiStream(columnLabel: String): java.io.InputStream = throw new UnsupportedOperationException
43+
override def any(columnIndex: Int): Any
44+
override def any(columnLabel: String): Any
45+
override def anyOpt(columnIndex: Int): Option[Any]
46+
override def anyOpt(columnLabel: String): Option[Any]
4047

4148
override def bigDecimal(columnIndex: Int): java.math.BigDecimal
4249
override def bigDecimal(columnLabel: String): java.math.BigDecimal
43-
44-
override def binaryStream(columnIndex: Int): java.io.InputStream = throw new UnsupportedOperationException
45-
override def binaryStream(columnLabel: String): java.io.InputStream = throw new UnsupportedOperationException
46-
47-
override def blob(columnIndex: Int): java.sql.Blob = throw new UnsupportedOperationException
48-
override def blob(columnLabel: String): java.sql.Blob = throw new UnsupportedOperationException
50+
override def bigDecimalOpt(columnIndex: Int): Option[java.math.BigDecimal]
51+
override def bigDecimalOpt(columnLabel: String): Option[java.math.BigDecimal]
4952

5053
override def bytes(columnIndex: Int): Array[Byte]
5154
override def bytes(columnLabel: String): Array[Byte]
52-
53-
override def characterStream(columnIndex: Int): java.io.Reader = throw new UnsupportedOperationException
54-
override def characterStream(columnLabel: String): java.io.Reader = throw new UnsupportedOperationException
55-
56-
override def clob(columnIndex: Int): java.sql.Clob = throw new UnsupportedOperationException
57-
override def clob(columnLabel: String): java.sql.Clob = throw new UnsupportedOperationException
58-
59-
override def concurrency: Int = throw new UnsupportedOperationException
60-
override def cursorName: String = throw new UnsupportedOperationException
55+
override def bytesOpt(columnIndex: Int): Option[Array[Byte]]
56+
override def bytesOpt(columnLabel: String): Option[Array[Byte]]
6157

6258
override def date(columnIndex: Int): java.sql.Date
6359
override def date(columnLabel: String): java.sql.Date
64-
65-
override def date(columnIndex: Int, cal: Calendar): java.sql.Date = throw new UnsupportedOperationException
66-
override def date(columnLabel: String, cal: Calendar): java.sql.Date = throw new UnsupportedOperationException
67-
68-
override def fetchDirection: Int = throw new UnsupportedOperationException
69-
override def fetchSize: Int = throw new UnsupportedOperationException
70-
override def holdability: Int = throw new UnsupportedOperationException
71-
override def metaData: java.sql.ResultSetMetaData = throw new UnsupportedOperationException
72-
73-
override def nCharacterStream(columnIndex: Int): java.io.Reader = throw new UnsupportedOperationException
74-
override def nCharacterStream(columnLabel: String): java.io.Reader = throw new UnsupportedOperationException
75-
76-
override def nClob(columnIndex: Int): java.sql.NClob = throw new UnsupportedOperationException
77-
override def nClob(columnLabel: String): java.sql.NClob = throw new UnsupportedOperationException
78-
79-
override def nString(columnIndex: Int): String = throw new UnsupportedOperationException
80-
override def nString(columnLabel: String): String = throw new UnsupportedOperationException
81-
82-
override def any(columnIndex: Int): Any
83-
override def any(columnLabel: String): Any
84-
85-
override def any(columnIndex: Int, map: Map[String, Class[_]]): Any = throw new UnsupportedOperationException
86-
override def any(columnLabel: String, map: Map[String, Class[_]]): Any = throw new UnsupportedOperationException
87-
88-
override def ref(columnIndex: Int): java.sql.Ref = throw new UnsupportedOperationException
89-
override def ref(columnLabel: String): java.sql.Ref = throw new UnsupportedOperationException
90-
91-
override def row: Int = throw new UnsupportedOperationException
92-
override def rowId(columnIndex: Int): java.sql.RowId = throw new UnsupportedOperationException
93-
override def rowId(columnLabel: String): java.sql.RowId = throw new UnsupportedOperationException
94-
95-
override def sqlXml(columnIndex: Int): java.sql.SQLXML = throw new UnsupportedOperationException
96-
override def sqlXml(columnLabel: String): java.sql.SQLXML = throw new UnsupportedOperationException
97-
98-
override def statement: java.sql.Statement = throw new UnsupportedOperationException
60+
override def dateOpt(columnIndex: Int): Option[java.sql.Date]
61+
override def dateOpt(columnLabel: String): Option[java.sql.Date]
9962

10063
override def string(columnIndex: Int): String
10164
override def string(columnLabel: String): String
65+
override def stringOpt(columnIndex: Int): Option[String]
66+
override def stringOpt(columnLabel: String): Option[String]
10267

10368
override def time(columnIndex: Int): java.sql.Time
10469
override def time(columnLabel: String): java.sql.Time
105-
106-
override def time(columnIndex: Int, cal: Calendar): java.sql.Time = throw new UnsupportedOperationException
107-
override def time(columnLabel: String, cal: Calendar): java.sql.Time = throw new UnsupportedOperationException
70+
override def timeOpt(columnIndex: Int): Option[java.sql.Time]
71+
override def timeOpt(columnLabel: String): Option[java.sql.Time]
10872

10973
override def timestamp(columnIndex: Int): java.sql.Timestamp
11074
override def timestamp(columnLabel: String): java.sql.Timestamp
75+
override def timestampOpt(columnIndex: Int): Option[java.sql.Timestamp]
76+
override def timestampOpt(columnLabel: String): Option[java.sql.Timestamp]
77+
78+
override def dateTime(columnIndex: Int): DateTime
79+
override def dateTime(columnLabel: String): DateTime
80+
override def dateTimeOpt(columnIndex: Int): Option[DateTime]
81+
override def dateTimeOpt(columnLabel: String): Option[DateTime]
82+
83+
override def localDate(columnIndex: Int): LocalDate
84+
override def localDate(columnLabel: String): LocalDate
85+
override def localDateOpt(columnIndex: Int): Option[LocalDate]
86+
override def localDateOpt(columnLabel: String): Option[LocalDate]
11187

112-
override def timestamp(columnIndex: Int, cal: Calendar): java.sql.Timestamp = throw new UnsupportedOperationException
113-
override def timestamp(columnLabel: String, cal: Calendar): java.sql.Timestamp = throw new UnsupportedOperationException
88+
override def localDateTime(columnIndex: Int): LocalDateTime
89+
override def localDateTime(columnLabel: String): LocalDateTime
90+
override def localDateTimeOpt(columnIndex: Int): Option[LocalDateTime]
91+
override def localDateTimeOpt(columnLabel: String): Option[LocalDateTime]
92+
93+
override def localTime(columnIndex: Int): LocalTime
94+
override def localTime(columnLabel: String): LocalTime
95+
override def localTimeOpt(columnIndex: Int): Option[LocalTime]
96+
override def localTimeOpt(columnLabel: String): Option[LocalTime]
11497

11598
override def url(columnIndex: Int): java.net.URL
11699
override def url(columnLabel: String): java.net.URL
117-
118-
override def warnings: java.sql.SQLWarning = throw new UnsupportedOperationException
100+
override def urlOpt(columnIndex: Int): Option[java.net.URL]
101+
override def urlOpt(columnLabel: String): Option[java.net.URL]
102+
103+
override def nullableBoolean(columnIndex: Int): java.lang.Boolean
104+
override def nullableBoolean(columnLabel: String): java.lang.Boolean
105+
override def boolean(columnIndex: Int): Boolean
106+
override def boolean(columnLabel: String): Boolean
107+
override def booleanOpt(columnIndex: Int): Option[Boolean]
108+
override def booleanOpt(columnLabel: String): Option[Boolean]
109+
110+
override def nullableByte(columnIndex: Int): java.lang.Byte
111+
override def nullableByte(columnLabel: String): java.lang.Byte
112+
override def byte(columnIndex: Int): Byte
113+
override def byte(columnLabel: String): Byte
114+
override def byteOpt(columnIndex: Int): Option[Byte]
115+
override def byteOpt(columnLabel: String): Option[Byte]
116+
117+
override def nullableDouble(columnIndex: Int): java.lang.Double
118+
override def nullableDouble(columnLabel: String): java.lang.Double
119+
override def double(columnIndex: Int): Double
120+
override def double(columnLabel: String): Double
121+
override def doubleOpt(columnIndex: Int): Option[Double]
122+
override def doubleOpt(columnLabel: String): Option[Double]
123+
124+
override def nullableFloat(columnIndex: Int): java.lang.Float
125+
override def nullableFloat(columnLabel: String): java.lang.Float
126+
override def float(columnIndex: Int): Float
127+
override def float(columnLabel: String): Float
128+
override def floatOpt(columnIndex: Int): Option[Float]
129+
override def floatOpt(columnLabel: String): Option[Float]
130+
131+
override def nullableInt(columnIndex: Int): java.lang.Integer
132+
override def nullableInt(columnLabel: String): java.lang.Integer
133+
override def int(columnIndex: Int): Int
134+
override def int(columnLabel: String): Int
135+
override def intOpt(columnIndex: Int): Option[Int]
136+
override def intOpt(columnLabel: String): Option[Int]
137+
138+
override def nullableLong(columnIndex: Int): java.lang.Long
139+
override def nullableLong(columnLabel: String): java.lang.Long
140+
override def long(columnIndex: Int): Long
141+
override def long(columnLabel: String): Long
142+
override def longOpt(columnIndex: Int): Option[Long]
143+
override def longOpt(columnLabel: String): Option[Long]
144+
145+
override def nullableShort(columnIndex: Int): java.lang.Short
146+
override def nullableShort(columnLabel: String): java.lang.Short
147+
override def short(columnIndex: Int): Short
148+
override def short(columnLabel: String): Short
149+
override def shortOpt(columnIndex: Int): Option[Short]
150+
override def shortOpt(columnLabel: String): Option[Short]
119151

120152
override def toMap(): Map[String, Any] = throw new UnsupportedOperationException
121153
override def toSymbolMap(): Map[Symbol, Any] = throw new UnsupportedOperationException
122154

123155
}
124-

0 commit comments

Comments
 (0)