SNOW-867390 update jdbc version (#51)

* zli/SNOW-867390 update jdbc version * zli/SNOW-867390 update jdbc version * update jdbc connection to base class
snowflakedb · Sep 18, 2023 · 265c417 · 265c417
1 parent e273f3c
commit 265c417
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 26 deletions.
diff --git a/fips-pom.xml b/fips-pom.xml
@@ -37,7 +37,7 @@
         <scala.version>2.12.11</scala.version>
         <scala.compat.version>2.12</scala.compat.version>
         <spec2.version>4.2.0</spec2.version>
-        <snowflake.jdbc.version>3.13.32</snowflake.jdbc.version>
+        <snowflake.jdbc.version>3.14.1</snowflake.jdbc.version>
         <version.scala.binary>${scala.compat.version}</version.scala.binary>
         <doctitle>Snowpark ${project.version}</doctitle>
         <bouncycastle.version>1.64</bouncycastle.version>
@@ -46,16 +46,6 @@
         <jackson.databind.version>2.13.4.2</jackson.databind.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>osgeo</id>
-            <name>OSGeo Release Repository</name>
-            <url>https://repo.osgeo.org/repository/release/</url>
-            <snapshots><enabled>false</enabled></snapshots>
-            <releases><enabled>true</enabled></releases>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.scala-lang</groupId>

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
         <scala.version>2.12.11</scala.version>
         <scala.compat.version>2.12</scala.compat.version>
         <spec2.version>4.2.0</spec2.version>
-        <snowflake.jdbc.version>3.13.32</snowflake.jdbc.version>
+        <snowflake.jdbc.version>3.14.1</snowflake.jdbc.version>
         <version.scala.binary>${scala.compat.version}</version.scala.binary>
         <doctitle>Snowpark ${project.version}</doctitle>
         <scoverage.plugin.version>1.4.0</scoverage.plugin.version>
@@ -48,16 +48,6 @@
         <jackson.databind.version>2.13.4.2</jackson.databind.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>osgeo</id>
-            <name>OSGeo Release Repository</name>
-            <url>https://repo.osgeo.org/repository/release/</url>
-            <snapshots><enabled>false</enabled></snapshots>
-            <releases><enabled>true</enabled></releases>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.scala-lang</groupId>

diff --git a/src/main/scala/com/snowflake/snowpark/internal/ServerConnection.scala b/src/main/scala/com/snowflake/snowpark/internal/ServerConnection.scala
@@ -801,7 +801,7 @@ private[snowpark] class ServerConnection(
     }
 
   private[snowpark] def isDone(queryID: String): Boolean =
-    !QueryStatus.isStillRunning(connection.getSfSession.getQueryStatus(queryID))
+    !QueryStatus.isStillRunning(connection.getSFBaseSession.getQueryStatus(queryID))
 
   private[snowpark] def waitForQueryDone(
       queryID: String,
@@ -812,7 +812,7 @@ private[snowpark] class ServerConnection(
     val retryPattern = Array(1, 1, 2, 3, 4, 8, 10)
     def getSeepTime(retry: Int) = retryPattern(retry.min(retryPattern.length - 1)) * 500
 
-    val session = connection.getSfSession
+    val session = connection.getSFBaseSession
     var qs = session.getQueryStatus(queryID)
     var retry = 0
     var lastLogTime = 0

diff --git a/src/test/scala/com/snowflake/snowpark/APIInternalSuite.scala b/src/test/scala/com/snowflake/snowpark/APIInternalSuite.scala
@@ -303,7 +303,7 @@ class APIInternalSuite extends TestData {
    */
   test("Test that all params are correctly propagated to JDBC session") {
     val session2 = Session.builder.configFile(defaultProfile).config("ROLE", "PUBLIC").create
-    val jdbcSession = session2.conn.connection.getSfSession
+    val jdbcSession = session2.conn.connection.getSFBaseSession
     val propertySet = jdbcSession.getConnectionPropertiesMap.keySet()
     assert(propertySet.contains(SFSessionProperty.DATABASE))
     assert(propertySet.contains(SFSessionProperty.SCHEMA))

diff --git a/src/test/scala/com/snowflake/snowpark/ParameterSuite.scala b/src/test/scala/com/snowflake/snowpark/ParameterSuite.scala
@@ -31,7 +31,7 @@ class ParameterSuite extends SNTestBase {
         .create
 
     assert(
-      sessionWithApplicationName.conn.connection.getSfSession.getConnectionPropertiesMap
+      sessionWithApplicationName.conn.connection.getSFBaseSession.getConnectionPropertiesMap
         .get(SFSessionProperty.APPLICATION) == applicationName)
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ class ParameterSuite extends SNTestBase { @@
             .create
         assert(
-          sessionWithApplicationName.conn.connection.getSfSession.getConnectionPropertiesMap
+          sessionWithApplicationName.conn.connection.getSFBaseSession.getConnectionPropertiesMap
             .get(SFSessionProperty.APPLICATION) == applicationName)
       }
@@ Expand Down @@