diff --git a/.github/release-please.yml b/.github/release-please.yml
index bd2014774..3ae6e07da 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -2,8 +2,7 @@ releaseType: java-yoshi
bumpMinorPreMajor: true
handleGHRelease: true
branches:
-- branch: 1.21.x
- releaseType: java-yoshi
- bumpMinorPreMajor: true
- handleGHRelease: true
+ - branch: 1.21.x
+ - branch: protobuf-4.x-rc
+ manifest: true
extraFiles: ["README.md"]
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 68563931f..9496d664f 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
shell: bash
run: .kokoro/build.sh
- name: Unmanaged dependency check
- uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.1
+ uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.55.1
with:
bom-path: pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index df45eaecc..5f83c06ee 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.55.1"
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index d110d2ae2..09ee76021 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.55.1"
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 8e8342be5..15a92eb2e 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.55.1"
}
env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddcb0c48e..3298d7655 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,58 @@
# Changelog
+## [2.35.0](https://github.com/googleapis/java-spanner-jdbc/compare/v2.34.1...v2.35.0) (2026-01-16)
+
+
+### Features
+
+* Support float4 in JDBC ([#2336](https://github.com/googleapis/java-spanner-jdbc/issues/2336)) ([6bbcac6](https://github.com/googleapis/java-spanner-jdbc/commit/6bbcac65aaa02bcb9a062459de5e36630e27e88c))
+
+
+### Dependencies
+
+* Update dependency com.google.api.grpc:proto-google-cloud-trace-v1 to v2.81.0 ([#2331](https://github.com/googleapis/java-spanner-jdbc/issues/2331)) ([a207dea](https://github.com/googleapis/java-spanner-jdbc/commit/a207dea27e97fde2b84da412dd701890c5d8a308))
+* Update dependency com.google.api.grpc:proto-google-cloud-trace-v1 to v2.82.0 ([#2357](https://github.com/googleapis/java-spanner-jdbc/issues/2357)) ([6dd218f](https://github.com/googleapis/java-spanner-jdbc/commit/6dd218fcac050b196f5433e20fd9b07bf3122546))
+* Update dependency com.google.cloud:google-cloud-spanner to v6.106.0 ([#2351](https://github.com/googleapis/java-spanner-jdbc/issues/2351)) ([c07d754](https://github.com/googleapis/java-spanner-jdbc/commit/c07d754b4308ae88ec4239dda20671b2ad05cd36))
+* Update dependency com.google.cloud:google-cloud-spanner to v6.107.0 ([#2360](https://github.com/googleapis/java-spanner-jdbc/issues/2360)) ([e45f327](https://github.com/googleapis/java-spanner-jdbc/commit/e45f327272283a5b4a679bc97349bbe66ab3da53))
+* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.106.0 ([#2352](https://github.com/googleapis/java-spanner-jdbc/issues/2352)) ([f7b660a](https://github.com/googleapis/java-spanner-jdbc/commit/f7b660a659eb650b1aef8891b8dfe2a031179513))
+* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.107.0 ([#2361](https://github.com/googleapis/java-spanner-jdbc/issues/2361)) ([033eceb](https://github.com/googleapis/java-spanner-jdbc/commit/033eceb0e30e872154d1a6c43dabfd5f4794d2b5))
+* Update dependency com.google.cloud:google-cloud-trace to v2.81.0 ([#2332](https://github.com/googleapis/java-spanner-jdbc/issues/2332)) ([c389ffc](https://github.com/googleapis/java-spanner-jdbc/commit/c389ffce9fdfde1f1a24742f64ec00b4fc8845b7))
+* Update dependency com.google.cloud:google-cloud-trace to v2.82.0 ([#2358](https://github.com/googleapis/java-spanner-jdbc/issues/2358)) ([9565583](https://github.com/googleapis/java-spanner-jdbc/commit/9565583115b3feb99296de61a4c1be272790994d))
+* Update dependency com.google.cloud:grpc-gcp to v1.9.1 ([#2348](https://github.com/googleapis/java-spanner-jdbc/issues/2348)) ([7de2507](https://github.com/googleapis/java-spanner-jdbc/commit/7de25072cc5b1706c0a66a09d78e08ff67212441))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.55.1 ([#2355](https://github.com/googleapis/java-spanner-jdbc/issues/2355)) ([b278e20](https://github.com/googleapis/java-spanner-jdbc/commit/b278e203d1f7ceb077e7a13b0657aaa78016ab90))
+* Update dependency io.opentelemetry:opentelemetry-bom to v1.58.0 ([#2354](https://github.com/googleapis/java-spanner-jdbc/issues/2354)) ([efd4380](https://github.com/googleapis/java-spanner-jdbc/commit/efd43805057333ef3079c78538e0c99c767a5e01))
+* Update dependency net.bytebuddy:byte-buddy to v1.18.4 ([#2349](https://github.com/googleapis/java-spanner-jdbc/issues/2349)) ([e4daede](https://github.com/googleapis/java-spanner-jdbc/commit/e4daedea8a29038974c8bc73c0d930a997d2116e))
+* Update dependency net.bytebuddy:byte-buddy-agent to v1.18.4 ([#2350](https://github.com/googleapis/java-spanner-jdbc/issues/2350)) ([cb68853](https://github.com/googleapis/java-spanner-jdbc/commit/cb6885347527a14ffe95bd9e0ca5c18745419dfc))
+* Update dependency org.postgresql:postgresql to v42.7.9 ([#2359](https://github.com/googleapis/java-spanner-jdbc/issues/2359)) ([3c869dd](https://github.com/googleapis/java-spanner-jdbc/commit/3c869ddc3abc9f19e6e21cfa8ff7922b5bbcd65e))
+* Update dependency org.springframework.boot:spring-boot to v4.0.1 ([#2343](https://github.com/googleapis/java-spanner-jdbc/issues/2343)) ([9f84c07](https://github.com/googleapis/java-spanner-jdbc/commit/9f84c0782fccf3e93d03498b247e926ad6d24056))
+* Update dependency org.springframework.boot:spring-boot-starter-data-jdbc to v4.0.1 ([#2344](https://github.com/googleapis/java-spanner-jdbc/issues/2344)) ([661566d](https://github.com/googleapis/java-spanner-jdbc/commit/661566d90fe91a31b7152181704c5f508c3dcb36))
+* Update dependency org.springframework.boot:spring-boot-starter-parent to v3.5.9 ([#2342](https://github.com/googleapis/java-spanner-jdbc/issues/2342)) ([e1fb27a](https://github.com/googleapis/java-spanner-jdbc/commit/e1fb27a821f0fe2b61b0790be578ba6851bf3b96))
+
+## [2.34.1](https://github.com/googleapis/java-spanner-jdbc/compare/v2.34.0...v2.34.1) (2025-12-16)
+
+
+### Bug Fixes
+
+* Cast double Inf and NaN to float ([#2304](https://github.com/googleapis/java-spanner-jdbc/issues/2304)) ([a947024](https://github.com/googleapis/java-spanner-jdbc/commit/a94702446aee20013157b45bf1d9c3938f0b6982)), closes [#2256](https://github.com/googleapis/java-spanner-jdbc/issues/2256)
+
+
+### Dependencies
+
+* Update actions/checkout action to v6 ([#2299](https://github.com/googleapis/java-spanner-jdbc/issues/2299)) ([fbc8969](https://github.com/googleapis/java-spanner-jdbc/commit/fbc8969d66f4687ce91268309a862a0cbe0a114c))
+* Update dependency com.google.cloud:google-cloud-spanner to v6.104.0 ([#2312](https://github.com/googleapis/java-spanner-jdbc/issues/2312)) ([930797b](https://github.com/googleapis/java-spanner-jdbc/commit/930797b71f30e458dee20679178ff3510fcba919))
+* Update dependency com.google.cloud:google-cloud-spanner to v6.105.0 ([#2325](https://github.com/googleapis/java-spanner-jdbc/issues/2325)) ([34a9768](https://github.com/googleapis/java-spanner-jdbc/commit/34a9768b203c967f4191427a815b71e1a503de8f))
+* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.104.0 ([#2313](https://github.com/googleapis/java-spanner-jdbc/issues/2313)) ([5250e2d](https://github.com/googleapis/java-spanner-jdbc/commit/5250e2d069179bdeb773e5e0a1f2a5defd411811))
+* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.105.0 ([#2326](https://github.com/googleapis/java-spanner-jdbc/issues/2326)) ([8f3e6b7](https://github.com/googleapis/java-spanner-jdbc/commit/8f3e6b72baccc5ae8dd5ce3c55807bc889a7f208))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.54.2 ([#2322](https://github.com/googleapis/java-spanner-jdbc/issues/2322)) ([2faffb4](https://github.com/googleapis/java-spanner-jdbc/commit/2faffb46c71e4b44b42dbc4bfd5d70a3e55eb5f6))
+* Update dependency io.opentelemetry:opentelemetry-bom to v1.57.0 ([#2316](https://github.com/googleapis/java-spanner-jdbc/issues/2316)) ([77aab00](https://github.com/googleapis/java-spanner-jdbc/commit/77aab00ec385a7bfe61615b6b250c0b97a9a9f07))
+* Update dependency net.bytebuddy:byte-buddy to v1.18.2 ([#2306](https://github.com/googleapis/java-spanner-jdbc/issues/2306)) ([ba7430c](https://github.com/googleapis/java-spanner-jdbc/commit/ba7430cd229214487dfe4db208cb274d4662bf19))
+* Update dependency net.bytebuddy:byte-buddy-agent to v1.18.2 ([#2307](https://github.com/googleapis/java-spanner-jdbc/issues/2307)) ([86dc72b](https://github.com/googleapis/java-spanner-jdbc/commit/86dc72b0e1d7199b229474008cb68400458f233e))
+* Update dependency org.springframework.boot:spring-boot to v4 ([#2300](https://github.com/googleapis/java-spanner-jdbc/issues/2300)) ([a6dddf2](https://github.com/googleapis/java-spanner-jdbc/commit/a6dddf2aef2e9d35ec2bf26ea1a1586ab65e122a))
+* Update dependency org.springframework.boot:spring-boot-starter-data-jdbc to v4 ([#2301](https://github.com/googleapis/java-spanner-jdbc/issues/2301)) ([92efa98](https://github.com/googleapis/java-spanner-jdbc/commit/92efa986a0880524a3d19685df0e08cf7815a69a))
+* Update dependency org.springframework.boot:spring-boot-starter-parent to v3.5.8 ([#2298](https://github.com/googleapis/java-spanner-jdbc/issues/2298)) ([5603846](https://github.com/googleapis/java-spanner-jdbc/commit/5603846fc004a0e31cbcf10bc246d477cd80d9dd))
+* Update dependency org.testcontainers:testcontainers to v2.0.3 ([#2323](https://github.com/googleapis/java-spanner-jdbc/issues/2323)) ([65302d4](https://github.com/googleapis/java-spanner-jdbc/commit/65302d44315548af3406853121e341523c89521c))
+* Update dependency org.testcontainers:testcontainers-bom to v2.0.3 ([#2324](https://github.com/googleapis/java-spanner-jdbc/issues/2324)) ([8e8b3a0](https://github.com/googleapis/java-spanner-jdbc/commit/8e8b3a0b4c613324a07609fa142330322e8eab95))
+
## [2.34.0](https://github.com/googleapis/java-spanner-jdbc/compare/v2.33.3...v2.34.0) (2025-11-18)
diff --git a/README.md b/README.md
index c43a63e3e..c7e4a8b7b 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ If you are using Maven, add this to your pom.xml file:
com.google.cloud
google-cloud-spanner-jdbc
- 2.34.0
+ 2.35.0
```
@@ -30,7 +30,7 @@ If you are using Gradle without BOM, add this to your dependencies
```Groovy
-implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.34.0'
+implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.35.0'
```
@@ -38,7 +38,7 @@ If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.34.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.35.0"
```
@@ -243,29 +243,10 @@ information.
Apache 2.0 - See [LICENSE][license] for more information.
-## CI Status
-
-Java Version | Status
------------- | ------
-Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
-Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
-Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
-Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
-
Java is a registered trademark of Oracle and/or its affiliates.
[product-docs]: https://cloud.google.com/spanner/docs/use-oss-jdbc
[javadocs]: https://googleapis.dev/java/google-cloud-spanner-jdbc/latest/index.html
-[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java7.svg
-[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java7.html
-[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java8.svg
-[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java8.html
-[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java8-osx.svg
-[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java8-osx.html
-[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java8-win.svg
-[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java8-win.html
-[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java11.svg
-[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner-jdbc/java11.html
[stability-image]: https://img.shields.io/badge/stability-ga-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-spanner-jdbc.svg
[maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-spanner-jdbc&core=gav
diff --git a/pom.xml b/pom.xml
index 7b8042371..d8ac3be2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
google-cloud-spanner-jdbc
- 2.34.1-SNAPSHOT
+ 2.35.0
jar
Google Cloud Spanner JDBC
https://github.com/googleapis/java-spanner-jdbc
@@ -14,7 +14,7 @@
com.google.cloud
sdk-platform-java-config
- 3.54.1
+ 3.55.1
@@ -61,10 +61,14 @@
com.google.cloud
google-cloud-spanner-bom
- 6.103.0
+ 6.107.0
pom
import
+
+ com.google.cloud
+ grpc-gcp
+
com.google.cloud
google-cloud-shared-dependencies
@@ -166,7 +170,7 @@
org.testcontainers
testcontainers
- 2.0.2
+ 2.0.3
test
@@ -216,13 +220,13 @@
com.google.cloud
google-cloud-trace
- 2.80.0
+ 2.82.0
test
com.google.api.grpc
proto-google-cloud-trace-v1
- 2.80.0
+ 2.82.0
test
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 1d139b2cf..78ae62ddd 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-spanner-jdbc
- 2.34.0
+ 2.34.1
diff --git a/samples/quickperf/pom.xml b/samples/quickperf/pom.xml
index 2dc418ca3..7fb46c05d 100644
--- a/samples/quickperf/pom.xml
+++ b/samples/quickperf/pom.xml
@@ -12,7 +12,7 @@
com.google.cloud
sdk-platform-java-config
- 3.54.1
+ 3.55.1
@@ -27,7 +27,7 @@
com.google.cloud
libraries-bom
- 26.72.0
+ 26.73.0
pom
import
@@ -73,13 +73,13 @@
org.testcontainers
testcontainers
- 2.0.2
+ 2.0.3
test
org.springframework.boot
spring-boot
- 4.0.0
+ 4.0.1
test
@@ -95,7 +95,7 @@
org.codehaus.mojo
exec-maven-plugin
- 3.6.2
+ 3.6.3
com.google.cloud.jdbc.quickperf.QuickPerf
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 9e28d67de..f190545bb 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-spanner-jdbc
- 2.34.1-SNAPSHOT
+ 2.35.0
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index f07e72d1b..c52c6f644 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -9,7 +9,7 @@
com.google.cloud
sdk-platform-java-config
- 3.54.1
+ 3.55.1
@@ -26,7 +26,7 @@
com.google.cloud
libraries-bom
- 26.72.0
+ 26.73.0
pom
import
@@ -54,7 +54,7 @@
org.testcontainers
testcontainers
- 2.0.2
+ 2.0.3
test
diff --git a/samples/spring-data-jdbc/googlesql/pom.xml b/samples/spring-data-jdbc/googlesql/pom.xml
index 6f393bd9f..d789c91a6 100644
--- a/samples/spring-data-jdbc/googlesql/pom.xml
+++ b/samples/spring-data-jdbc/googlesql/pom.xml
@@ -30,21 +30,25 @@
com.google.cloud
google-cloud-spanner-bom
- 6.103.0
+ 6.107.0
import
pom
+
+ com.google.cloud
+ grpc-gcp
+
com.google.cloud
libraries-bom
- 26.72.0
+ 26.73.0
import
pom
io.opentelemetry
opentelemetry-bom
- 1.56.0
+ 1.58.0
pom
import
@@ -55,7 +59,7 @@
org.springframework.boot
spring-boot-starter-data-jdbc
- 4.0.0
+ 4.0.1
@@ -90,7 +94,7 @@
org.testcontainers
testcontainers
- 2.0.2
+ 2.0.3
diff --git a/samples/spring-data-jdbc/postgresql/pom.xml b/samples/spring-data-jdbc/postgresql/pom.xml
index cf92e5121..984ecf62a 100644
--- a/samples/spring-data-jdbc/postgresql/pom.xml
+++ b/samples/spring-data-jdbc/postgresql/pom.xml
@@ -30,21 +30,25 @@
com.google.cloud
google-cloud-spanner-bom
- 6.103.0
+ 6.107.0
import
pom
+
+ com.google.cloud
+ grpc-gcp
+
com.google.cloud
libraries-bom
- 26.72.0
+ 26.73.0
import
pom
io.opentelemetry
opentelemetry-bom
- 1.56.0
+ 1.58.0
pom
import
@@ -55,7 +59,7 @@
org.springframework.boot
spring-boot-starter-data-jdbc
- 4.0.0
+ 4.0.1
@@ -72,7 +76,7 @@
org.postgresql
postgresql
- 42.7.8
+ 42.7.9
@@ -114,13 +118,13 @@
net.bytebuddy
byte-buddy
- 1.18.1
+ 1.18.4
test
net.bytebuddy
byte-buddy-agent
- 1.18.1
+ 1.18.4
test
@@ -132,7 +136,7 @@
org.testcontainers
testcontainers
- 2.0.2
+ 2.0.3
test
diff --git a/samples/spring-data-jdbc/postgresql/src/main/java/com/google/cloud/spanner/sample/OpenTelemetryConfiguration.java b/samples/spring-data-jdbc/postgresql/src/main/java/com/google/cloud/spanner/sample/OpenTelemetryConfiguration.java
index f1e615290..b833e48b7 100644
--- a/samples/spring-data-jdbc/postgresql/src/main/java/com/google/cloud/spanner/sample/OpenTelemetryConfiguration.java
+++ b/samples/spring-data-jdbc/postgresql/src/main/java/com/google/cloud/spanner/sample/OpenTelemetryConfiguration.java
@@ -36,8 +36,6 @@
import java.io.IOException;
import java.util.concurrent.ThreadLocalRandom;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/samples/spring-data-mybatis/googlesql/pom.xml b/samples/spring-data-mybatis/googlesql/pom.xml
index 8e0f26b49..0917b8df9 100644
--- a/samples/spring-data-mybatis/googlesql/pom.xml
+++ b/samples/spring-data-mybatis/googlesql/pom.xml
@@ -13,7 +13,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.5.8
+ 3.5.9
@@ -35,21 +35,25 @@
com.google.cloud
google-cloud-spanner-bom
- 6.103.0
+ 6.107.0
import
pom
+
+ com.google.cloud
+ grpc-gcp
+
com.google.cloud
libraries-bom
- 26.72.0
+ 26.73.0
import
pom
org.testcontainers
testcontainers-bom
- 2.0.2
+ 2.0.3
import
pom
@@ -94,7 +98,7 @@
com.google.cloud
google-cloud-spanner
- 6.103.0
+ 6.107.0
test-jar
test
@@ -108,13 +112,13 @@
net.bytebuddy
byte-buddy
- 1.18.1
+ 1.18.4
test
net.bytebuddy
byte-buddy-agent
- 1.18.1
+ 1.18.4
test
diff --git a/samples/spring-data-mybatis/postgresql/pom.xml b/samples/spring-data-mybatis/postgresql/pom.xml
index afb4717a9..f5f1c33b0 100644
--- a/samples/spring-data-mybatis/postgresql/pom.xml
+++ b/samples/spring-data-mybatis/postgresql/pom.xml
@@ -13,7 +13,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.5.8
+ 3.5.9
@@ -35,14 +35,14 @@
com.google.cloud
libraries-bom
- 26.72.0
+ 26.73.0
import
pom
org.testcontainers
testcontainers-bom
- 2.0.2
+ 2.0.3
import
pom
@@ -75,7 +75,7 @@
org.postgresql
postgresql
- 42.7.8
+ 42.7.9
org.testcontainers
@@ -105,13 +105,13 @@
net.bytebuddy
byte-buddy
- 1.18.1
+ 1.18.4
test
net.bytebuddy
byte-buddy-agent
- 1.18.1
+ 1.18.4
test
diff --git a/src/main/java/com/google/cloud/spanner/jdbc/JdbcDataType.java b/src/main/java/com/google/cloud/spanner/jdbc/JdbcDataType.java
index c80db5302..bb2f7c007 100644
--- a/src/main/java/com/google/cloud/spanner/jdbc/JdbcDataType.java
+++ b/src/main/java/com/google/cloud/spanner/jdbc/JdbcDataType.java
@@ -113,6 +113,8 @@ public Type getSpannerType() {
}
},
FLOAT32 {
+ private final Set aliases = new HashSet<>(Collections.singletonList("float4"));
+
@Override
public int getSqlType() {
return Types.REAL;
@@ -152,6 +154,11 @@ public List getArrayElements(ResultSet rs, int columnIndex) {
public Type getSpannerType() {
return Type.float32();
}
+
+ @Override
+ public Set getPostgreSQLAliases() {
+ return aliases;
+ }
},
FLOAT64 {
private final Set> classes = new HashSet<>(Arrays.asList(Float.class, Double.class));
diff --git a/src/main/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaData.java b/src/main/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaData.java
index 98d23a226..7168e2f92 100644
--- a/src/main/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaData.java
+++ b/src/main/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaData.java
@@ -48,6 +48,7 @@ class JdbcDatabaseMetaData extends AbstractJdbcWrapper implements DatabaseMetaDa
private static final int DATABASE_MAJOR_VERSION = 1;
private static final int DATABASE_MINOR_VERSION = 0;
private static final String PRODUCT_NAME = "Google Cloud Spanner";
+ private static final String POSTGRESQL_PRODUCT_NAME = PRODUCT_NAME + " PostgreSQL";
@VisibleForTesting
static String readSqlFromFile(String filename, Dialect dialect) {
@@ -137,7 +138,7 @@ public boolean nullsAreSortedAtEnd() {
@Override
public String getDatabaseProductName() {
- return PRODUCT_NAME;
+ return connection.getDialect() == Dialect.POSTGRESQL ? POSTGRESQL_PRODUCT_NAME : PRODUCT_NAME;
}
@Override
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java b/src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java
index 4545bb56e..fc3168ab4 100644
--- a/src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java
+++ b/src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java
@@ -57,6 +57,8 @@ public static Object[] data() {
private static final int DATABASE_MAJOR_VERSION = 1;
private static final int DATABASE_MINOR_VERSION = 0;
private static final String DATABASE_PRODUCT_NAME = "Google Cloud Spanner";
+ private static final String POSTGRESQL_DATABASE_PRODUCT_NAME =
+ DATABASE_PRODUCT_NAME + " PostgreSQL";
@Test
public void testTrivialMethods() throws SQLException {
@@ -90,7 +92,6 @@ public void testTrivialMethods() throws SQLException {
assertEquals("CATALOG", meta.getCatalogTerm());
assertEquals(DATABASE_MAJOR_VERSION, meta.getDatabaseMajorVersion());
assertEquals(DATABASE_MINOR_VERSION, meta.getDatabaseMinorVersion());
- assertEquals(DATABASE_PRODUCT_NAME, meta.getDatabaseProductName());
assertEquals(
DATABASE_MAJOR_VERSION + "." + DATABASE_MINOR_VERSION, meta.getDatabaseProductVersion());
assertEquals(Connection.TRANSACTION_SERIALIZABLE, meta.getDefaultTransactionIsolation());
@@ -134,8 +135,10 @@ public void testTrivialMethods() throws SQLException {
assertFalse(meta.isCatalogAtStart());
assertEquals(connection.isReadOnly(), meta.isReadOnly());
if (dialect == Dialect.POSTGRESQL) {
+ assertEquals(POSTGRESQL_DATABASE_PRODUCT_NAME, meta.getDatabaseProductName());
assertTrue(meta.storesLowerCaseIdentifiers());
} else {
+ assertEquals(DATABASE_PRODUCT_NAME, meta.getDatabaseProductName());
assertFalse(meta.storesLowerCaseIdentifiers());
}
assertFalse(meta.storesLowerCaseQuotedIdentifiers());
diff --git a/versions.txt b/versions.txt
index e012595c7..26ac9e854 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-spanner-jdbc:2.34.0:2.34.1-SNAPSHOT
+google-cloud-spanner-jdbc:2.35.0:2.35.0