Skip to content

Commit 85ce2c5

Browse files
NarigoNarigo
committed
more fixes for port and relying on lang-scala 0.2.0
1 parent effe6d1 commit 85ce2c5

File tree

5 files changed

+29
-30
lines changed

5 files changed

+29
-30
lines changed

‎gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ modname=mod-mysql-postgresql
88
version=0.2.0-SNAPSHOT
99

1010
# The version of mauricios async driver
11-
asyncDriverVersion=0.2.7
11+
asyncDriverVersion=0.2.8
1212

1313
# The test timeout in seconds
1414
testtimeout=5
@@ -20,7 +20,7 @@ pullInDeps=true
2020
produceJar=false
2121

2222
# The version of the Scala module
23-
scalaLangModVersion=0.2.0-SNAPSHOT
23+
scalaLangModVersion=0.2.0
2424

2525
# The version of Scala to use
2626
scalaVersion=2.10.2
@@ -29,10 +29,10 @@ scalaVersion=2.10.2
2929
gradleVersion=1.6
3030

3131
# The version of Vert.x
32-
vertxVersion=2.0.2-SNAPSHOT
32+
vertxVersion=2.1M1
3333

3434
# The version of Vert.x test tools
35-
toolsVersion=2.0.2-SNAPSHOT
35+
toolsVersion=2.0.2-final
3636

3737
# The version of JUnit
3838
junitVersion=4.10

‎src/main/scala/io/vertx/asyncsql/database/ConnectionHandler.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@ package io.vertx.asyncsql.database
22

33
import scala.collection.JavaConverters.iterableAsScalaIterableConverter
44
import scala.concurrent.Future
5-
65
import org.vertx.scala.core.eventbus.Message
76
import org.vertx.scala.core.json.{ JsonArray, JsonObject }
87
import org.vertx.scala.core.logging.Logger
98
import org.vertx.scala.platform.Verticle
10-
119
import com.github.mauricio.async.db.{ Configuration, Connection, QueryResult, RowData }
1210
import com.github.mauricio.async.db.postgresql.exceptions.GenericDatabaseException
13-
1411
import io.vertx.asyncsql.database.pool.AsyncConnectionPool
1512
import io.vertx.busmod.ScalaBusMod
1613
import io.vertx.helpers.VertxScalaHelpers
14+
import org.vertx.scala.core.json.Json
1715

1816
trait ConnectionHandler extends ScalaBusMod with VertxScalaHelpers {
1917
val verticle: Verticle
@@ -80,13 +78,15 @@ trait ConnectionHandler extends ScalaBusMod with VertxScalaHelpers {
8078
}
8179

8280
protected def transaction(json: JsonObject): Future[Reply] = pool.withConnection({ c: Connection =>
81+
logger.info("TRANSACTION-JSON: " + json.encodePrettily())
8382
Option(json.getArray("statements")) match {
8483
case Some(statements) => rawCommand((statements.asScala.map {
85-
case js: JsonObject => js.getString("action") match {
86-
case "select" => selectCommand(js)
87-
case "insert" => insertCommand(js)
88-
case "raw" => js.getString("command")
89-
}
84+
case js: JsonObject =>
85+
js.getString("action") match {
86+
case "select" => selectCommand(js)
87+
case "insert" => insertCommand(js)
88+
case "raw" => js.getString("command")
89+
}
9090
case _ => throw new IllegalArgumentException("'statements' needs JsonObjects!")
9191
}).mkString(transactionStart, statementDelimiter, statementDelimiter + transactionEnd))
9292
case None => throw new IllegalArgumentException("No 'statements' field in request!")
@@ -133,5 +133,5 @@ trait ConnectionHandler extends ScalaBusMod with VertxScalaHelpers {
133133
Ok(result)
134134
}
135135

136-
private def rowDataToJsonArray(rowData: RowData): JsonArray = rowData.toList
136+
private def rowDataToJsonArray(rowData: RowData): JsonArray = Json.arr(rowData.toList: _*)
137137
}

‎src/main/scala/io/vertx/helpers/VertxScalaHelpers.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ trait VertxScalaHelpers {
2525
def tryOp[T](f: => T): Option[T] = try { Some(f) } catch { case _: Throwable => None }
2626
def toInt(s: String): Option[Int] = tryOp(s.toInt)
2727

28-
implicit def listToJsonArray[X](list: List[X]): JsonArray = {
29-
Json.arr(list)
30-
}
31-
3228
}
3329

3430
object VertxScalaHelpers extends VertxScalaHelpers

‎src/test/scala/io/vertx/asyncsql/test/BaseSqlTests.scala

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package io.vertx.asyncsql.test
33
import scala.collection.JavaConversions.iterableAsScalaIterable
44
import scala.concurrent.Future
55

6-
import org.vertx.scala.core.json.{Json, JsonArray}
7-
import org.vertx.testtools.VertxAssert.{assertEquals, assertTrue}
6+
import org.vertx.scala.core.json.{ Json, JsonArray }
7+
import org.vertx.testtools.VertxAssert.{ assertEquals, assertTrue }
88

99
trait BaseSqlTests { this: SqlTestVerticle =>
1010

@@ -102,7 +102,7 @@ trait BaseSqlTests { this: SqlTestVerticle =>
102102
}
103103

104104
def selectEverything(): Unit = typeTestInsert {
105-
val fieldsArray = Json.arr(List("name", "email", "is_male", "age", "money", "wedding_date"))
105+
val fieldsArray = Json.arr("name", "email", "is_male", "age", "money", "wedding_date")
106106
expectOk(select("some_test", fieldsArray)) map { reply =>
107107
val receivedFields = reply.getArray("fields")
108108
logger.info("received: " + receivedFields.encode())
@@ -167,21 +167,24 @@ trait BaseSqlTests { this: SqlTestVerticle =>
167167
}
168168

169169
def preparedSelect(): Unit = typeTestInsert {
170-
expectOk(prepared("SELECT email FROM some_test WHERE name=? AND age=?", Json.arr(List("Mr. Test", 15)))) map { reply =>
170+
expectOk(prepared("SELECT email FROM some_test WHERE name=? AND age=?", Json.arr("Mr. Test", 15))) map { reply =>
171171
val receivedFields = reply.getArray("fields")
172-
assertEquals(Json.arr(List("email")), receivedFields)
172+
assertEquals(Json.arr("email"), receivedFields)
173173
// assertEquals(1, reply.getInteger("rows"))
174174
assertEquals("test@example.com", reply.getArray("results").get[JsonArray](0).get[String](0))
175175
}
176176
}
177177

178178
def transaction(): Unit = typeTestInsert {
179-
expectOk(transaction(
180-
List(insert("some_test", List("name", "email", "is_male", "age", "money"), Json.arr(List(Json.arr(List("Mr. Test jr.", "test3@example.com", true, 5, 2))))),
181-
raw("SELECT SUM(age) FROM some_test WHERE is_male = true")))) map { reply =>
182-
val results = reply.getArray("results")
183-
assertEquals(1, results.size())
184-
assertEquals(20, results.get[JsonArray](0).get[Int](0))
185-
}
179+
expectOk(
180+
transaction(
181+
insert("some_test", Json.arr("name", "email", "is_male", "age", "money"),
182+
Json.arr(Json.arr("Mr. Test jr.", "test3@example.com", true, 5, 2))),
183+
raw("SELECT SUM(age) FROM some_test WHERE is_male = true")))
184+
.map { reply =>
185+
val results = reply.getArray("results")
186+
assertEquals(1, results.size())
187+
assertEquals(20, results.get[JsonArray](0).get[Int](0))
188+
}
186189
}
187190
}

‎src/test/scala/io/vertx/asyncsql/test/SqlTestVerticle.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ abstract class SqlTestVerticle extends TestVerticle with BaseVertxIntegrationTes
6262

6363
protected def prepared(statement: String, values: JsonArray) = Json.obj("action" -> "prepared", "statement" -> statement, "values" -> values)
6464

65-
protected def transaction(statements: List[JsonObject]) = Json.obj("action" -> "transaction", "statements" -> Json.arr(statements))
65+
protected def transaction(statements: JsonObject*) = Json.obj("action" -> "transaction", "statements" -> Json.arr(statements: _*))
6666

6767
protected def createTable(tableName: String) = expectOk(raw(createTableStatement(tableName))) map { reply =>
6868
assertEquals(0, reply.getNumber("rows"))

0 commit comments

Comments
 (0)