Merge branch 'main' into PR #2191 to update

lqiu96 · lqiu96 · commit 8ffa97af8739 · 2025-10-29T03:43:14.000Z
diff --git 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
@@ -20,7 +20,7 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-spanner-jdbc</artifactId>
-  <version>2.33.2</version>
+  <version>2.33.3</version>
 </dependency>
 ```
 <!--- {x-version-update-end} -->
@@ -30,15 +30,15 @@ If you are using Gradle without BOM, add this to your dependencies
 
 <!--- {x-version-update-start:google-cloud-spanner-jdbc:released} -->
 ```Groovy
-implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.33.2'
+implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.33.3'
 ```
 <!--- {x-version-update-end} -->
 
 If you are using SBT, add this to your dependencies
 
 <!--- {x-version-update-start:google-cloud-spanner-jdbc:released} -->
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.33.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.33.3"
 ```
 <!--- {x-version-update-end} -->
 
diff --git 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">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-spanner-jdbc</artifactId>
-  <version>2.33.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
+  <version>2.33.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Spanner JDBC</name>
   <url>https://github.com/googleapis/java-spanner-jdbc</url>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner-jdbc</artifactId>
-      <version>2.33.2</version>
+      <version>2.33.3</version>
     </dependency>
     <!-- [END spanner-jdbc_install_without_bom] -->
 
diff --git a/samples/quickperf/pom.xml b/samples/quickperf/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.70.0</version>
+        <version>26.71.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner-jdbc</artifactId>
-      <version>2.33.3-SNAPSHOT</version>
+      <version>2.33.4-SNAPSHOT</version>
     </dependency>
     <!-- {x-version-update-end} -->
 
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
@@ -26,7 +26,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.70.0</version>
+        <version>26.71.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/samples/spring-data-jdbc/googlesql/pom.xml b/samples/spring-data-jdbc/googlesql/pom.xml
@@ -37,7 +37,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.70.0</version>
+        <version>26.71.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/samples/spring-data-jdbc/postgresql/pom.xml b/samples/spring-data-jdbc/postgresql/pom.xml
@@ -37,7 +37,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.70.0</version>
+        <version>26.71.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/samples/spring-data-mybatis/googlesql/pom.xml b/samples/spring-data-mybatis/googlesql/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.70.0</version>
+        <version>26.71.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/samples/spring-data-mybatis/postgresql/pom.xml b/samples/spring-data-mybatis/postgresql/pom.xml
@@ -35,7 +35,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.70.0</version>
+        <version>26.71.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-spanner-jdbc:2.33.2:2.33.3-SNAPSHOT
+google-cloud-spanner-jdbc:2.33.3:2.33.4-SNAPSHOT
