From 76dba042b5140b38b7b04bd543c88e4eed4d8d99 Mon Sep 17 00:00:00 2001 From: MongoCamp CI Date: Fri, 7 Feb 2025 13:17:10 +0000 Subject: [PATCH] ci: update version after release --- package.json | 44 +++++++++---------- .../mongocamp/driver/DocumentIncludes.scala | 2 +- .../driver/mongodb/bson/DocumentHelper.scala | 2 +- .../mongodb/jdbc/MongoJdbcConnection.scala | 18 +++++++- .../resultSet/MongoDbResultSetMetaData.scala | 8 ++-- .../statement/MongoPreparedStatement.scala | 36 +++++++++++---- .../mongodb/lucene/LuceneQueryConverter.scala | 12 ++--- .../pagination/MongoPaginatedFilter.scala | 2 +- .../mongodb/sql/MongoSqlQueryHolder.scala | 4 +- 9 files changed, 82 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index 8799952f..aa82ae04 100644 --- a/package.json +++ b/package.json @@ -1,28 +1,28 @@ { - "name": "mongodb-driver", - "organization": "dev.mongocamp", - "version": "3.0.0", - "author": "info@mongocamp.dev", - "license": "Apache-2.0", - "type": "module", - "repository": { - "type": "git", - "url": "git+https://github.com/MongoCamp/mongodb-driver.git" + "name" : "mongodb-driver", + "organization" : "dev.mongocamp", + "version" : "3.0.1.snapshot", + "author" : "info@mongocamp.dev", + "license" : "Apache-2.0", + "type" : "module", + "repository" : { + "type" : "git", + "url" : "git+https://github.com/MongoCamp/mongodb-driver.git" }, - "bugs": { - "url": "https://github.com/MongoCamp/mongodb-driver/issues" + "bugs" : { + "url" : "https://github.com/MongoCamp/mongodb-driver/issues" }, - "homepage": "https://mongodb-driver.mongocamp.dev/", - "scripts": { - "docs:serve": "vitepress serve docs --port 5555", - "docs:build": "pnpm docs:external; vitepress build docs", - "docs:external": "sh docs/external/fileloader.sh", - "docs:dev": "pnpm docs:external; vitepress dev docs" + "homepage" : "https://mongodb-driver.mongocamp.dev/", + "scripts" : { + "docs:serve" : "vitepress serve docs --port 5555", + "docs:build" : "pnpm docs:external; vitepress build docs", + "docs:external" : "sh docs/external/fileloader.sh", + "docs:dev" : "pnpm docs:external; vitepress dev docs" }, - "devDependencies": { - "@iconify-json/fluent-emoji": "^1.2.3", - "@unocss/preset-icons": "^65.4.3", - "unocss": "^65.4.3", - "vitepress": "1.6.3" + "devDependencies" : { + "@iconify-json/fluent-emoji" : "^1.2.3", + "@unocss/preset-icons" : "^65.4.3", + "unocss" : "^65.4.3", + "vitepress" : "1.6.3" } } \ No newline at end of file diff --git a/src/main/scala/dev/mongocamp/driver/DocumentIncludes.scala b/src/main/scala/dev/mongocamp/driver/DocumentIncludes.scala index 1caffec5..fb99615f 100644 --- a/src/main/scala/dev/mongocamp/driver/DocumentIncludes.scala +++ b/src/main/scala/dev/mongocamp/driver/DocumentIncludes.scala @@ -52,5 +52,5 @@ trait DocumentIncludes { implicit def documentToObjectId(doc: Document): ObjectId = { doc.getObjectId(DatabaseProvider.ObjectIdKey) } - + } diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelper.scala b/src/main/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelper.scala index 6069db17..cc61daec 100644 --- a/src/main/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelper.scala +++ b/src/main/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelper.scala @@ -1,6 +1,6 @@ package dev.mongocamp.driver.mongodb.bson -import better.files.{ Scanner, StringSplitter, stringSource } +import better.files.{ stringSource, Scanner, StringSplitter } import com.typesafe.scalalogging.LazyLogging import org.mongodb.scala.Document diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala index 4db9f1ff..7bb77f15 100644 --- a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala +++ b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala @@ -6,10 +6,24 @@ import dev.mongocamp.driver.mongodb.jdbc.statement.MongoPreparedStatement import dev.mongocamp.driver.mongodb.json.JsonConverter import org.mongodb.scala.bson.collection.immutable.Document -import java.sql.{Blob, CallableStatement, Clob, Connection, DatabaseMetaData, NClob, PreparedStatement, SQLException, SQLWarning, SQLXML, Savepoint, Statement, Struct} +import java.sql.{ + Blob, + CallableStatement, + Clob, + Connection, + DatabaseMetaData, + NClob, + PreparedStatement, + SQLException, + SQLWarning, + SQLXML, + Savepoint, + Statement, + Struct +} import java.util.Properties import java.util.concurrent.Executor -import java.{sql, util} +import java.{ sql, util } import scala.jdk.CollectionConverters._ class MongoJdbcConnection(databaseProvider: DatabaseProvider) extends Connection with MongoJdbcCloseable { diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSetMetaData.scala b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSetMetaData.scala index a70b7719..150e9aa6 100644 --- a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSetMetaData.scala +++ b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSetMetaData.scala @@ -10,7 +10,7 @@ import java.sql.{ ResultSetMetaData, SQLException } class MongoDbResultSetMetaData extends ResultSetMetaData { private var document: Document = _ private var collectionDao: MongoDAO[Document] = _ - private var keySet: List[String] = List.empty + private var keySet: List[String] = List.empty def this(dao: MongoDAO[Document]) = { this() @@ -57,7 +57,8 @@ class MongoDbResultSetMetaData extends ResultSetMetaData { override def getColumnLabel(column: Int): String = { val keys: Iterable[String] = if (keySet.nonEmpty) { keySet - } else { + } + else { document.keys } keys.toList(column - 1) @@ -138,7 +139,8 @@ class MongoDbResultSetMetaData extends ResultSetMetaData { def getColumnIndex(columnLabel: String): Int = { val keys: List[String] = if (keySet.nonEmpty) { keySet - } else { + } + else { document.keys.toList } keys.indexOf(columnLabel) + 1 diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/statement/MongoPreparedStatement.scala b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/statement/MongoPreparedStatement.scala index f2c76515..b2343c1b 100644 --- a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/statement/MongoPreparedStatement.scala +++ b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/statement/MongoPreparedStatement.scala @@ -3,17 +3,33 @@ package dev.mongocamp.driver.mongodb.jdbc.statement import com.typesafe.scalalogging.LazyLogging import dev.mongocamp.driver.mongodb.exception.SqlCommandNotSupportedException import dev.mongocamp.driver.mongodb.jdbc.resultSet.MongoDbResultSet -import dev.mongocamp.driver.mongodb.jdbc.{MongoJdbcCloseable, MongoJdbcConnection} +import dev.mongocamp.driver.mongodb.jdbc.{ MongoJdbcCloseable, MongoJdbcConnection } import dev.mongocamp.driver.mongodb.json.JsonConverter import dev.mongocamp.driver.mongodb.sql.MongoSqlQueryHolder -import dev.mongocamp.driver.mongodb.{Converter, GenericObservable} +import dev.mongocamp.driver.mongodb.{ Converter, GenericObservable } import org.joda.time.DateTime -import java.io.{InputStream, Reader} +import java.io.{ InputStream, Reader } import java.net.URL -import java.sql.{Blob, CallableStatement, Clob, Connection, Date, NClob, ParameterMetaData, Ref, ResultSet, ResultSetMetaData, RowId, SQLWarning, SQLXML, Time, Timestamp} +import java.sql.{ + Blob, + CallableStatement, + Clob, + Connection, + Date, + NClob, + ParameterMetaData, + Ref, + ResultSet, + ResultSetMetaData, + RowId, + SQLWarning, + SQLXML, + Time, + Timestamp +} import java.util.Calendar -import java.{sql, util} +import java.{ sql, util } import scala.collection.mutable import scala.util.Try @@ -679,10 +695,12 @@ case class MongoPreparedStatement(connection: MongoJdbcConnection) extends Calla override def getURL(parameterIndex: Int): URL = { checkClosed() - Option(getString(parameterIndex)).flatMap(v => { - val urlParser = Try(new java.net.URI(v).toURL) - urlParser.toOption - }).orNull + Option(getString(parameterIndex)) + .flatMap(v => { + val urlParser = Try(new java.net.URI(v).toURL) + urlParser.toOption + }) + .orNull } override def getString(parameterName: String): String = { diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala b/src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala index b8e2355e..643c5c8f 100644 --- a/src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala +++ b/src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala @@ -59,12 +59,12 @@ object LuceneQueryConverter extends LazyLogging { val subQueries = booleanQuery.clauses().asScala val listOfAnd = ArrayBuffer[Map[String, Any]]() val listOfOr = ArrayBuffer[Map[String, Any]]() - val listOfNOr = ArrayBuffer[Map[String, Any]]() + val listOfNOr = ArrayBuffer[Map[String, Any]]() var nextTypeAnd = true subQueries.foreach(c => { val negateSubquery = (c.occur() == Occur.MUST_NOT) - val queryMap = getMongoDbSearchMap(c.query(), negateSubquery, searchWithValueAndString) - var thisTypeAnd = true + val queryMap = getMongoDbSearchMap(c.query(), negateSubquery, searchWithValueAndString) + var thisTypeAnd = true if (c.occur == Occur.MUST) { thisTypeAnd = true @@ -92,14 +92,16 @@ object LuceneQueryConverter extends LazyLogging { if (listOfAnd.nonEmpty) { if (negate) { searchMapResponse.put("$nor", listOfAnd.toList) - } else { + } + else { searchMapResponse.put("$and", listOfAnd.toList) } } if (listOfOr.nonEmpty) { if (negate) { searchMapResponse.put("$nor", listOfOr.toList) - } else { + } + else { searchMapResponse.put("$or", listOfOr.toList) } } diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedFilter.scala b/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedFilter.scala index 9f5d1f04..8f177847 100644 --- a/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedFilter.scala +++ b/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedFilter.scala @@ -1,7 +1,7 @@ package dev.mongocamp.driver.mongodb.pagination import dev.mongocamp.driver.mongodb.exception.MongoCampPaginationException -import dev.mongocamp.driver.mongodb.{ MongoDAO , _ } +import dev.mongocamp.driver.mongodb.{ MongoDAO, _ } import io.circe.Decoder import io.circe.generic.auto._ import org.mongodb.scala.bson.conversions.Bson diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/sql/MongoSqlQueryHolder.scala b/src/main/scala/dev/mongocamp/driver/mongodb/sql/MongoSqlQueryHolder.scala index b4066827..3bfce2f3 100644 --- a/src/main/scala/dev/mongocamp/driver/mongodb/sql/MongoSqlQueryHolder.scala +++ b/src/main/scala/dev/mongocamp/driver/mongodb/sql/MongoSqlQueryHolder.scala @@ -48,7 +48,7 @@ class MongoSqlQueryHolder { private var indexOptions: Option[IndexOptions] = None private var callFunction: Option[String] = None private var keepOneDocument: Boolean = false - private val keysFromSelect: mutable.ListBuffer[String] = mutable.ListBuffer.empty + private val keysFromSelect: mutable.ListBuffer[String] = mutable.ListBuffer.empty def this(statement: net.sf.jsqlparser.statement.Statement) = { this() @@ -346,7 +346,7 @@ class MongoSqlQueryHolder { sI match { case se: SelectItem[Expression] => val expressionName = se.getExpression.toString - val keyFromSelect = Option(se.getAlias).map(_.getName).getOrElse(expressionName) + val keyFromSelect = Option(se.getAlias).map(_.getName).getOrElse(expressionName) if (keyFromSelect != "*") { keysFromSelect += keyFromSelect }