More JDBC spec supported

Author: mmolimar

src/main/scala/com/github/mmolimar/ksql/jdbc/KsqlConnection.scala

@@ -234,6 +234,8 @@ class KsqlConnection(private[jdbc] val values: KsqlConnectionValues, properties:
 
   override def getAutoCommit: Boolean = false
 
+  override def getSchema: String = None.orNull
+
   override def isValid(timeout: Int): Boolean = ksqlClient.makeStatusRequest.isSuccessful
 
   override def isClosed: Boolean = !connected.getOrElse(throw NotConnected(values.jdbcUrl))

src/main/scala/com/github/mmolimar/ksql/jdbc/KsqlDatabaseMetaData.scala

@@ -430,9 +430,11 @@ class KsqlDatabaseMetaData(private val ksqlConnection: KsqlConnection) extends D
 
   override def getDatabaseProductVersion: String = KsqlDriver.ksqlVersion
 
-  override def getDatabaseMajorVersion: Int = KsqlDriver.driverMajorVersion
+  override def getDatabaseMajorVersion: Int = KsqlDriver.ksqlMajorVersion
 
-  override def getDatabaseMinorVersion: Int = KsqlDriver.driverMinorVersion
+  override def getDatabaseMinorVersion: Int = KsqlDriver.ksqlMinorVersion
+
+  override def getRowIdLifetime: RowIdLifetime = RowIdLifetime.ROWID_VALID_OTHER
 
   override def getCatalogTerm: String = "TOPIC"
 
@@ -470,12 +472,18 @@ class KsqlDatabaseMetaData(private val ksqlConnection: KsqlConnection) extends D
 
   override def getConnection: Connection = ksqlConnection
 
+  override def getMaxIndexLength: Int = 0
+
+  override def getMaxSchemaNameLength: Int = 0
+
   override def getMaxTableNameLength: Int = 0
 
   override def getMaxTablesInSelect: Int = 0
 
   override def getMaxUserNameLength: Int = 0
 
+  override def supportsResultSetType(`type`: Int): Boolean = `type` == ResultSet.TYPE_FORWARD_ONLY
+
   override def getDefaultTransactionIsolation: Int = Connection.TRANSACTION_NONE
 
   override def getSuperTables(catalog: String, schemaPattern: String,
@@ -744,7 +752,7 @@ class KsqlDatabaseMetaData(private val ksqlConnection: KsqlConnection) extends D
 
   override def getNumericFunctions: String = availableFunctions(
     author = None,
-    types = Set("INT", "BIGINT", "DOUBLE", "DECIMAL")
+    types = Set("INT", "INTEGER", "BIGINT", "DOUBLE", "DECIMAL")
   ).mkString(",")
 
   override def getStringFunctions: String = availableFunctions(
@@ -868,6 +876,10 @@ class KsqlDatabaseMetaData(private val ksqlConnection: KsqlConnection) extends D
 
   override def supportsTransactions: Boolean = false
 
+  override def supportsPositionedUpdate: Boolean = false
+
+  override def supportsPositionedDelete: Boolean = false
+
   private def availableFunctions(author: Option[String] = None, names: Set[String] = Set.empty,
                                  types: Set[String] = Set(".*")): Set[String] = {
     var functions = mutable.Set.empty[String]

src/main/scala/com/github/mmolimar/ksql/jdbc/resultset/ResultSet.scala

@@ -477,6 +477,10 @@ private[resultset] abstract class AbstractResultSet[T](private val metadata: Res
 
   override def getString(columnLabel: String): String = getColumn[String](columnLabel)
 
+  override def getObject(columnIndex: Int): AnyRef = getColumn[AnyRef](columnIndex)
+
+  override def getObject(columnLabel: String): AnyRef = getColumn[AnyRef](columnLabel)
+
   override def getMetaData: ResultSetMetaData = metadata
 
   override def getWarnings: SQLWarning = None.orNull
@@ -512,7 +516,7 @@ private[resultset] abstract class AbstractResultSet[T](private val metadata: Res
 
     import ImplicitClasses._
     ev.runtimeClass match {
-      case Any_ if ev.runtimeClass == value.getClass => value
+      case Any_ if ev.runtimeClass == Option(value).map(_.getClass).getOrElse(classOf[Object]) => value
       case String_ => Option(value).map(_.toString).getOrElse(None.orNull)
       case JBoolean_ if value.isInstanceOf[String] => JBoolean.parseBoolean(value.asInstanceOf[String])
       case JBoolean_ if value.isInstanceOf[Number] => value.asInstanceOf[Number].intValue != 0

src/test/scala/com/github/mmolimar/ksql/jdbc/KsqlConnectionSpec.scala

@@ -64,6 +64,7 @@ class KsqlConnectionSpec extends AnyWordSpec with Matchers with MockFactory {
         ksqlConnection.setAutoCommit(true)
         ksqlConnection.setAutoCommit(false)
         ksqlConnection.getAutoCommit should be(false)
+        ksqlConnection.getSchema should be(None.orNull)
         ksqlConnection.getWarnings should be(None.orNull)
         ksqlConnection.getCatalog should be(None.orNull)
         ksqlConnection.setCatalog("test")

src/test/scala/com/github/mmolimar/ksql/jdbc/KsqlDatabaseMetaDataSpec.scala

@@ -1,7 +1,7 @@
 package com.github.mmolimar.ksql.jdbc
 
 import java.io.InputStream
-import java.sql.{Connection, ResultSet, SQLException, SQLFeatureNotSupportedException}
+import java.sql.{Connection, ResultSet, RowIdLifetime, SQLException, SQLFeatureNotSupportedException}
 import java.util.{Collections, Properties}
 
 import com.github.mmolimar.ksql.jdbc.utils.TestUtils._
@@ -180,11 +180,14 @@ class KsqlDatabaseMetaDataSpec extends AnyWordSpec with Matchers with MockFactor
         metadata.getSearchStringEscape should be("%")
         metadata.getExtraNameCharacters should be("#@")
         metadata.getMaxConnections should be(0)
+        metadata.getMaxIndexLength should be(0)
+        metadata.getMaxSchemaNameLength should be(0)
         metadata.getMaxTableNameLength should be(0)
         metadata.getMaxTablesInSelect should be(0)
         metadata.getMaxUserNameLength should be(0)
         metadata.getMaxUserNameLength should be(0)
         metadata.getDefaultTransactionIsolation should be(Connection.TRANSACTION_NONE)
+        metadata.getRowIdLifetime should be(RowIdLifetime.ROWID_VALID_OTHER)
         metadata.getUserName should be ("")
 
         metadata.allProceduresAreCallable should be(false)
@@ -241,6 +244,9 @@ class KsqlDatabaseMetaDataSpec extends AnyWordSpec with Matchers with MockFactor
         metadata.supportsFullOuterJoins should be(true)
         metadata.supportsLimitedOuterJoins should be(true)
         metadata.supportsTransactions should be(false)
+        metadata.supportsPositionedUpdate should be(false)
+        metadata.supportsPositionedDelete should be(false)
+        metadata.supportsResultSetType(ResultSet.TYPE_FORWARD_ONLY) should be(true)
         metadata.supportsUnion should be(false)
         metadata.supportsUnionAll should be(false)
       }

src/test/scala/com/github/mmolimar/ksql/jdbc/resultset/KsqlResultSetSpec.scala

@@ -144,10 +144,32 @@ class KsqlResultSetSpec extends AnyWordSpec with Matchers with MockFactory with
           resultSet.getDouble(index + 1) should be(e(8))
           resultSet.wasNull should be(false)
         }
+        resultSet.getObject(1) should be(Int.box(1))
+        resultSet.getObject(2) should be(Long.box(2L))
+        resultSet.getObject(3) should be(Double.box(3.3d))
+        resultSet.getObject(4) should be(Boolean.box(true))
+        resultSet.getObject(5) should be("1")
+        resultSet.getObject(6) should be(Map.empty)
+        resultSet.getObject(7) should be(scala.Array.empty)
+        resultSet.getObject(8) should be(Map.empty)
+
+        resultSet.getString(9) should be(None.orNull)
+        resultSet.getBytes(9) should be(None.orNull)
+        resultSet.getBoolean(9) should be(Boolean.box(false))
+        resultSet.getByte(9) should be(Byte.box(0))
+        resultSet.getShort(9) should be(Short.box(0))
+        resultSet.getInt(9) should be(Int.box(0))
+        resultSet.getLong(9) should be(Long.box(0L))
+        resultSet.getFloat(9) should be(Float.box(0.0f))
+        resultSet.getDouble(9) should be(Double.box(0.0d))
+        resultSet.getObject(9) should be(None.orNull)
 
         assertThrows[SQLException] {
           resultSet.getString(1000)
         }
+        assertThrows[SQLException] {
+          resultSet.getObject("UNKNOWN")
+        }
         assertThrows[SQLException] {
           resultSet.getString("UNKNOWN")
         }