Merge branch 'release/0.5.4'

Author: seratch

.travis.yml

@@ -1,16 +1,18 @@
 language: scala
-
 scala:
-  - 2.10.4
-  - 2.11.2
-
+- 2.10.4
+- 2.11.4
+script: sbt clean coverage test
+after_success: sbt coveralls
 addons:
-  postgresql: "9.3"
-
+  postgresql: '9.3'
 before_script:
-  - psql -c "CREATE ROLE sa WITH SUPERUSER LOGIN PASSWORD 'sa';" -U postgres
-  - psql -c "CREATE DATABASE scalikejdbc;" -U postgres
-  - psql -c "CREATE DATABASE scalikejdbc2;" -U postgres
-  - mysql -e 'GRANT ALL ON *.* TO sa@"localhost"IDENTIFIED BY "sa";FLUSH PRIVILEGES;' -uroot
-  - mysql -e "CREATE DATABASE scalikejdbc;" -usa -psa
-
+- psql -c "CREATE ROLE sa WITH SUPERUSER LOGIN PASSWORD 'sa';" -U postgres
+- psql -c "CREATE DATABASE scalikejdbc;" -U postgres
+- psql -c "CREATE DATABASE scalikejdbc2;" -U postgres
+- mysql -e 'GRANT ALL ON *.* TO sa@"localhost"IDENTIFIED BY "sa";FLUSH PRIVILEGES;'
+  -uroot
+- mysql -e "CREATE DATABASE scalikejdbc;" -usa -psa
+env:
+  global:
+    secure: uD3eBk5OAXJPsTSLxJudTidbmxfDRiRuBm5snX/bTC4cA+22cjA8sWCi3+o5k/pwbofz3oi5CRouvm3xaaAlk9x9EDzR2PBh7m/sxyPRmWTl6NlLFQ24Xu6jUVCmwYoqvGsieJEouTXUwumL1OJxPQXjFUVLqS322hFzggYSE2U=

build.sbt

@@ -0,0 +1,2 @@
+xerial.sbt.Sonatype.sonatypeSettings
+

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

@@ -27,9 +27,6 @@ trait AsyncResultSet extends WrappedResultSet {
 
   def tail(): AsyncResultSet
 
-  override final def get[A: TypeBinder](columnLabel: String): A = throw new UnsupportedOperationException
-  override final def get[A: TypeBinder](columnIndex: Int): A = throw new UnsupportedOperationException
-
   override final def ensureCursor(): Unit = {}
 
   override final def fetchDirection: Int = throw new UnsupportedOperationException
@@ -40,115 +37,6 @@ trait AsyncResultSet extends WrappedResultSet {
   override final def statement: java.sql.Statement = throw new UnsupportedOperationException
   override final def warnings: java.sql.SQLWarning = throw new UnsupportedOperationException
 
-  override def any(columnIndex: Int): Any
-  override def any(columnLabel: String): Any
-  override def anyOpt(columnIndex: Int): Option[Any]
-  override def anyOpt(columnLabel: String): Option[Any]
-
-  override def bigDecimal(columnIndex: Int): java.math.BigDecimal
-  override def bigDecimal(columnLabel: String): java.math.BigDecimal
-  override def bigDecimalOpt(columnIndex: Int): Option[java.math.BigDecimal]
-  override def bigDecimalOpt(columnLabel: String): Option[java.math.BigDecimal]
-
-  override def bytes(columnIndex: Int): Array[Byte]
-  override def bytes(columnLabel: String): Array[Byte]
-  override def bytesOpt(columnIndex: Int): Option[Array[Byte]]
-  override def bytesOpt(columnLabel: String): Option[Array[Byte]]
-
-  override def date(columnIndex: Int): java.sql.Date
-  override def date(columnLabel: String): java.sql.Date
-  override def dateOpt(columnIndex: Int): Option[java.sql.Date]
-  override def dateOpt(columnLabel: String): Option[java.sql.Date]
-
-  override def string(columnIndex: Int): String
-  override def string(columnLabel: String): String
-  override def stringOpt(columnIndex: Int): Option[String]
-  override def stringOpt(columnLabel: String): Option[String]
-
-  override def time(columnIndex: Int): java.sql.Time
-  override def time(columnLabel: String): java.sql.Time
-  override def timeOpt(columnIndex: Int): Option[java.sql.Time]
-  override def timeOpt(columnLabel: String): Option[java.sql.Time]
-
-  override def timestamp(columnIndex: Int): java.sql.Timestamp
-  override def timestamp(columnLabel: String): java.sql.Timestamp
-  override def timestampOpt(columnIndex: Int): Option[java.sql.Timestamp]
-  override def timestampOpt(columnLabel: String): Option[java.sql.Timestamp]
-
-  override def jodaDateTime(columnIndex: Int): DateTime
-  override def jodaDateTime(columnLabel: String): DateTime
-  override def jodaDateTimeOpt(columnIndex: Int): Option[DateTime]
-  override def jodaDateTimeOpt(columnLabel: String): Option[DateTime]
-
-  override def jodaLocalDate(columnIndex: Int): LocalDate
-  override def jodaLocalDate(columnLabel: String): LocalDate
-  override def jodaLocalDateOpt(columnIndex: Int): Option[LocalDate]
-  override def jodaLocalDateOpt(columnLabel: String): Option[LocalDate]
-
-  override def jodaLocalDateTime(columnIndex: Int): LocalDateTime
-  override def jodaLocalDateTime(columnLabel: String): LocalDateTime
-  override def jodaLocalDateTimeOpt(columnIndex: Int): Option[LocalDateTime]
-  override def jodaLocalDateTimeOpt(columnLabel: String): Option[LocalDateTime]
-
-  override def jodaLocalTime(columnIndex: Int): LocalTime
-  override def jodaLocalTime(columnLabel: String): LocalTime
-  override def jodaLocalTimeOpt(columnIndex: Int): Option[LocalTime]
-  override def jodaLocalTimeOpt(columnLabel: String): Option[LocalTime]
-
-  override def url(columnIndex: Int): java.net.URL
-  override def url(columnLabel: String): java.net.URL
-  override def urlOpt(columnIndex: Int): Option[java.net.URL]
-  override def urlOpt(columnLabel: String): Option[java.net.URL]
-
-  override def nullableBoolean(columnIndex: Int): java.lang.Boolean
-  override def nullableBoolean(columnLabel: String): java.lang.Boolean
-  override def boolean(columnIndex: Int): Boolean
-  override def boolean(columnLabel: String): Boolean
-  override def booleanOpt(columnIndex: Int): Option[Boolean]
-  override def booleanOpt(columnLabel: String): Option[Boolean]
-
-  override def nullableByte(columnIndex: Int): java.lang.Byte
-  override def nullableByte(columnLabel: String): java.lang.Byte
-  override def byte(columnIndex: Int): Byte
-  override def byte(columnLabel: String): Byte
-  override def byteOpt(columnIndex: Int): Option[Byte]
-  override def byteOpt(columnLabel: String): Option[Byte]
-
-  override def nullableDouble(columnIndex: Int): java.lang.Double
-  override def nullableDouble(columnLabel: String): java.lang.Double
-  override def double(columnIndex: Int): Double
-  override def double(columnLabel: String): Double
-  override def doubleOpt(columnIndex: Int): Option[Double]
-  override def doubleOpt(columnLabel: String): Option[Double]
-
-  override def nullableFloat(columnIndex: Int): java.lang.Float
-  override def nullableFloat(columnLabel: String): java.lang.Float
-  override def float(columnIndex: Int): Float
-  override def float(columnLabel: String): Float
-  override def floatOpt(columnIndex: Int): Option[Float]
-  override def floatOpt(columnLabel: String): Option[Float]
-
-  override def nullableInt(columnIndex: Int): java.lang.Integer
-  override def nullableInt(columnLabel: String): java.lang.Integer
-  override def int(columnIndex: Int): Int
-  override def int(columnLabel: String): Int
-  override def intOpt(columnIndex: Int): Option[Int]
-  override def intOpt(columnLabel: String): Option[Int]
-
-  override def nullableLong(columnIndex: Int): java.lang.Long
-  override def nullableLong(columnLabel: String): java.lang.Long
-  override def long(columnIndex: Int): Long
-  override def long(columnLabel: String): Long
-  override def longOpt(columnIndex: Int): Option[Long]
-  override def longOpt(columnLabel: String): Option[Long]
-
-  override def nullableShort(columnIndex: Int): java.lang.Short
-  override def nullableShort(columnLabel: String): java.lang.Short
-  override def short(columnIndex: Int): Short
-  override def short(columnLabel: String): Short
-  override def shortOpt(columnIndex: Int): Option[Short]
-  override def shortOpt(columnLabel: String): Option[Short]
-
   override def toMap(): Map[String, Any] = throw new UnsupportedOperationException
   override def toSymbolMap(): Map[Symbol, Any] = throw new UnsupportedOperationException
 

core/src/main/scala/scalikejdbc/async/FutureImplicits.scala

@@ -1,6 +1,6 @@
 package scalikejdbc.async
 
-import scalikejdbc._, SQLInterpolation._
+import scalikejdbc._
 import scala.concurrent._
 import scalikejdbc.async.ShortenedNames._