diff --git a/src/main/java/com/google/cloud/spanner/jdbc/JdbcConnection.java b/src/main/java/com/google/cloud/spanner/jdbc/JdbcConnection.java index 5aefd35b..4e231809 100644 --- a/src/main/java/com/google/cloud/spanner/jdbc/JdbcConnection.java +++ b/src/main/java/com/google/cloud/spanner/jdbc/JdbcConnection.java @@ -291,7 +291,7 @@ public void setCatalog(String catalog) throws SQLException { @Override public String getCatalog() throws SQLException { checkClosed(); - return getConnectionOptions().getDatabaseName(); + return ""; } @Override diff --git a/src/test/java/com/google/cloud/spanner/jdbc/JdbcConnectionTest.java b/src/test/java/com/google/cloud/spanner/jdbc/JdbcConnectionTest.java index a80e8009..82e26d03 100644 --- a/src/test/java/com/google/cloud/spanner/jdbc/JdbcConnectionTest.java +++ b/src/test/java/com/google/cloud/spanner/jdbc/JdbcConnectionTest.java @@ -634,7 +634,9 @@ public void testCatalog() throws SQLException { ConnectionOptions options = mock(ConnectionOptions.class); when(options.getDatabaseName()).thenReturn("test"); try (JdbcConnection connection = createConnection(options)) { - assertThat(connection.getCatalog()).isEqualTo("test"); + // The connection should always return the empty string as the current catalog, as no other + // catalogs exist in the INFORMATION_SCHEMA. + assertThat(connection.getCatalog()).isEqualTo(""); // This should be allowed. connection.setCatalog(""); try {