From 5c9a7a364afed97e8def2eb7b4b8a2727a561d3f Mon Sep 17 00:00:00 2001 From: vlad Date: Fri, 26 Jan 2018 11:47:49 -0800 Subject: Dropping the Scala 2.11 support (cherry picked from commit 4d37891) --- .../scala/xyz/driver/restquery/db/SlickQueryBuilder.scala | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala') diff --git a/src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala b/src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala index 67ce9f4..2947b3c 100644 --- a/src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala +++ b/src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala @@ -3,7 +3,7 @@ package xyz.driver.restquery.db import java.sql.{JDBCType, PreparedStatement} import java.time.LocalDateTime -import slick.jdbc.{JdbcProfile, PositionedParameters, SQLActionBuilder, SetParameter} +import slick.jdbc._ import xyz.driver.restquery.query._ import scala.concurrent.{ExecutionContext, Future} @@ -30,10 +30,13 @@ object SlickQueryBuilder { implicit class SQLActionBuilderConcat(a: SQLActionBuilder) { def concat(b: SQLActionBuilder): SQLActionBuilder = { - SQLActionBuilder(a.queryParts ++ b.queryParts, (p: Unit, pp: PositionedParameters) => { - a.unitPConv.apply(p, pp) - b.unitPConv.apply(p, pp) - }) + SQLActionBuilder( + a.queryParts ++ b.queryParts, + (p: Unit, pp: PositionedParameters) => { + a.unitPConv.apply(p, pp) + b.unitPConv.apply(p, pp) + } + ) } } -- cgit v1.2.3