chore: discard all should reset all session state

GoogleCloudPlatform · May 27, 2024 · 4dbb033 · 4dbb033
1 parent 8621984
commit 4dbb033
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/com/google/cloud/spanner/pgadapter/statements/DiscardStatement.java b/src/main/java/com/google/cloud/spanner/pgadapter/statements/DiscardStatement.java
@@ -94,6 +94,7 @@ public void executeAsync(BackendConnection backendConnection) {
                         SQLState.ActiveSqlTransaction)));
             return;
           }
+          backendConnection.getSessionState().resetAll();
           connectionHandler.closeAllStatements();
           break;
         case PLANS:

diff --git a/src/test/java/com/google/cloud/spanner/pgadapter/JdbcSimpleModeMockServerTest.java b/src/test/java/com/google/cloud/spanner/pgadapter/JdbcSimpleModeMockServerTest.java
@@ -597,6 +597,22 @@ public void testDiscard() throws SQLException {
           SQLState.InvalidSqlStatementName.toString(),
           exception.getServerErrorMessage().getSQLState());
 
+      // Verify that DISCARD ALL resets all session state.
+      connection.createStatement().execute("set spanner.copy_upsert=true");
+      try (ResultSet resultSet =
+          connection.createStatement().executeQuery("show spanner.copy_upsert")) {
+        assertTrue(resultSet.next());
+        assertTrue(resultSet.getBoolean(1));
+        assertFalse(resultSet.next());
+      }
+      connection.createStatement().execute("discard all");
+      try (ResultSet resultSet =
+          connection.createStatement().executeQuery("show spanner.copy_upsert")) {
+        assertTrue(resultSet.next());
+        assertFalse(resultSet.getBoolean(1));
+        assertFalse(resultSet.next());
+      }
+
       // Verify that 'discard all' is not accepted in a transaction block.
       connection.setAutoCommit(false);
       exception =