diff --git a/CHANGELOG.md b/CHANGELOG.md index 4129da1b0..f9253794c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.33.3](https://github.com/googleapis/java-spanner-jdbc/compare/v2.33.2...v2.33.3) (2025-10-28) + + +### Bug Fixes + +* Run DatabaseMetadata tests for PG on emulator ([#2271](https://github.com/googleapis/java-spanner-jdbc/issues/2271)) ([e7b20eb](https://github.com/googleapis/java-spanner-jdbc/commit/e7b20ebd0ec1554e969c9097c1d5b7c5b6dcc232)) + ## [2.33.2](https://github.com/googleapis/java-spanner-jdbc/compare/v2.33.1...v2.33.2) (2025-10-24) diff --git a/README.md b/README.md index 46c4e8d48..d6bac06ef 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.33.2 + 2.33.3 ``` @@ -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.33.2' +implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.33.3' ``` @@ -38,7 +38,7 @@ If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.33.2" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.33.3" ``` diff --git a/pom.xml b/pom.xml index 4fa663080..d741bb8a5 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.33.2 + 2.33.3 jar Google Cloud Spanner JDBC https://github.com/googleapis/java-spanner-jdbc diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 55f80e80a..0e24a8973 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.33.1 + 2.33.2 diff --git a/samples/quickperf/pom.xml b/samples/quickperf/pom.xml index 8450000d9..961d4510f 100644 --- a/samples/quickperf/pom.xml +++ b/samples/quickperf/pom.xml @@ -27,7 +27,7 @@ com.google.cloud libraries-bom - 26.70.0 + 26.71.0 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 55374ef43..3cf3a3e4c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-spanner-jdbc - 2.33.2 + 2.33.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index d936ece2e..d530b54f0 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -26,7 +26,7 @@ com.google.cloud libraries-bom - 26.70.0 + 26.71.0 pom import diff --git a/samples/spring-data-jdbc/googlesql/pom.xml b/samples/spring-data-jdbc/googlesql/pom.xml index c9b0390a1..cd696f70c 100644 --- a/samples/spring-data-jdbc/googlesql/pom.xml +++ b/samples/spring-data-jdbc/googlesql/pom.xml @@ -37,7 +37,7 @@ com.google.cloud libraries-bom - 26.70.0 + 26.71.0 import pom diff --git a/samples/spring-data-jdbc/postgresql/pom.xml b/samples/spring-data-jdbc/postgresql/pom.xml index 581e89ec9..1a53393d0 100644 --- a/samples/spring-data-jdbc/postgresql/pom.xml +++ b/samples/spring-data-jdbc/postgresql/pom.xml @@ -37,7 +37,7 @@ com.google.cloud libraries-bom - 26.70.0 + 26.71.0 import pom diff --git a/samples/spring-data-mybatis/googlesql/pom.xml b/samples/spring-data-mybatis/googlesql/pom.xml index 1abc6dd0c..2a3211d21 100644 --- a/samples/spring-data-mybatis/googlesql/pom.xml +++ b/samples/spring-data-mybatis/googlesql/pom.xml @@ -42,7 +42,7 @@ com.google.cloud libraries-bom - 26.70.0 + 26.71.0 import pom diff --git a/samples/spring-data-mybatis/postgresql/pom.xml b/samples/spring-data-mybatis/postgresql/pom.xml index 83ea8608b..a324b7e79 100644 --- a/samples/spring-data-mybatis/postgresql/pom.xml +++ b/samples/spring-data-mybatis/postgresql/pom.xml @@ -35,7 +35,7 @@ com.google.cloud libraries-bom - 26.70.0 + 26.71.0 import pom diff --git a/src/main/resources/com/google/cloud/spanner/jdbc/postgresql/DatabaseMetaData_GetColumns.sql b/src/main/resources/com/google/cloud/spanner/jdbc/postgresql/DatabaseMetaData_GetColumns.sql index b0ca39944..7e450f71f 100644 --- a/src/main/resources/com/google/cloud/spanner/jdbc/postgresql/DatabaseMetaData_GetColumns.sql +++ b/src/main/resources/com/google/cloud/spanner/jdbc/postgresql/DatabaseMetaData_GetColumns.sql @@ -32,7 +32,7 @@ SELECT TABLE_CATALOG AS "TABLE_CAT", TABLE_SCHEMA AS "TABLE_SCHEM", TABLE_NAME A WHEN DATA_TYPE LIKE 'ARRAY' THEN CASE WHEN spanner_type LIKE '%[]' THEN - CONCAT('_', REPLACE(spanner_type, '[]', '')) + CONCAT('_'::varchar, REPLACE(spanner_type, '[]'::varchar, ''::varchar)) ELSE spanner_type END ELSE DATA_TYPE diff --git a/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPgNumericTest.java b/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPgNumericTest.java index a7c7a206d..b1bf1bce7 100644 --- a/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPgNumericTest.java +++ b/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPgNumericTest.java @@ -182,6 +182,14 @@ public void testResultSet() throws SQLException { assertEquals(new BigDecimal(negativeBigNumeric), resultSet.getBigDecimal("col1")); assertEquals(new BigDecimal(negativeBigNumeric), resultSet.getObject("col1")); assertEquals(Value.pgNumeric(negativeBigNumeric), resultSet.getObject("col1", Value.class)); + + // Just verify that the getColumns method works + try (ResultSet columns = connection.getMetaData().getColumns(null, null, null, null)) { + //noinspection StatementWithEmptyBody + while (columns.next()) { + // ignore + } + } } } diff --git a/versions.txt b/versions.txt index 09fcf19e3..c8fb75f41 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-spanner-jdbc:2.33.2:2.33.2 +google-cloud-spanner-jdbc:2.33.3:2.33.3