deps: bump Spanner to 6.23.3 (#862)

Bumps Spanner to 6.23.3 and modifies SQL script test files to reflect the changes for client side statements for PG.

Replaces #788

pom.xml

@@ -62,7 +62,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanner-bom</artifactId>
-        <version>6.21.2</version>
+        <version>6.23.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

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

@@ -26,7 +26,6 @@
 import com.google.cloud.spanner.connection.AbstractSqlScriptVerifier.GenericConnectionProvider;
 import com.google.cloud.spanner.connection.ConnectionImplTest;
 import com.google.cloud.spanner.connection.ConnectionOptions;
-import com.google.cloud.spanner.connection.SqlScriptVerifier;
 import com.google.cloud.spanner.jdbc.JdbcSqlScriptVerifier.JdbcGenericConnection;
 import java.sql.SQLException;
 import org.junit.Test;
@@ -62,7 +61,7 @@ public GenericConnection getConnection() {
       ConnectionOptions options = mock(ConnectionOptions.class);
       when(options.getUri()).thenReturn(ConnectionImplTest.URI);
       com.google.cloud.spanner.connection.Connection spannerConnection =
-          ConnectionImplTest.createConnection(options);
+          ConnectionImplTest.createConnection(options, dialect);
       when(spannerConnection.getDialect()).thenReturn(dialect);
       when(options.getConnection()).thenReturn(spannerConnection);
       try {
@@ -82,7 +81,8 @@ public GenericConnection getConnection() {
   @Test
   public void testGeneratedScript() throws Exception {
     JdbcSqlScriptVerifier verifier = new JdbcSqlScriptVerifier(new TestConnectionProvider(dialect));
+    String prefix = dialect == Dialect.POSTGRESQL ? "PostgreSQL/" : "";
     verifier.verifyStatementsInFile(
-        "ConnectionImplGeneratedSqlScriptTest.sql", SqlScriptVerifier.class, false);
+        prefix + "ConnectionImplGeneratedSqlScriptTest.sql", getClass(), false);
   }
 }

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

@@ -76,7 +76,7 @@ private com.google.cloud.spanner.ResultSet createSelect1ResultSet() {
 
   private JdbcConnection createConnection(ConnectionOptions options) throws SQLException {
     com.google.cloud.spanner.connection.Connection spannerConnection =
-        ConnectionImplTest.createConnection(options);
+        ConnectionImplTest.createConnection(options, dialect);
     when(spannerConnection.getDialect()).thenReturn(dialect);
     when(options.getConnection()).thenReturn(spannerConnection);
     return new JdbcConnection(
@@ -157,10 +157,13 @@ public void testRollback() throws SQLException {
       // verify that there is no transaction started anymore
       assertThat(connection.getSpannerConnection().isTransactionStarted()).isFalse();
       // verify that there is no commit timestamp
-      try (ResultSet rs =
-          connection.createStatement().executeQuery("show variable commit_timestamp")) {
+      String showCommitTimestamp =
+          dialect == Dialect.POSTGRESQL
+              ? "show spanner.commit_timestamp"
+              : "show variable commit_timestamp";
+      try (ResultSet rs = connection.createStatement().executeQuery(showCommitTimestamp)) {
         assertThat(rs.next()).isTrue();
-        assertThat(rs.getTimestamp("COMMIT_TIMESTAMP")).isNull();
+        assertThat(rs.getTimestamp(1)).isNull();
       }
     }
   }

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

@@ -46,6 +46,7 @@ public static Object[] data() {
   @Test
   public void testTimeoutScript() throws Exception {
     JdbcSqlScriptVerifier verifier = new JdbcSqlScriptVerifier(new TestConnectionProvider(dialect));
-    verifier.verifyStatementsInFile("TimeoutSqlScriptTest.sql", getClass(), false);
+    String prefix = dialect == Dialect.POSTGRESQL ? "PostgreSQL/" : "";
+    verifier.verifyStatementsInFile(prefix + "TimeoutSqlScriptTest.sql", getClass(), false);
   }
 }

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcQueryOptionsTest.java

@@ -110,12 +110,19 @@ public Dialect getDialect() {
     return dialect.dialect;
   }
 
+  private String getNamespace() {
+    return getDialect() == Dialect.POSTGRESQL ? "SPANNER." : "";
+  }
+
   private void verifyOptimizerVersion(Connection connection, String expectedVersion)
       throws SQLException {
     try (ResultSet rs =
-        connection.createStatement().executeQuery("SHOW VARIABLE OPTIMIZER_VERSION")) {
+        connection
+            .createStatement()
+            .executeQuery(String.format("SHOW VARIABLE %sOPTIMIZER_VERSION", getNamespace()))) {
       assertThat(rs.next()).isTrue();
-      assertThat(rs.getString("OPTIMIZER_VERSION")).isEqualTo(expectedVersion);
+      assertThat(rs.getString(String.format("%sOPTIMIZER_VERSION", getNamespace())))
+          .isEqualTo(expectedVersion);
       assertThat(rs.next()).isFalse();
     }
   }
@@ -153,7 +160,9 @@ public void connectionUrlWithInvalidOptimizerVersion() throws SQLException {
   public void setOptimizerVersion() throws SQLException {
     try (Connection connection = createConnection(env, database)) {
       verifyOptimizerVersion(connection, "");
-      connection.createStatement().execute("SET OPTIMIZER_VERSION='1'");
+      connection
+          .createStatement()
+          .execute(String.format("SET %sOPTIMIZER_VERSION='1'", getNamespace()));
       verifyOptimizerVersion(connection, "1");
       try (ResultSet rs = connection.createStatement().executeQuery("SELECT 1")) {
         assertThat(rs.next()).isTrue();
@@ -167,7 +176,9 @@ public void setOptimizerVersion() throws SQLException {
   public void setLatestOptimizerVersion() throws SQLException {
     try (Connection connection = createConnection(env, database)) {
       verifyOptimizerVersion(connection, "");
-      connection.createStatement().execute("SET OPTIMIZER_VERSION='LATEST'");
+      connection
+          .createStatement()
+          .execute(String.format("SET %sOPTIMIZER_VERSION='LATEST'", getNamespace()));
       verifyOptimizerVersion(connection, "LATEST");
       try (ResultSet rs = connection.createStatement().executeQuery("SELECT 1")) {
         assertThat(rs.next()).isTrue();
@@ -182,7 +193,9 @@ public void setInvalidOptimizerVersion() throws SQLException {
     assumeFalse(
         "optimizer version is ignored on emulator", EmulatorSpannerHelper.isUsingEmulator());
     try (Connection connection = createConnection(env, database)) {
-      connection.createStatement().execute("SET OPTIMIZER_VERSION='9999999'");
+      connection
+          .createStatement()
+          .execute(String.format("SET %sOPTIMIZER_VERSION='9999999'", getNamespace()));
       try (ResultSet rs = connection.createStatement().executeQuery("SELECT 1")) {
         fail("missing expected exception");
       } catch (SQLException e) {

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcReadWriteAutocommitTest.java

@@ -101,7 +101,10 @@ public void test02_WriteMutation() throws Exception {
       connection.write(
           Mutation.newInsertBuilder("TEST").set("ID").to(9999L).set("NAME").to("FOO").build());
       java.sql.Statement statement = connection.createStatement();
-      statement.execute("SHOW VARIABLE COMMIT_TIMESTAMP");
+      statement.execute(
+          String.format(
+              "SHOW VARIABLE %sCOMMIT_TIMESTAMP",
+              getDialect() == Dialect.POSTGRESQL ? "SPANNER." : ""));
       try (java.sql.ResultSet rs = statement.getResultSet()) {
         assertThat(rs.next(), is(true));
         assertThat(rs.getTimestamp(1), is(notNullValue()));