diff --git a/scalikejdbc-core/src/main/scala/scalikejdbc/RelationalSQL.scala b/scalikejdbc-core/src/main/scala/scalikejdbc/RelationalSQL.scala index 1ddc1dbe5..5b2fb67e4 100644 --- a/scalikejdbc-core/src/main/scala/scalikejdbc/RelationalSQL.scala +++ b/scalikejdbc-core/src/main/scala/scalikejdbc/RelationalSQL.scala @@ -1,5 +1,7 @@ package scalikejdbc +import scala.collection.compat._ + //------------------------------------ // One-to-one / One-to-many //------------------------------------ @@ -7,7 +9,7 @@ package scalikejdbc private[scalikejdbc] trait RelationalSQLResultSetOperations[Z] { private[scalikejdbc] def toSingle(rows: Iterable[Z]): Option[Z] = { - if (rows.size > 1) throw new TooManyRowsException(1, rows.size) + if (rows.sizeIs > 1) throw new TooManyRowsException(1, rows.size) else rows.headOption } diff --git a/scalikejdbc-core/src/main/scala/scalikejdbc/StatementExecutor.scala b/scalikejdbc-core/src/main/scala/scalikejdbc/StatementExecutor.scala index 02d601ecd..86a9459e2 100644 --- a/scalikejdbc-core/src/main/scala/scalikejdbc/StatementExecutor.scala +++ b/scalikejdbc-core/src/main/scala/scalikejdbc/StatementExecutor.scala @@ -3,7 +3,7 @@ package scalikejdbc import java.sql.PreparedStatement import org.slf4j.LoggerFactory - +import scala.collection.compat._ import scala.language.reflectiveCalls import scala.util.control.NonFatal import JavaUtilDateConverterImplicits._ @@ -134,7 +134,7 @@ object StatementExecutor { target, m => { i += 1 - if (params.size >= i) { + if (params.sizeIs >= i) { toPrintable(params(i - 1)) .replace("\\", "\\\\") .replace("$", "\\$") @@ -329,7 +329,7 @@ case class StatementExecutor( .loggingSQLAndTime(GlobalSettings.loggingSQLAndTime) .maxBatchParamSize .collect { - case maxSize if batchParamsList.size > maxSize => + case maxSize if batchParamsList.sizeIs > maxSize => batchParamsList .take(maxSize) .map(params => singleSqlString(params))