#822 Improve schema test coverage (getPseudoColumns/getTables)

mrotteveel · mrotteveel · commit cf4ac9c598db · 2025-07-22T12:28:49.000+02:00
diff --git a/src/test/org/firebirdsql/common/FBTestProperties.java b/src/test/org/firebirdsql/common/FBTestProperties.java
@@ -383,15 +383,16 @@ public static <T> T ifSchemaElse(T forSchema, T withoutSchema) {
     }
 
     /**
-     * Helper method that replaces {@code "PUBLIC"} with {@code ""} if schemas are not supported.
+     * Helper method that replaces {@code "PUBLIC"} or {@code "SYSTEM"} with {@code ""} if schemas are not supported.
      *
      * @param schemaName
      *         schema name
-     * @return {@code schemaName}, or &mdash; if {@code schemaName} is {@code "PUBLIC"} and schemas are not supported
-     * &mdash; {@code ""}
+     * @return {@code schemaName}, or &mdash; if {@code schemaName} is {@code "PUBLIC"} or {@code "SYSTEM"} and schemas
+     * are not supported &mdash; {@code ""}
      */
     public static String resolveSchema(String schemaName) {
-        if (!getDefaultSupportInfo().supportsSchemas() && "PUBLIC".equals(schemaName)) {
+        if (!getDefaultSupportInfo().supportsSchemas()
+                && ("PUBLIC".equals(schemaName) || "SYSTEM".equals(schemaName))) {
             return "";
         }
         return schemaName;
diff --git a/src/test/org/firebirdsql/jdbc/FBDatabaseMetaDataPseudoColumnsTest.java b/src/test/org/firebirdsql/jdbc/FBDatabaseMetaDataPseudoColumnsTest.java
@@ -3,70 +3,73 @@
 package org.firebirdsql.jdbc;
 
 import org.firebirdsql.common.extension.UsesDatabaseExtension;
+import org.firebirdsql.util.FirebirdSupportInfo;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.sql.*;
 import java.util.*;
 
 import static org.firebirdsql.common.FBTestProperties.getConnectionViaDriverManager;
 import static org.firebirdsql.common.FBTestProperties.getDefaultSupportInfo;
 import static org.firebirdsql.common.FBTestProperties.ifSchemaElse;
+import static org.firebirdsql.common.FBTestProperties.resolveSchema;
+import static org.firebirdsql.common.FbAssumptions.assumeFeature;
 import static org.firebirdsql.common.JdbcResourceHelper.closeQuietly;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 class FBDatabaseMetaDataPseudoColumnsTest {
 
-    // TODO Add schema support: tests involving other schema
-
-    //@formatter:off
     private static final String NORMAL_TABLE_NAME = "NORMAL_TABLE";
-    private static final String CREATE_NORMAL_TABLE = "create table " + NORMAL_TABLE_NAME + " ( "
-            + " ID integer primary key"
-            + ")";
-    private static final String NORMAL_TABLE2_NAME = "NORMAL_TABLE2";
-    private static final String CREATE_NORMAL_TABLE2 = "create table " + NORMAL_TABLE2_NAME + " ( "
-            + " ID integer primary key"
-            + ")";
+    private static final String CREATE_NORMAL_TABLE = """
+            create table NORMAL_TABLE (
+              ID integer primary key
+            )""";
+    private static final String CREATE_NORMAL_TABLE2 = """
+            create table NORMAL_TABLE2 (
+              ID integer primary key
+            )""";
     private static final String SINGLE_VIEW_NAME = "SINGLE_VIEW";
     private static final String CREATE_SINGLE_VIEW =
-            "create view " + SINGLE_VIEW_NAME + " as select id from " + NORMAL_TABLE_NAME;
+            "create view SINGLE_VIEW as select id from NORMAL_TABLE";
     private static final String MULTI_VIEW_NAME = "MULTI_VIEW";
-    private static final String CREATE_MULTI_VIEW = "create view " + MULTI_VIEW_NAME + " as "
-            + "select a.id as id1, b.id as id2 "
-            + "from " + NORMAL_TABLE_NAME + " as a, " + NORMAL_TABLE2_NAME + " as b";
+    private static final String CREATE_MULTI_VIEW =
+            "create view MULTI_VIEW as select a.id as id1, b.id as id2 from NORMAL_TABLE as a, NORMAL_TABLE2 as b";
     private static final String EXTERNAL_TABLE_NAME = "EXTERNAL_TABLE";
-    private static final String CREATE_EXTERNAL_TABLE = "create table " + EXTERNAL_TABLE_NAME
-            + " external file 'test_external_tbl.dat' ( "
-            + " ID integer not null"
-            + ")";
+    private static final String CREATE_EXTERNAL_TABLE = """
+            create table EXTERNAL_TABLE
+             external file 'test_external_tbl.dat' (
+              ID integer not null
+            )""";
     private static final String GTT_PRESERVE_NAME = "GTT_PRESERVE";
-    private static final String CREATE_GTT_PRESERVE = "create global temporary table " + GTT_PRESERVE_NAME + " ("
-            + " ID integer primary key"
-            + ") "
-            + " on commit preserve rows ";
+    private static final String CREATE_GTT_PRESERVE = """
+            create global temporary table GTT_PRESERVE (
+              ID integer primary key
+            ) on commit preserve rows""";
     private static final String GTT_DELETE_NAME = "GTT_DELETE";
-    private static final String CREATE_GTT_DELETE = "create global temporary table " + GTT_DELETE_NAME + " ("
-            + " ID integer primary key"
-            + ") "
-            + " on commit delete rows ";
-    //@formatter:on
+    private static final String CREATE_GTT_DELETE = """
+            create global temporary table GTT_DELETE (
+             ID integer primary key
+            ) on commit delete rows""";
+    private static final String CREATE_OTHER_SCHEMA = "create schema OTHER_SCHEMA";
+    private static final String NORMAL_TABLE3_NAME = "NORMAL_TABLE3";
+    private static final String CREATE_OTHER_SCHEMA_NORMAL_TABLE3 = """
+            create table OTHER_SCHEMA.NORMAL_TABLE3 (
+              ID integer primary key
+            )""";
 
     private static final MetadataResultSetDefinition getPseudoColumnsDefinition =
             new MetadataResultSetDefinition(PseudoColumnMetaData.class);
 
     @RegisterExtension
-    static final UsesDatabaseExtension.UsesDatabaseForAll usesDatabase = UsesDatabaseExtension.usesDatabaseForAll(
-            CREATE_NORMAL_TABLE,
-            CREATE_NORMAL_TABLE2,
-            CREATE_SINGLE_VIEW,
-            CREATE_MULTI_VIEW,
-            CREATE_EXTERNAL_TABLE,
-            CREATE_GTT_PRESERVE,
-            CREATE_GTT_DELETE);
+    static final UsesDatabaseExtension.UsesDatabaseForAll usesDatabase =
+            UsesDatabaseExtension.usesDatabaseForAll(getDbInitStatements());
 
     private static final boolean supportsRecordVersion = getDefaultSupportInfo()
             .supportsRecordVersionPseudoColumn();
@@ -80,6 +83,24 @@ static void setupAll() throws SQLException {
         dbmd = con.getMetaData();
     }
 
+    private static List<String> getDbInitStatements() {
+        var statements = new ArrayList<>(List.of(
+                CREATE_NORMAL_TABLE,
+                CREATE_NORMAL_TABLE2,
+                CREATE_SINGLE_VIEW,
+                CREATE_MULTI_VIEW,
+                CREATE_EXTERNAL_TABLE,
+                CREATE_GTT_PRESERVE,
+                CREATE_GTT_DELETE));
+        if (getDefaultSupportInfo().supportsSchemas()) {
+            statements.addAll(List.of(
+                    CREATE_OTHER_SCHEMA,
+                    CREATE_OTHER_SCHEMA_NORMAL_TABLE3));
+        }
+
+        return statements;
+    }
+
     @AfterAll
     static void tearDownAll() throws SQLException {
         try {
@@ -100,12 +121,14 @@ void testPseudoColumnsMetaDataColumns() throws Exception {
         }
     }
 
-    @Test
-    void testNormalTable_allPseudoColumns() throws Exception {
+    @ParameterizedTest
+    @NullSource
+    @ValueSource(strings = { "%", "PUBLIC" })
+    void testNormalTable_allPseudoColumns(String schemaPattern) throws Exception {
         List<Map<PseudoColumnMetaData, Object>> validationRules =
                 createStandardValidationRules(NORMAL_TABLE_NAME, "NO");
 
-        ResultSet pseudoColumns = dbmd.getPseudoColumns(null, null, NORMAL_TABLE_NAME, "%");
+        ResultSet pseudoColumns = dbmd.getPseudoColumns(null, resolveSchema(schemaPattern), NORMAL_TABLE_NAME, "%");
         validate(pseudoColumns, validationRules);
     }
 
@@ -253,8 +276,9 @@ void testPattern_wildCardTable() throws Exception {
                 tableCount += 1;
             }
 
-            // System tables + the 7 tables created for this test
-            assertEquals(getDefaultSupportInfo().getSystemTableCount() + 7, tableCount,
+            // System tables + the tables created for this test
+            int testTableCount = getDefaultSupportInfo().supportsSchemas() ? 8 : 7;
+            assertEquals(getDefaultSupportInfo().getSystemTableCount() + testTableCount, tableCount,
                     "Unexpected number of pseudo columns");
         }
     }
@@ -267,12 +291,25 @@ void testPattern_nullTable() throws Exception {
                 tableCount += 1;
             }
 
-            // System tables + the 7 tables created for this test
-            assertEquals(getDefaultSupportInfo().getSystemTableCount() + 7, tableCount,
+            // System tables + the tables created for this test
+            int testTableCount = getDefaultSupportInfo().supportsSchemas() ? 8 : 7;
+            assertEquals(getDefaultSupportInfo().getSystemTableCount() + testTableCount, tableCount,
                     "Unexpected number of pseudo columns");
         }
     }
 
+    @ParameterizedTest
+    @NullSource
+    @ValueSource(strings = { "%", "OTHER_SCHEMA", "OTHER\\_SCHEMA", "OTHER%" })
+    void testOtherSchemaNormalTable2_allPseudoColumns(String schemaPattern) throws Exception {
+        assumeFeature(FirebirdSupportInfo::supportsSchemas, "Test requires schema support");
+        List<Map<PseudoColumnMetaData, Object>> validationRules =
+                createStandardValidationRules("OTHER_SCHEMA", NORMAL_TABLE3_NAME, "NO");
+
+        ResultSet pseudoColumns = dbmd.getPseudoColumns(null, schemaPattern, NORMAL_TABLE3_NAME, "%");
+        validate(pseudoColumns, validationRules);
+    }
+
     private List<Map<PseudoColumnMetaData, Object>> createStandardValidationRules(String tableName,
             String recordVersionNullable) {
         return createStandardValidationRules(ifSchemaElse("PUBLIC", null), tableName, recordVersionNullable);
@@ -342,6 +379,7 @@ private Map<PseudoColumnMetaData, Object> createDbkeyValidationRules(String sche
         return rules;
     }
 
+    @SuppressWarnings("SameParameterValue")
     private Map<PseudoColumnMetaData, Object> createRecordVersionValidationRules(String tableName, String nullable) {
         return createRecordVersionValidationRules(ifSchemaElse("PUBLIC", null), tableName, nullable);
     }
diff --git a/src/test/org/firebirdsql/jdbc/FBDatabaseMetaDataTablesTest.java b/src/test/org/firebirdsql/jdbc/FBDatabaseMetaDataTablesTest.java
