Skip to content

Commit 6104bd4

Browse files
committed
refactor: code cleanup on jdbc package
1 parent d787d6e commit 6104bd4

3 files changed

Lines changed: 44 additions & 111 deletions

File tree

src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoDatabaseMetaData.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import scala.collection.mutable.ArrayBuffer
1414

1515
class MongoDatabaseMetaData(connection: MongoJdbcConnection) extends DatabaseMetaData {
1616
private lazy val semVer = new Semver(BuildInfo.version)
17-
private lazy val jdbcSemVer = new Semver("4.2")
17+
private lazy val jdbcSemVer = new Semver("4.2.0")
1818
private lazy val DatabaseNameKey = "mongodb"
1919

2020
override def allProceduresAreCallable() = false

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

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
11
package dev.mongocamp.driver.mongodb.jdbc
22

3-
import dev.mongocamp.driver.mongodb.Converter
43
import dev.mongocamp.driver.mongodb.bson.BsonConverter
54
import dev.mongocamp.driver.mongodb.database.DatabaseProvider
65
import dev.mongocamp.driver.mongodb.jdbc.statement.MongoPreparedStatement
6+
import dev.mongocamp.driver.mongodb.json.JsonConverter
7+
import org.mongodb.scala.bson.collection.immutable.Document
78

8-
import java.sql.{
9-
Blob,
10-
CallableStatement,
11-
Clob,
12-
Connection,
13-
DatabaseMetaData,
14-
NClob,
15-
PreparedStatement,
16-
SQLException,
17-
SQLWarning,
18-
SQLXML,
19-
Savepoint,
20-
Statement,
21-
Struct
22-
}
9+
import java.sql.{Blob, CallableStatement, Clob, Connection, DatabaseMetaData, NClob, PreparedStatement, SQLException, SQLWarning, SQLXML, Savepoint, Statement, Struct}
2310
import java.util.Properties
2411
import java.util.concurrent.Executor
25-
import java.{ sql, util }
12+
import java.{sql, util}
2613
import scala.jdk.CollectionConverters._
2714

2815
class MongoJdbcConnection(databaseProvider: DatabaseProvider) extends Connection with MongoJdbcCloseable {
@@ -186,23 +173,19 @@ class MongoJdbcConnection(databaseProvider: DatabaseProvider) extends Connection
186173
}
187174

188175
override def createClob(): Clob = {
189-
checkClosed()
190-
null
176+
throw sqlFeatureNotSupported()
191177
}
192178

193179
override def createBlob(): Blob = {
194-
checkClosed()
195-
null
180+
throw sqlFeatureNotSupported()
196181
}
197182

198183
override def createNClob(): NClob = {
199-
checkClosed()
200-
null
184+
throw sqlFeatureNotSupported()
201185
}
202186

203187
override def createSQLXML(): SQLXML = {
204-
checkClosed()
205-
null
188+
throw sqlFeatureNotSupported()
206189
}
207190

208191
override def isValid(timeout: Int): Boolean = {
@@ -237,19 +220,17 @@ class MongoJdbcConnection(databaseProvider: DatabaseProvider) extends Connection
237220
override def getClientInfo: Properties = {
238221
val properties = new Properties()
239222
properties.setProperty("ApplicationName", databaseProvider.config.applicationName)
240-
val document = Converter.toDocument(databaseProvider.config)
223+
val document = Document(JsonConverter().toJson(databaseProvider.config))
241224
BsonConverter.asMap(document).foreach(entry => properties.setProperty(entry._1, entry._2.toString))
242225
properties
243226
}
244227

245228
override def createArrayOf(typeName: String, elements: Array[AnyRef]): sql.Array = {
246-
checkClosed()
247-
null
229+
throw sqlFeatureNotSupported()
248230
}
249231

250232
override def createStruct(typeName: String, attributes: Array[AnyRef]): Struct = {
251-
checkClosed()
252-
null
233+
throw sqlFeatureNotSupported()
253234
}
254235

255236
override def setSchema(schema: String): Unit = {

0 commit comments

Comments
 (0)