Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SNOW-1411907 Upgrade JDBC to 3.16.0 #556

Merged
merged 4 commits into from
May 14, 2024
Merged

SNOW-1411907 Upgrade JDBC to 3.16.0 #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
968daa3
upgrade jdbc to 3.16.0
sfc-gh-bli May 13, 2024
b2ace9e
fix test
sfc-gh-bli May 13, 2024
e0b6658
fix type
sfc-gh-bli May 13, 2024
8f19af5
change cluster test
sfc-gh-bli May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ClusterTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
TEST_SCALA_VERSION: '2.12'
TEST_COMPILE_SCALA_VERSION: '2.12.11'
TEST_SPARK_CONNECTOR_VERSION: '2.15.0'
TEST_JDBC_VERSION: '3.13.30'
TEST_JDBC_VERSION: '3.16.0'

steps:
- uses: actions/checkout@v2
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,8 @@ ClusterTest/target/
ClusterTest/project/target
ClusterTest/src/main/python/*.pyc
.bsp/
.bloop/
.metals/
.vscode/
project/metals.sbt
project/project
6 changes: 1 addition & 5 deletions ClusterTest/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ lazy val root = project.withId("spark-snowflake").in(file("."))
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
libraryDependencies ++= Seq(
"net.snowflake" % "snowflake-ingest-sdk" % "0.10.8",
"net.snowflake" % "snowflake-jdbc" % "3.13.30",
// "net.snowflake" %% "spark-snowflake" % "2.8.0-spark_3.0",
// "com.google.guava" % "guava" % "14.0.1" % Test,
// "org.scalatest" %% "scalatest" % "3.0.5" % Test,
// "org.mockito" % "mockito-core" % "1.10.19" % Test,
"net.snowflake" % "snowflake-jdbc" % "3.16.0",
"org.apache.commons" % "commons-lang3" % "3.5" % "provided, runtime",
"org.apache.spark" %% "spark-core" % testSparkVersion % "provided, runtime",
"org.apache.spark" %% "spark-sql" % testSparkVersion % "provided, runtime",
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ lazy val root = project.withId("spark-snowflake").in(file("."))
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
libraryDependencies ++= Seq(
"net.snowflake" % "snowflake-ingest-sdk" % "0.10.8",
"net.snowflake" % "snowflake-jdbc" % "3.14.4",
"net.snowflake" % "snowflake-jdbc" % "3.16.0",
"org.scalatest" %% "scalatest" % "3.1.1" % Test,
"org.mockito" % "mockito-core" % "1.10.19" % Test,
"org.apache.commons" % "commons-lang3" % "3.5" % "provided",
Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/net/snowflake/spark/snowflake/SnowflakeJDBCWrapper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ private[snowflake] class JDBCWrapper {
// Snowflake-todo: Verify all types.
val answer = sqlType match {
// scalastyle:off
case java.sql.Types.ARRAY => null
case java.sql.Types.BIGINT =>
if (signed) {
LongType
Expand Down Expand Up @@ -340,6 +339,8 @@ private[snowflake] class JDBCWrapper {
// case java.sql.Types.VARBINARY => BinaryType
case java.sql.Types.VARCHAR => StringType
case java.sql.Types.BINARY => BinaryType
case java.sql.Types.STRUCT => StringType
case java.sql.Types.ARRAY => StringType
case _ => null
// scalastyle:on
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/net/snowflake/spark/snowflake/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ object Utils {
/**
* The certified JDBC version to work with this spark connector version.
*/
val CERTIFIED_JDBC_VERSION = "3.14.4"
val CERTIFIED_JDBC_VERSION = "3.16.0"

/**
* Important:
Expand Down
Loading