Skip to content

Commit 2a1a2d5

Browse files
seratchseratch
authored
Merge pull request #42 from seratch/bump-deps
Bump dependencies, update scalariform
2 parents 89277c0 + 136f2e9 commit 2a1a2d5

26 files changed

+320
-178
lines changed

‎.travis.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ scala:
66
- 2.10.6
77
- 2.11.8
88
sudo: false
9-
script: sbt ++${TRAVIS_SCALA_VERSION} clean $(if [[ "${TRAVIS_SCALA_VERSION}" == "2.11.8" ]]; then echo coverage ; else echo "" ; fi) test
10-
after_success: sbt $(if [[ "${TRAVIS_SCALA_VERSION}" == "2.11.8" ]]; then echo coveralls ; else echo "" ; fi)
9+
script: sbt ++${TRAVIS_SCALA_VERSION} clean test
1110
addons:
1211
postgresql: '9.3'
1312
before_script:
@@ -18,6 +17,3 @@ before_script:
1817
- mysql -e 'GRANT ALL ON *.* TO sa@"localhost"IDENTIFIED BY "sa";FLUSH PRIVILEGES;'
1918
-uroot
2019
- mysql -e "CREATE DATABASE scalikejdbc;" -usa -psa
21-
env:
22-
global:
23-
secure: uD3eBk5OAXJPsTSLxJudTidbmxfDRiRuBm5snX/bTC4cA+22cjA8sWCi3+o5k/pwbofz3oi5CRouvm3xaaAlk9x9EDzR2PBh7m/sxyPRmWTl6NlLFQ24Xu6jUVCmwYoqvGsieJEouTXUwumL1OJxPQXjFUVLqS322hFzggYSE2U=

‎build.sbt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
lazy val _version = "0.6.1-SNAPSHOT"
2-
lazy val scalikejdbcVersion = "2.4.2"
1+
lazy val _version = "0.7.0-SNAPSHOT"
2+
lazy val scalikejdbcVersion = "2.4.2" // TODO: 2.5
33
lazy val mauricioVersion = "0.2.20" // provided
44
lazy val postgresqlVersion = "9.4-1201-jdbc41"
55
lazy val defaultPlayVersion = play.core.PlayVersion.current
@@ -10,18 +10,18 @@ lazy val core = (project in file("core")).settings(
1010
version := _version,
1111
scalaVersion := "2.11.8",
1212
crossScalaVersions := Seq("2.11.8", "2.10.6"),
13-
publishTo <<= version { (v: String) => _publishTo(v) },
13+
publishTo := _publishTo(version.value),
1414
publishMavenStyle := true,
1515
resolvers ++= _resolvers,
16-
libraryDependencies <++= (scalaVersion) { scalaVersion =>
17-
Seq(
18-
"org.scalikejdbc" %% "scalikejdbc" % scalikejdbcVersion % "compile",
16+
libraryDependencies := {
17+
Seq (
18+
"org.scalikejdbc" %% "scalikejdbc" % scalikejdbcVersion % "compile",
1919
"org.scalikejdbc" %% "scalikejdbc-interpolation" % scalikejdbcVersion % "compile",
2020
"com.github.mauricio" %% "postgresql-async" % mauricioVersion % "provided",
2121
"com.github.mauricio" %% "mysql-async" % mauricioVersion % "provided",
2222
"org.postgresql" % "postgresql" % postgresqlVersion % "test",
2323
"mysql" % "mysql-connector-java" % "5.1.+" % "test",
24-
"org.scalatest" %% "scalatest" % "3.0.0" % "test",
24+
"org.scalatest" %% "scalatest" % "3.0.+" % "test",
2525
"ch.qos.logback" % "logback-classic" % "1.1.+" % "test"
2626
)
2727
},
@@ -52,7 +52,7 @@ lazy val playPlugin = (project in file("play-plugin")).settings(
5252
"com.typesafe.play" %% "play-test" % defaultPlayVersion % "test"
5353
),
5454
testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "sequential", "true"),
55-
publishTo <<= version { (v: String) => _publishTo(v) },
55+
publishTo := _publishTo(version.value),
5656
publishMavenStyle := true,
5757
publishArtifact in Test := false,
5858
pomIncludeRepository := { x => false },
@@ -73,7 +73,7 @@ lazy val playSample = (project in file("play-sample")).enablePlugins(play.PlaySc
7373
"org.postgresql" % "postgresql" % postgresqlVersion,
7474
"com.github.tototoshi" %% "play-flyway" % "1.2.+",
7575
"mysql" % "mysql-connector-java" % "5.1.+",
76-
"org.json4s" %% "json4s-ext" % "3.4.0",
76+
"org.json4s" %% "json4s-ext" % "3.4.+",
7777
"com.github.tototoshi" %% "play-json4s-native" % "0.3.+"
7878
),
7979
resolvers ++= _resolvers

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import scalikejdbc._
2121
* Asynchronous Connection Pool
2222
*/
2323
abstract class AsyncConnectionPool(
24-
val settings: AsyncConnectionPoolSettings = AsyncConnectionPoolSettings()) {
24+
val settings: AsyncConnectionPoolSettings = AsyncConnectionPoolSettings()
25+
) {
2526

2627
/**
2728
* Borrows a connection from pool.
@@ -67,15 +68,19 @@ object AsyncConnectionPool extends LogSupport {
6768
def apply(name: Any = DEFAULT_NAME): AsyncConnectionPool = get(name)
6869

6970
def add(name: Any, url: String, user: String, password: String, settings: CPSettings = AsyncConnectionPoolSettings())(
70-
implicit factory: CPFactory = AsyncConnectionPoolFactory): Unit = {
71+
implicit
72+
factory: CPFactory = AsyncConnectionPoolFactory
73+
): Unit = {
7174
val newPool: AsyncConnectionPool = factory.apply(url, user, password, settings)
7275
log.debug(s"Registered connection pool (url: ${url}, user: ${user}, settings: ${settings}")
7376
val replaced = pools.put(name, newPool)
7477
replaced.foreach(_.close())
7578
}
7679

7780
def singleton(url: String, user: String, password: String, settings: CPSettings = AsyncConnectionPoolSettings())(
78-
implicit factory: CPFactory = AsyncConnectionPoolFactory): Unit = {
81+
implicit
82+
factory: CPFactory = AsyncConnectionPoolFactory
83+
): Unit = {
7984
add(DEFAULT_NAME, url, user, password, settings)(factory)
8085
}
8186

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ package scalikejdbc.async
2121
case class AsyncConnectionPoolSettings(
2222
maxPoolSize: Int = 8,
2323
maxQueueSize: Int = 8,
24-
maxIdleMillis: Long = 1000L)
24+
maxIdleMillis: Long = 1000L
25+
)
2526

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

+71-37
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ trait AsyncDBSession extends LogSupport {
8383
}
8484

8585
def single[A](statement: String, parameters: Any*)(extractor: WrappedResultSet => A)(
86-
implicit cxt: EC = ECGlobal): Future[Option[A]] = {
86+
implicit
87+
cxt: EC = ECGlobal
88+
): Future[Option[A]] = {
8789
val _parameters = ensureAndNormalizeParameters(parameters)
8890
traversable(statement, _parameters: _*)(extractor).map { results =>
8991
results match {
@@ -100,7 +102,9 @@ trait AsyncDBSession extends LogSupport {
100102
}
101103

102104
def oneToOneTraversable[A, B, Z](statement: String, parameters: Any*)(extractOne: (WrappedResultSet) => A)(extractTo: (WrappedResultSet) => Option[B])(transform: (A, B) => Z)(
103-
implicit cxt: EC = ECGlobal): Future[Traversable[Z]] = {
105+
implicit
106+
cxt: EC = ECGlobal
107+
): Future[Traversable[Z]] = {
104108
val _parameters = ensureAndNormalizeParameters(parameters)
105109
withListeners(statement, _parameters) {
106110
queryLogging(statement, _parameters)
@@ -124,10 +128,15 @@ trait AsyncDBSession extends LogSupport {
124128
}
125129

126130
def oneToManyTraversable[A, B, Z](statement: String, parameters: Any*)(
127-
extractOne: (WrappedResultSet) => A)(
128-
extractTo: (WrappedResultSet) => Option[B])(
129-
transform: (A, Seq[B]) => Z)(
130-
implicit cxt: EC = ECGlobal): Future[Traversable[Z]] = {
131+
extractOne: (WrappedResultSet) => A
132+
)(
133+
extractTo: (WrappedResultSet) => Option[B]
134+
)(
135+
transform: (A, Seq[B]) => Z
136+
)(
137+
implicit
138+
cxt: EC = ECGlobal
139+
): Future[Traversable[Z]] = {
131140
val _parameters = ensureAndNormalizeParameters(parameters)
132141
withListeners(statement, _parameters) {
133142
queryLogging(statement, _parameters)
@@ -151,11 +160,16 @@ trait AsyncDBSession extends LogSupport {
151160
}
152161

153162
def oneToManies2Traversable[A, B1, B2, Z](statement: String, parameters: Any*)(
154-
extractOne: (WrappedResultSet) => A)(
155-
extractTo1: (WrappedResultSet) => Option[B1],
156-
extractTo2: (WrappedResultSet) => Option[B2])(
157-
transform: (A, Seq[B1], Seq[B2]) => Z)(
158-
implicit cxt: EC = ECGlobal): Future[Traversable[Z]] = {
163+
extractOne: (WrappedResultSet) => A
164+
)(
165+
extractTo1: (WrappedResultSet) => Option[B1],
166+
extractTo2: (WrappedResultSet) => Option[B2]
167+
)(
168+
transform: (A, Seq[B1], Seq[B2]) => Z
169+
)(
170+
implicit
171+
cxt: EC = ECGlobal
172+
): Future[Traversable[Z]] = {
159173
val _parameters = ensureAndNormalizeParameters(parameters)
160174
withListeners(statement, _parameters) {
161175
queryLogging(statement, _parameters)
@@ -186,12 +200,17 @@ trait AsyncDBSession extends LogSupport {
186200
}
187201

188202
def oneToManies3Traversable[A, B1, B2, B3, Z](statement: String, parameters: Any*)(
189-
extractOne: (WrappedResultSet) => A)(
190-
extractTo1: (WrappedResultSet) => Option[B1],
191-
extractTo2: (WrappedResultSet) => Option[B2],
192-
extractTo3: (WrappedResultSet) => Option[B3])(
193-
transform: (A, Seq[B1], Seq[B2], Seq[B3]) => Z)(
194-
implicit cxt: EC = ECGlobal): Future[Traversable[Z]] = {
203+
extractOne: (WrappedResultSet) => A
204+
)(
205+
extractTo1: (WrappedResultSet) => Option[B1],
206+
extractTo2: (WrappedResultSet) => Option[B2],
207+
extractTo3: (WrappedResultSet) => Option[B3]
208+
)(
209+
transform: (A, Seq[B1], Seq[B2], Seq[B3]) => Z
210+
)(
211+
implicit
212+
cxt: EC = ECGlobal
213+
): Future[Traversable[Z]] = {
195214
val _parameters = ensureAndNormalizeParameters(parameters)
196215
withListeners(statement, _parameters) {
197216
queryLogging(statement, _parameters)
@@ -229,13 +248,18 @@ trait AsyncDBSession extends LogSupport {
229248
}
230249

231250
def oneToManies4Traversable[A, B1, B2, B3, B4, Z](statement: String, parameters: Any*)(
232-
extractOne: (WrappedResultSet) => A)(
233-
extractTo1: (WrappedResultSet) => Option[B1],
234-
extractTo2: (WrappedResultSet) => Option[B2],
235-
extractTo3: (WrappedResultSet) => Option[B3],
236-
extractTo4: (WrappedResultSet) => Option[B4])(
237-
transform: (A, Seq[B1], Seq[B2], Seq[B3], Seq[B4]) => Z)(
238-
implicit cxt: EC = ECGlobal): Future[Traversable[Z]] = {
251+
extractOne: (WrappedResultSet) => A
252+
)(
253+
extractTo1: (WrappedResultSet) => Option[B1],
254+
extractTo2: (WrappedResultSet) => Option[B2],
255+
extractTo3: (WrappedResultSet) => Option[B3],
256+
extractTo4: (WrappedResultSet) => Option[B4]
257+
)(
258+
transform: (A, Seq[B1], Seq[B2], Seq[B3], Seq[B4]) => Z
259+
)(
260+
implicit
261+
cxt: EC = ECGlobal
262+
): Future[Traversable[Z]] = {
239263
val _parameters = ensureAndNormalizeParameters(parameters)
240264
withListeners(statement, _parameters) {
241265
queryLogging(statement, _parameters)
@@ -267,7 +291,8 @@ trait AsyncDBSession extends LogSupport {
267291
connection.sendPreparedStatement(statement, _parameters: _*).map { result =>
268292
result.rows.map { ars =>
269293
new AsyncResultSetTraversable(ars).foldLeft(
270-
LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4])]())(processResultSet).map {
294+
LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4])]()
295+
)(processResultSet).map {
271296
case (one, (t1, t2, t3, t4)) => transform(one, t1, t2, t3, t4)
272297
}
273298
}.getOrElse(Nil)
@@ -277,22 +302,29 @@ trait AsyncDBSession extends LogSupport {
277302

278303
def oneToManies5Traversable[A, B1, B2, B3, B4, B5, Z](
279304
statement: String,
280-
parameters: Any*)(
281-
extractOne: (WrappedResultSet) => A)(
282-
extractTo1: (WrappedResultSet) => Option[B1],
283-
extractTo2: (WrappedResultSet) => Option[B2],
284-
extractTo3: (WrappedResultSet) => Option[B3],
285-
extractTo4: (WrappedResultSet) => Option[B4],
286-
extractTo5: (WrappedResultSet) => Option[B5])(
287-
transform: (A, Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5]) => Z)(
288-
implicit cxt: EC = ECGlobal): Future[Traversable[Z]] = {
305+
parameters: Any*
306+
)(
307+
extractOne: (WrappedResultSet) => A
308+
)(
309+
extractTo1: (WrappedResultSet) => Option[B1],
310+
extractTo2: (WrappedResultSet) => Option[B2],
311+
extractTo3: (WrappedResultSet) => Option[B3],
312+
extractTo4: (WrappedResultSet) => Option[B4],
313+
extractTo5: (WrappedResultSet) => Option[B5]
314+
)(
315+
transform: (A, Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5]) => Z
316+
)(
317+
implicit
318+
cxt: EC = ECGlobal
319+
): Future[Traversable[Z]] = {
289320
val _parameters = ensureAndNormalizeParameters(parameters)
290321
withListeners(statement, _parameters) {
291322
queryLogging(statement, _parameters)
292323

293324
def processResultSet(
294325
result: (LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5])]),
295-
rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5])] = {
326+
rs: WrappedResultSet
327+
): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5])] = {
296328
val o = extractOne(rs)
297329
val (to1, to2, to3, to4, to5) = (extractTo1(rs), extractTo2(rs), extractTo3(rs), extractTo4(rs), extractTo5(rs))
298330
result.keys.find(_ == o).map { _ =>
@@ -321,7 +353,8 @@ trait AsyncDBSession extends LogSupport {
321353
connection.sendPreparedStatement(statement, _parameters: _*).map { result =>
322354
result.rows.map { ars =>
323355
new AsyncResultSetTraversable(ars).foldLeft(
324-
LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5])]())(processResultSet).map {
356+
LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5])]()
357+
)(processResultSet).map {
325358
case (one, (t1, t2, t3, t4, t5)) => transform(one, t1, t2, t3, t4, t5)
326359
}
327360
}.getOrElse(Nil)
@@ -344,7 +377,8 @@ trait AsyncDBSession extends LogSupport {
344377
}
345378

346379
protected def withListeners[A](statement: String, parameters: Seq[Any], startMillis: Long = System.currentTimeMillis)(
347-
f: Future[A])(implicit cxt: EC = EC.global): Future[A] = {
380+
f: Future[A]
381+
)(implicit cxt: EC = EC.global): Future[A] = {
348382
f.onSuccess {
349383
case _ =>
350384
val millis = System.currentTimeMillis - startMillis

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import scala.concurrent.Future
2323
abstract class AsyncQueryResult(
2424
val rowsAffected: Option[Long],
2525
val statusMessage: Option[String],
26-
val rows: Option[AsyncResultSet]) {
26+
val rows: Option[AsyncResultSet]
27+
) {
2728

2829
val generatedKey: Future[Option[Long]]
2930

0 commit comments

Comments
 (0)