Skip to content

Commit

Permalink
test: added more tests for jdbc package
Browse files Browse the repository at this point in the history
  • Loading branch information
QuadStingray committed Feb 5, 2025
1 parent d1ce373 commit c047fbb
Show file tree
Hide file tree
Showing 6 changed files with 858 additions and 160 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Documentation can be found [here](https://mongodb-driver.mongocamp.dev/).

## Version

Scala Version is 2.13.x / 2.12.x.
Scala Version is 3.6.x / 2.13.x

## CI

Expand Down Expand Up @@ -153,7 +153,6 @@ class RestaurantDemoSpec extends Specification with RestaurantDemoDatabaseFuncti
```shell
docker rm -f mongodb;
docker run -d --publish 27017:27017 --name mongodb mongocamp/mongodb:latest;
sbt +test;
```

## Supporters
Expand Down
13 changes: 5 additions & 8 deletions src/main/scala/dev/mongocamp/driver/DocumentIncludes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@ trait DocumentIncludes {

implicit def luceneQueryBson(query: Query): Bson = LuceneQueryConverter.toDocument(query)

implicit def documentFromJavaMap(map: java.util.Map[String, Any]): Document =
documentFromScalaMap(map.asScala.toMap)
implicit def documentFromJavaMap(map: java.util.Map[String, Any]): Document = documentFromScalaMap(map.asScala.toMap)

implicit def documentFromMutableMap(map: collection.mutable.Map[String, Any]): Document =
documentFromScalaMap(map.toMap)
implicit def documentFromMutableMap(map: collection.mutable.Map[String, Any]): Document = documentFromScalaMap(map.toMap)

implicit def documentFromScalaMap(map: Map[String, Any]): Document = {
var result = Document()
Expand All @@ -44,16 +42,15 @@ trait DocumentIncludes {
result
}

implicit def mapFromDocument(document: Document): Map[String, Any] =
BsonConverter.asMap(document)
implicit def mapFromDocument(document: Document): Map[String, Any] = BsonConverter.asMap(document)

implicit def mapListFromDocuments(documents: List[Document]): List[Map[String, Any]] =
BsonConverter.asMapList(documents)
implicit def mapListFromDocuments(documents: List[Document]): List[Map[String, Any]] = BsonConverter.asMapList(documents)

// ObjectId
implicit def stringToObjectId(str: String): ObjectId = new ObjectId(str)

implicit def documentToObjectId(doc: Document): ObjectId = {
doc.getObjectId(DatabaseProvider.ObjectIdKey)
}

}
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package dev.mongocamp.driver.mongodb.jdbc.resultSet

import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.*
import dev.mongocamp.driver.mongodb.bson.BsonConverter
import dev.mongocamp.driver.mongodb.jdbc.MongoJdbcCloseable
import dev.mongocamp.driver.mongodb.json._
import org.mongodb.scala.bson.collection.immutable.Document
import org.mongodb.scala.bson.{ BsonArray, BsonBoolean, BsonDateTime, BsonDouble, BsonInt32, BsonInt64, BsonNull, BsonNumber, BsonObjectId, BsonString }
import org.mongodb.scala.bson.{ BsonDouble, BsonInt32, BsonInt64, BsonObjectId, BsonString }
import org.mongodb.scala.documentToUntypedDocument

import java.io.{ InputStream, Reader }
Expand Down
Loading

0 comments on commit c047fbb

Please sign in to comment.