fix: jdbc access to functional named fields

Author: QuadStingray

src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSetMetaData.scala

@@ -1,7 +1,6 @@
 package dev.mongocamp.driver.mongodb.jdbc.resultSet
 
 import dev.mongocamp.driver.mongodb._
-import dev.mongocamp.driver.mongodb.json._
 import org.mongodb.scala.Document
 import org.mongodb.scala.bson.{ BsonBoolean, BsonInt32, BsonInt64, BsonNumber, BsonString }
 
@@ -56,7 +55,16 @@ class MongoDbResultSetMetaData extends ResultSetMetaData {
 
   override def getColumnLabel(column: Int): String = {
     val keys: Iterable[String] = if (keySet.nonEmpty) {
-      keySet
+      keySet.map(s => {
+        var key = s
+        if (key.startsWith("(")) {
+          key = key.substring(1, key.length - 1)
+        }
+        if (key.endsWith("(")) {
+          key = key.substring(0, key.length - 1)
+        }
+        key
+      })
     }
     else {
       document.keys

src/test/scala/dev/mongocamp/driver/mongodb/jdbc/SelectJDBCSuite.scala

@@ -11,11 +11,11 @@ class SelectJDBCSuite extends BaseJdbcSuite {
     var i           = 0
     val arrayBuffer = ArrayBuffer[ResultSet]()
     while (result.next()) {
-      assertEquals(result.getLong(1),result.getLong("id"))
-      assertEquals(result.getString(2),result.getString("guid"))
-      assertEquals(result.getString(3),result.getString("name"))
-      assertEquals(result.getInt(4),result.getInt("age"))
-      assertEquals(result.getDouble(5),result.getDouble("balance"))
+      assertEquals(result.getLong(1), result.getLong("id"))
+      assertEquals(result.getString(2), result.getString("guid"))
+      assertEquals(result.getString(3), result.getString("name"))
+      assertEquals(result.getInt(4), result.getInt("age"))
+      assertEquals(result.getDouble(5), result.getDouble("balance"))
       i += 1
       arrayBuffer += result
     }
@@ -49,4 +49,14 @@ class SelectJDBCSuite extends BaseJdbcSuite {
     assertEquals(i, 1)
   }
 
+  test("select distinct") {
+    val stmt   = connection.createStatement()
+    val result = stmt.executeQuery("select distinct(favoriteFruit), count(*) from `mongocamp-unit-test`.people order by count(*) desc;")
+    result.next()
+    assertEquals(result.getString("favoriteFruit"), "strawberry")
+    assertEquals(result.getInt("count(*)"), 71)
+    assertEquals(result.getString(1), "strawberry")
+    assertEquals(result.getInt(2), 71)
+  }
+
 }

src/test/scala/dev/mongocamp/driver/mongodb/sql/SelectSqlSuite.scala

@@ -168,7 +168,7 @@ class SelectSqlSuite extends BasePersonSuite {
     assertEquals(document.getInteger("sum(age)").toInt, 324)
   }
 
-  test("destinct") {
+  test("distinct query") {
     val queryConverter = MongoSqlQueryHolder("select distinct favoriteFruit, count(*) from people order by count(*) desc;")
     val selectResponse = queryConverter.run(TestDatabase.provider).resultList()
     assertEquals(selectResponse.size, 3)