Skip to content

result values have the same order as result columNames #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2013
Merged

result values have the same order as result columNames #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/main/scala/io/vertx/asyncsql/database/ConnectionHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,20 @@ trait ConnectionHandler extends ScalaBusMod with VertxScalaHelpers {
val fields = (new JsonArray() /: resultSet.columnNames) { (arr, name) =>
arr.addString(name)
}
val rows = (new JsonArray() /: resultSet) { (arr, rowData) =>
arr.add(rowDataToJsonArray(rowData))
}

val rows = Json.arr((for {
rowData <- resultSet
} yield Json.arr((for {
columnName <- resultSet.columnNames
} yield {
rowData(columnName)
}): _*)): _*)

result.putArray("fields", fields)
result.putArray("results", rows)
case None =>
}

Ok(result)
}

private def rowDataToJsonArray(rowData: RowData): JsonArray = Json.arr(rowData.toList: _*)
}
22 changes: 20 additions & 2 deletions src/test/scala/io/vertx/asyncsql/test/BaseSqlTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import scala.collection.JavaConversions.iterableAsScalaIterable
import scala.concurrent.Future

import org.vertx.scala.core.json.{ Json, JsonArray }
import org.vertx.testtools.VertxAssert.{ assertEquals, assertTrue }
import org.vertx.testtools.VertxAssert._

trait BaseSqlTests { this: SqlTestVerticle =>

Expand Down Expand Up @@ -39,7 +39,7 @@ trait BaseSqlTests { this: SqlTestVerticle =>
}

def multipleFields(): Unit = asyncTest {
expectOk(raw("SELECT 1, 0")) map { reply =>
expectOk(raw("SELECT 1 a, 0 b")) map { reply =>
val res = reply.getArray("results")
assertEquals(1, res.size())
val firstElem = res.get[JsonArray](0)
Expand All @@ -48,6 +48,24 @@ trait BaseSqlTests { this: SqlTestVerticle =>
}
}

def multipleFieldsOrder(): Unit = typeTestInsert {
import scala.collection.JavaConverters._
expectOk(raw("SELECT is_male, age, email, money, name FROM some_test WHERE is_male = true")) map { reply =>
val receivedFields = reply.getArray("fields")
val results = reply.getArray("results").get[JsonArray](0)

assertEquals(1, reply.getNumber("rows"))

val columnNamesList = receivedFields.asScala.toList

assertEquals("Mr. Test", results.get(columnNamesList.indexOf("name")))
assertEquals("test@example.com", results.get(columnNamesList.indexOf("email")))
assertEquals(15, results.get(columnNamesList.indexOf("age")))
assertEquals(true, results.get(columnNamesList.indexOf("is_male")))
assertEquals(167.31, results.get(columnNamesList.indexOf("money")), 0.1)
}
}

def createAndDropTable(): Unit = asyncTest {
createTable("some_test") flatMap (_ => dropTable("some_test")) map { reply =>
assertEquals(0, reply.getNumber("rows"))
Expand Down
8 changes: 5 additions & 3 deletions src/test/scala/io/vertx/asyncsql/test/mysql/MySqlTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ CREATE TABLE """ + tableName + """ (
@Test
override def multipleFields(): Unit = super.multipleFields()
@Test
override def multipleFieldsOrder(): Unit = super.multipleFieldsOrder()
@Test
override def createAndDropTable(): Unit = super.createAndDropTable()
@Test
override def insertCorrect(): Unit = super.insertCorrect()
Expand All @@ -49,8 +51,8 @@ CREATE TABLE """ + tableName + """ (
@Test
override def preparedSelect(): Unit = super.preparedSelect()

// @Ignore("not working currently")
// @Test
// override def transaction(): Unit = super.transaction()
// @Ignore("not working currently")
// @Test
// override def transaction(): Unit = super.transaction()

}
2 changes: 2 additions & 0 deletions src/test/scala/io/vertx/asyncsql/test/postgresql/PostgreSqlTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class PostgreSqlTest extends SqlTestVerticle with BaseSqlTests {
@Test
override def multipleFields(): Unit = super.multipleFields()
@Test
override def multipleFieldsOrder(): Unit = super.multipleFieldsOrder()
@Test
override def createAndDropTable(): Unit = super.createAndDropTable()
@Test
override def insertCorrect(): Unit = super.insertCorrect()
Expand Down