Skip to content

Commit 76dba04

Browse files
author
MongoCamp CI
committed
ci: update version after release
1 parent b048977 commit 76dba04

File tree

9 files changed

+82
-46
lines changed

9 files changed

+82
-46
lines changed

‎package.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"name": "mongodb-driver",
3-
"organization": "dev.mongocamp",
4-
"version": "3.0.0",
5-
"author": "[email protected]",
6-
"license": "Apache-2.0",
7-
"type": "module",
8-
"repository": {
9-
"type": "git",
10-
"url": "git+https://github.com/MongoCamp/mongodb-driver.git"
2+
"name" : "mongodb-driver",
3+
"organization" : "dev.mongocamp",
4+
"version" : "3.0.1.snapshot",
5+
"author" : "[email protected]",
6+
"license" : "Apache-2.0",
7+
"type" : "module",
8+
"repository" : {
9+
"type" : "git",
10+
"url" : "git+https://github.com/MongoCamp/mongodb-driver.git"
1111
},
12-
"bugs": {
13-
"url": "https://github.com/MongoCamp/mongodb-driver/issues"
12+
"bugs" : {
13+
"url" : "https://github.com/MongoCamp/mongodb-driver/issues"
1414
},
15-
"homepage": "https://mongodb-driver.mongocamp.dev/",
16-
"scripts": {
17-
"docs:serve": "vitepress serve docs --port 5555",
18-
"docs:build": "pnpm docs:external; vitepress build docs",
19-
"docs:external": "sh docs/external/fileloader.sh",
20-
"docs:dev": "pnpm docs:external; vitepress dev docs"
15+
"homepage" : "https://mongodb-driver.mongocamp.dev/",
16+
"scripts" : {
17+
"docs:serve" : "vitepress serve docs --port 5555",
18+
"docs:build" : "pnpm docs:external; vitepress build docs",
19+
"docs:external" : "sh docs/external/fileloader.sh",
20+
"docs:dev" : "pnpm docs:external; vitepress dev docs"
2121
},
22-
"devDependencies": {
23-
"@iconify-json/fluent-emoji": "^1.2.3",
24-
"@unocss/preset-icons": "^65.4.3",
25-
"unocss": "^65.4.3",
26-
"vitepress": "1.6.3"
22+
"devDependencies" : {
23+
"@iconify-json/fluent-emoji" : "^1.2.3",
24+
"@unocss/preset-icons" : "^65.4.3",
25+
"unocss" : "^65.4.3",
26+
"vitepress" : "1.6.3"
2727
}
2828
}

‎src/main/scala/dev/mongocamp/driver/DocumentIncludes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ trait DocumentIncludes {
5252
implicit def documentToObjectId(doc: Document): ObjectId = {
5353
doc.getObjectId(DatabaseProvider.ObjectIdKey)
5454
}
55-
55+
5656
}

‎src/main/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelper.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.mongocamp.driver.mongodb.bson
22

3-
import better.files.{ Scanner, StringSplitter, stringSource }
3+
import better.files.{ stringSource, Scanner, StringSplitter }
44
import com.typesafe.scalalogging.LazyLogging
55
import org.mongodb.scala.Document
66

‎src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,24 @@ import dev.mongocamp.driver.mongodb.jdbc.statement.MongoPreparedStatement
66
import dev.mongocamp.driver.mongodb.json.JsonConverter
77
import org.mongodb.scala.bson.collection.immutable.Document
88

9-
import java.sql.{Blob, CallableStatement, Clob, Connection, DatabaseMetaData, NClob, PreparedStatement, SQLException, SQLWarning, SQLXML, Savepoint, Statement, Struct}
9+
import java.sql.{
10+
Blob,
11+
CallableStatement,
12+
Clob,
13+
Connection,
14+
DatabaseMetaData,
15+
NClob,
16+
PreparedStatement,
17+
SQLException,
18+
SQLWarning,
19+
SQLXML,
20+
Savepoint,
21+
Statement,
22+
Struct
23+
}
1024
import java.util.Properties
1125
import java.util.concurrent.Executor
12-
import java.{sql, util}
26+
import java.{ sql, util }
1327
import scala.jdk.CollectionConverters._
1428

1529
class MongoJdbcConnection(databaseProvider: DatabaseProvider) extends Connection with MongoJdbcCloseable {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import java.sql.{ ResultSetMetaData, SQLException }
1010
class MongoDbResultSetMetaData extends ResultSetMetaData {
1111
private var document: Document = _
1212
private var collectionDao: MongoDAO[Document] = _
13-
private var keySet: List[String] = List.empty
13+
private var keySet: List[String] = List.empty
1414

1515
def this(dao: MongoDAO[Document]) = {
1616
this()
@@ -57,7 +57,8 @@ class MongoDbResultSetMetaData extends ResultSetMetaData {
5757
override def getColumnLabel(column: Int): String = {
5858
val keys: Iterable[String] = if (keySet.nonEmpty) {
5959
keySet
60-
} else {
60+
}
61+
else {
6162
document.keys
6263
}
6364
keys.toList(column - 1)
@@ -138,7 +139,8 @@ class MongoDbResultSetMetaData extends ResultSetMetaData {
138139
def getColumnIndex(columnLabel: String): Int = {
139140
val keys: List[String] = if (keySet.nonEmpty) {
140141
keySet
141-
} else {
142+
}
143+
else {
142144
document.keys.toList
143145
}
144146
keys.indexOf(columnLabel) + 1

‎src/main/scala/dev/mongocamp/driver/mongodb/jdbc/statement/MongoPreparedStatement.scala

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,33 @@ package dev.mongocamp.driver.mongodb.jdbc.statement
33
import com.typesafe.scalalogging.LazyLogging
44
import dev.mongocamp.driver.mongodb.exception.SqlCommandNotSupportedException
55
import dev.mongocamp.driver.mongodb.jdbc.resultSet.MongoDbResultSet
6-
import dev.mongocamp.driver.mongodb.jdbc.{MongoJdbcCloseable, MongoJdbcConnection}
6+
import dev.mongocamp.driver.mongodb.jdbc.{ MongoJdbcCloseable, MongoJdbcConnection }
77
import dev.mongocamp.driver.mongodb.json.JsonConverter
88
import dev.mongocamp.driver.mongodb.sql.MongoSqlQueryHolder
9-
import dev.mongocamp.driver.mongodb.{Converter, GenericObservable}
9+
import dev.mongocamp.driver.mongodb.{ Converter, GenericObservable }
1010
import org.joda.time.DateTime
1111

12-
import java.io.{InputStream, Reader}
12+
import java.io.{ InputStream, Reader }
1313
import java.net.URL
14-
import java.sql.{Blob, CallableStatement, Clob, Connection, Date, NClob, ParameterMetaData, Ref, ResultSet, ResultSetMetaData, RowId, SQLWarning, SQLXML, Time, Timestamp}
14+
import java.sql.{
15+
Blob,
16+
CallableStatement,
17+
Clob,
18+
Connection,
19+
Date,
20+
NClob,
21+
ParameterMetaData,
22+
Ref,
23+
ResultSet,
24+
ResultSetMetaData,
25+
RowId,
26+
SQLWarning,
27+
SQLXML,
28+
Time,
29+
Timestamp
30+
}
1531
import java.util.Calendar
16-
import java.{sql, util}
32+
import java.{ sql, util }
1733
import scala.collection.mutable
1834
import scala.util.Try
1935

@@ -679,10 +695,12 @@ case class MongoPreparedStatement(connection: MongoJdbcConnection) extends Calla
679695

680696
override def getURL(parameterIndex: Int): URL = {
681697
checkClosed()
682-
Option(getString(parameterIndex)).flatMap(v => {
683-
val urlParser = Try(new java.net.URI(v).toURL)
684-
urlParser.toOption
685-
}).orNull
698+
Option(getString(parameterIndex))
699+
.flatMap(v => {
700+
val urlParser = Try(new java.net.URI(v).toURL)
701+
urlParser.toOption
702+
})
703+
.orNull
686704
}
687705

688706
override def getString(parameterName: String): String = {

‎src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ object LuceneQueryConverter extends LazyLogging {
5959
val subQueries = booleanQuery.clauses().asScala
6060
val listOfAnd = ArrayBuffer[Map[String, Any]]()
6161
val listOfOr = ArrayBuffer[Map[String, Any]]()
62-
val listOfNOr = ArrayBuffer[Map[String, Any]]()
62+
val listOfNOr = ArrayBuffer[Map[String, Any]]()
6363
var nextTypeAnd = true
6464
subQueries.foreach(c => {
6565
val negateSubquery = (c.occur() == Occur.MUST_NOT)
66-
val queryMap = getMongoDbSearchMap(c.query(), negateSubquery, searchWithValueAndString)
67-
var thisTypeAnd = true
66+
val queryMap = getMongoDbSearchMap(c.query(), negateSubquery, searchWithValueAndString)
67+
var thisTypeAnd = true
6868

6969
if (c.occur == Occur.MUST) {
7070
thisTypeAnd = true
@@ -92,14 +92,16 @@ object LuceneQueryConverter extends LazyLogging {
9292
if (listOfAnd.nonEmpty) {
9393
if (negate) {
9494
searchMapResponse.put("$nor", listOfAnd.toList)
95-
} else {
95+
}
96+
else {
9697
searchMapResponse.put("$and", listOfAnd.toList)
9798
}
9899
}
99100
if (listOfOr.nonEmpty) {
100101
if (negate) {
101102
searchMapResponse.put("$nor", listOfOr.toList)
102-
} else {
103+
}
104+
else {
103105
searchMapResponse.put("$or", listOfOr.toList)
104106
}
105107
}

‎src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedFilter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.mongocamp.driver.mongodb.pagination
22

33
import dev.mongocamp.driver.mongodb.exception.MongoCampPaginationException
4-
import dev.mongocamp.driver.mongodb.{ MongoDAO , _ }
4+
import dev.mongocamp.driver.mongodb.{ MongoDAO, _ }
55
import io.circe.Decoder
66
import io.circe.generic.auto._
77
import org.mongodb.scala.bson.conversions.Bson

‎src/main/scala/dev/mongocamp/driver/mongodb/sql/MongoSqlQueryHolder.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class MongoSqlQueryHolder {
4848
private var indexOptions: Option[IndexOptions] = None
4949
private var callFunction: Option[String] = None
5050
private var keepOneDocument: Boolean = false
51-
private val keysFromSelect: mutable.ListBuffer[String] = mutable.ListBuffer.empty
51+
private val keysFromSelect: mutable.ListBuffer[String] = mutable.ListBuffer.empty
5252

5353
def this(statement: net.sf.jsqlparser.statement.Statement) = {
5454
this()
@@ -346,7 +346,7 @@ class MongoSqlQueryHolder {
346346
sI match {
347347
case se: SelectItem[Expression] =>
348348
val expressionName = se.getExpression.toString
349-
val keyFromSelect = Option(se.getAlias).map(_.getName).getOrElse(expressionName)
349+
val keyFromSelect = Option(se.getAlias).map(_.getName).getOrElse(expressionName)
350350
if (keyFromSelect != "*") {
351351
keysFromSelect += keyFromSelect
352352
}

0 commit comments

Comments
 (0)