chore: remove unused code and increase test coverage

GoogleCloudPlatform · Feb 21, 2024 · 43d9c0e · 43d9c0e
1 parent b81af20
commit 43d9c0e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/src/main/java/com/google/cloud/spanner/pgadapter/statements/InvalidStatement.java b/src/main/java/com/google/cloud/spanner/pgadapter/statements/InvalidStatement.java
@@ -16,13 +16,10 @@
 
 import com.google.cloud.spanner.Statement;
 import com.google.cloud.spanner.connection.AbstractStatementParser.ParsedStatement;
-import com.google.cloud.spanner.connection.StatementResult;
 import com.google.cloud.spanner.pgadapter.ConnectionHandler;
 import com.google.cloud.spanner.pgadapter.error.PGExceptionFactory;
 import com.google.cloud.spanner.pgadapter.metadata.OptionsMetadata;
 import com.google.common.collect.ImmutableList;
-import com.google.common.util.concurrent.Futures;
-import java.util.concurrent.Future;
 
 public class InvalidStatement extends IntermediatePortalStatement {
 
@@ -47,9 +44,4 @@ public InvalidStatement(
         ImmutableList.of());
     setException(PGExceptionFactory.toPGException(exception));
   }
-
-  @Override
-  public Future<StatementResult> describeAsync(BackendConnection backendConnection) {
-    return Futures.immediateFailedFuture(getException());
-  }
 }
diff --git a/...ain/java/com/google/cloud/spanner/pgadapter/statements/SelectCurrentSettingStatement.java b/...ain/java/com/google/cloud/spanner/pgadapter/statements/SelectCurrentSettingStatement.java
@@ -79,10 +79,6 @@ static ShowStatement parse(String sql) {
           "missing '(' for current_setting", SQLState.SyntaxError);
     }
     QuotedString setting = parser.readSingleQuotedString();
-    if (setting == null) {
-      throw PGExceptionFactory.newPGException(
-          "missing or invalid setting name", SQLState.SyntaxError);
-    }
     boolean missingOk = false;
     if (parser.eatToken(",")) {
       String missingOkString = parser.readKeyword().toLowerCase(Locale.ENGLISH);

diff --git a/src/test/java/com/google/cloud/spanner/pgadapter/JdbcMockServerTest.java b/src/test/java/com/google/cloud/spanner/pgadapter/JdbcMockServerTest.java
@@ -4305,6 +4305,33 @@ public void testSelectCurrentSettingMissingNotOk() throws SQLException {
     }
   }
 
+  @Test
+  public void testSelectCurrentSettingMissingOk_settingIsMissing() throws SQLException {
+    try (Connection connection = DriverManager.getConnection(createUrl())) {
+      try (ResultSet resultSet =
+          connection
+              .createStatement()
+              .executeQuery("select current_setting('non_existing_setting', true)")) {
+        assertTrue(resultSet.next());
+        assertNull(resultSet.getString("current_setting"));
+        assertFalse(resultSet.next());
+      }
+    }
+  }
+
+  @Test
+  public void testSelectCurrentSettingMissingOk_settingIsPresent() throws SQLException {
+    try (Connection connection = DriverManager.getConnection(createUrl())) {
+      connection.createStatement().execute("set time zone 'IST'");
+      try (ResultSet resultSet =
+          connection.createStatement().executeQuery("select current_setting('timezone', true)")) {
+        assertTrue(resultSet.next());
+        assertEquals("Asia/Kolkata", resultSet.getString("current_setting"));
+        assertFalse(resultSet.next());
+      }
+    }
+  }
+
   @Test
   public void testSetNames() throws SQLException {
     try (Connection connection = DriverManager.getConnection(createUrl())) {