.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.29.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.0
       with:
         bom-path: pom.xml

.kokoro/presubmit/graalvm-native-17.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.29.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.0"
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native.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.29.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.0"
 }
 
 env_vars: {

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [2.18.0](https://github.com/googleapis/java-spanner-jdbc/compare/v2.17.1...v2.18.0) (2024-05-04)
+
+
+### Features
+
+* Allow DDL with autocommit=false ([#1600](https://github.com/googleapis/java-spanner-jdbc/issues/1600)) ([a61c25d](https://github.com/googleapis/java-spanner-jdbc/commit/a61c25d8f90460ec507b383dbaee0ca686104ba8))
+* Support concurrent transactions on the emulator ([#1601](https://github.com/googleapis/java-spanner-jdbc/issues/1601)) ([7123991](https://github.com/googleapis/java-spanner-jdbc/commit/71239912a8078569dcd985314810131e593c0ed7))
+
+
+### Bug Fixes
+
+* ClassCastException in Spring Data JDBC sample ([#1595](https://github.com/googleapis/java-spanner-jdbc/issues/1595)) ([e96a86a](https://github.com/googleapis/java-spanner-jdbc/commit/e96a86a4b82ac4b47bd1ce25e810f01299597339))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.66.0 ([#1599](https://github.com/googleapis/java-spanner-jdbc/issues/1599)) ([84ea11a](https://github.com/googleapis/java-spanner-jdbc/commit/84ea11ac27635dbe6fb101134767d14488dde8c2))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1597](https://github.com/googleapis/java-spanner-jdbc/issues/1597)) ([40a7212](https://github.com/googleapis/java-spanner-jdbc/commit/40a721237c79882e55d86d48402c64cc09782522))
+* Update dependency org.mybatis.dynamic-sql:mybatis-dynamic-sql to v1.5.1 ([#1596](https://github.com/googleapis/java-spanner-jdbc/issues/1596)) ([f54beb2](https://github.com/googleapis/java-spanner-jdbc/commit/f54beb20d6bbe3f4974385c4758ba77d31d25ce3))
+
 ## [2.17.1](https://github.com/googleapis/java-spanner-jdbc/compare/v2.17.0...v2.17.1) (2024-04-30)
 
 

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.17.1</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
+  <version>2.18.0</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>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.29.0</version>
+    <version>3.30.0</version>
   </parent>
   <developers>
     <developer>
@@ -62,7 +62,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanner-bom</artifactId>
-        <version>6.65.1</version>
+        <version>6.66.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -273,7 +273,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.5.2</version>
+        <version>3.5.3</version>
         <executions>
           <execution>
             <goals>

samples/install-without-bom/pom.xml

@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner-jdbc</artifactId>
-      <version>2.17.0</version>
+      <version>2.17.1</version>
     </dependency>
     <!-- [END spanner-jdbc_install_without_bom] -->
 

samples/snapshot/pom.xml

@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner-jdbc</artifactId>
-      <version>2.17.1</version>
+      <version>2.18.0</version>
     </dependency>
     <!-- {x-version-update-end} -->
 

samples/snippets/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.29.0</version>
+    <version>3.30.0</version>
     <relativePath/>
   </parent>
 

samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/JdbcConfiguration.java

@@ -64,7 +64,7 @@ public static boolean isCloudSpannerPG(JdbcOperations operations) {
           "The selected Cloud Spanner database does not use the PostgreSQL dialect");
     } catch (DataAccessException exception) {
       if (exception.getCause() instanceof JdbcSqlException) {
-        JdbcSqlException jdbcSqlException = (JdbcSqlException) exception;
+        JdbcSqlException jdbcSqlException = (JdbcSqlException) exception.getCause();
         if (jdbcSqlException.getCode() == Code.PERMISSION_DENIED
             || jdbcSqlException.getCode() == Code.NOT_FOUND) {
           throw new RuntimeException(

samples/spring-data-mybatis/pom.xml

@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.mybatis.dynamic-sql</groupId>
       <artifactId>mybatis-dynamic-sql</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1</version>
     </dependency>
 
     <!-- Add both the Cloud Spanner and the PostgreSQL JDBC driver. -->

src/main/java/com/google/cloud/spanner/jdbc/JdbcDriver.java

@@ -84,6 +84,13 @@
  *       instance and database in the connection string will automatically be created if these do
  *       not yet exist on the emulator. This means that you do not need to execute any `gcloud`
  *       commands on the emulator to create the instance and database before you can connect to it.
+ *       Setting this property to true also enables running concurrent transactions on the emulator.
+ *       The emulator aborts any concurrent transaction on the emulator, and the JDBC driver works
+ *       around this by automatically setting a savepoint after each statement that is executed.
+ *       When the transaction has been aborted by the emulator and the JDBC connection wants to
+ *       continue with that transaction, the transaction is replayed up until the savepoint that had
+ *       automatically been set after the last statement that was executed before the transaction
+ *       was aborted by the emulator.
  *   <li>endpoint (string): Set this property to specify a custom endpoint that the JDBC driver
  *       should connect to. You can use this property in combination with the autoConfigEmulator
  *       property to instruct the JDBC driver to connect to an emulator instance that uses a

src/test/java/com/google/cloud/spanner/jdbc/DdlMockServerTest.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.spanner.jdbc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult;
+import com.google.cloud.spanner.Statement;
+import com.google.cloud.spanner.connection.AbstractMockServerTest;
+import com.google.longrunning.Operation;
+import com.google.protobuf.Any;
+import com.google.protobuf.Empty;
+import com.google.rpc.Code;
+import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class DdlMockServerTest extends AbstractMockServerTest {
+
+  private String createUrl(boolean autoCommit) {
+    return String.format(
+        "jdbc:cloudspanner://localhost:%d/projects/%s/instances/%s/databases/%s?usePlainText=true;autoCommit=%s",
+        getPort(), "proj", "inst", "db", autoCommit);
+  }
+
+  private Connection createConnection(boolean autoCommit) throws SQLException {
+    return DriverManager.getConnection(createUrl(autoCommit));
+  }
+
+  @Test
+  public void testDdlInAutoCommitIsTrue_succeeds() throws SQLException {
+    mockDatabaseAdmin.addResponse(
+        Operation.newBuilder()
+            .setDone(true)
+            .setResponse(Any.pack(Empty.getDefaultInstance()))
+            .setMetadata(Any.pack(UpdateDatabaseDdlMetadata.getDefaultInstance()))
+            .build());
+
+    try (Connection connection = createConnection(/* autoCommit = */ true)) {
+      assertFalse(
+          connection.createStatement().execute("create table foo (id int64) primary key (id)"));
+    }
+  }
+
+  @Test
+  public void testDdlInAutoCommitIsFalse_succeedsWithNoActiveTransaction() throws SQLException {
+    mockDatabaseAdmin.addResponse(
+        Operation.newBuilder()
+            .setDone(true)
+            .setResponse(Any.pack(Empty.getDefaultInstance()))
+            .setMetadata(Any.pack(UpdateDatabaseDdlMetadata.getDefaultInstance()))
+            .build());
+
+    try (Connection connection = createConnection(/* autoCommit = */ false)) {
+      assertFalse(
+          connection.createStatement().execute("create table foo (id int64) primary key (id)"));
+    }
+  }
+
+  @Test
+  public void testDdlInAutoCommitIsFalse_failsWithActiveTransaction() throws SQLException {
+    mockSpanner.putStatementResult(
+        StatementResult.update(Statement.of("update foo set bar=1 where true"), 1L));
+
+    try (Connection connection = createConnection(/* autoCommit = */ false)) {
+      assertFalse(connection.createStatement().execute("update foo set bar=1 where true"));
+      SQLException exception =
+          assertThrows(
+              SQLException.class,
+              () ->
+                  connection
+                      .createStatement()
+                      .execute("create table foo (id int64) primary key (id)"));
+      assertTrue(exception instanceof JdbcSqlException);
+      JdbcSqlException jdbcSqlException = (JdbcSqlException) exception;
+      assertEquals(Code.FAILED_PRECONDITION, jdbcSqlException.getCode());
+    }
+  }
+}