#882 Improve schema test coverage

src/main/org/firebirdsql/jaybird/util/CollectionUtils.java

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2023-2024 Mark Rotteveel
+// SPDX-FileCopyrightText: Copyright 2023-2025 Mark Rotteveel
 // SPDX-License-Identifier: LGPL-2.1-or-later
 package org.firebirdsql.jaybird.util;
 
@@ -69,4 +69,22 @@ public static void growToSize(final List<?> list, final int size) {
         return size > 0 ? list.get(size - 1) : null;
     }
 
+    /**
+     * Concatenates two lists to a new modifiable list.
+     *
+     * @param list1
+     *         list 1
+     * @param list2
+     *         list 2
+     * @param <T>
+     *         type parameter of {@code list1}, and parent type parameter of {@code list2}
+     * @return concatenation of {@code list1} and {@code list2}
+     */
+    public static <T> List<T> concat(List<T> list1, List<? extends T> list2) {
+        var newList = new ArrayList<T>(list1.size() + list2.size());
+        newList.addAll(list1);
+        newList.addAll(list2);
+        return newList;
+    }
+
 }

src/test/org/firebirdsql/jaybird/util/CollectionUtilsTest.java

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2023-2024 Mark Rotteveel
+// SPDX-FileCopyrightText: Copyright 2023-2025 Mark Rotteveel
 // SPDX-License-Identifier: LGPL-2.1-or-later
 package org.firebirdsql.jaybird.util;
 
@@ -89,6 +89,14 @@ void getLast_multipleItems() {
         assertEquals(item2, CollectionUtils.getLast(List.of(item1, item2)));
     }
 
+    @Test
+    void concat() {
+        var list1 = List.of("item1", "item2");
+        var list2 = List.of("item3", "item4");
+
+        assertEquals(List.of("item1", "item2", "item3", "item4"), CollectionUtils.concat(list1, list2));
+    }
+
     static Stream<Arguments> listFactories() {
         return Stream.of(
                 Arguments.of(factory(ArrayList::new)),

src/test/org/firebirdsql/jdbc/FBDatabaseMetaDataAbstractKeysTest.java

@@ -12,13 +12,15 @@
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
 import static java.util.Collections.unmodifiableMap;
 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.assertions.ResultSetAssertions.assertNextRow;
 import static org.firebirdsql.common.assertions.ResultSetAssertions.assertNoNextRow;
@@ -35,66 +37,86 @@ abstract class FBDatabaseMetaDataAbstractKeysTest {
     private static final String UNNAMED_PK_INDEX_PREFIX = "RDB$PRIMARY";
     private static final String UNNAMED_FK_INDEX_PREFIX = "RDB$FOREIGN";
 
-    //@formatter:off
     @RegisterExtension
     static final UsesDatabaseExtension.UsesDatabaseForAll usesDatabase = UsesDatabaseExtension.usesDatabaseForAll(
-            """
-            create table TABLE_1 (
-              ID integer constraint PK_TABLE_1 primary key
-            )""",
-            """
-            create table TABLE_2 (
-              ID1 integer not null,
-              ID2 integer not null,
-              TABLE_1_ID integer constraint FK_TABLE_2_TO_1 references TABLE_1 (ID),
-              constraint PK_TABLE_2 unique (ID1, ID2) using index ALT_INDEX_NAME_2
-            )""",
-            """
-            create table TABLE_3 (
-              ID integer constraint PK_TABLE_3 primary key using index ALT_INDEX_NAME_3,
-              TABLE_2_ID1 integer,
-              TABLE_2_ID2 integer,
-              constraint FK_TABLE_3_TO_2 foreign key (TABLE_2_ID1, TABLE_2_ID2) references TABLE_2 (ID1, ID2)
-                on delete cascade on update set default
-            )""",
-            """
-            create table TABLE_4 (
-              ID integer primary key using index ALT_INDEX_NAME_4,
-              TABLE_2_ID1 integer,
-              TABLE_2_ID2 integer,
-              constraint FK_TABLE_4_TO_2 foreign key (TABLE_2_ID1, TABLE_2_ID2) references TABLE_2 (ID1, ID2)
-                on delete set default on update set null
-            )""",
-            """
-            create table TABLE_5 (
-              ID integer primary key,
-              TABLE_2_ID1 integer,
-              TABLE_2_ID2 integer,
-              foreign key (TABLE_2_ID1, TABLE_2_ID2) references TABLE_2 (ID1, ID2)
-                on delete set null on update no action using index ALT_INDEX_NAME_5
-            )""",
-            """
-            create table TABLE_6 (
-              ID integer primary key,
-              TABLE_2_ID1 integer,
-              TABLE_2_ID2 integer,
-              foreign key (TABLE_2_ID1, TABLE_2_ID2) references TABLE_2 (ID1, ID2)
-                on delete no action on update cascade
-            )""",
-            """
-            create table TABLE_7 (
-              ID integer primary key,
-              TABLE_6_ID integer constraint FK_TABLE_7_TO_6 references TABLE_6 (ID) on update cascade
-            )"""
-    );
-    //@formatter:on
+            dbInitStatements());
 
     protected static final MetadataResultSetDefinition keysDefinition =
             new MetadataResultSetDefinition(KeysMetaData.class);
 
     protected static Connection con;
     protected static DatabaseMetaData dbmd;
 
+    private static List<String> dbInitStatements() {
+        var statements = new ArrayList<>(Arrays.asList(
+                """
+                create table TABLE_1 (
+                  ID integer constraint PK_TABLE_1 primary key
+                )""",
+                """
+                create table TABLE_2 (
+                  ID1 integer not null,
+                  ID2 integer not null,
+                  TABLE_1_ID integer constraint FK_TABLE_2_TO_1 references TABLE_1 (ID),
+                  constraint PK_TABLE_2 unique (ID1, ID2) using index ALT_INDEX_NAME_2
+                )""",
+                """
+                create table TABLE_3 (
+                  ID integer constraint PK_TABLE_3 primary key using index ALT_INDEX_NAME_3,
+                  TABLE_2_ID1 integer,
+                  TABLE_2_ID2 integer,
+                  constraint FK_TABLE_3_TO_2 foreign key (TABLE_2_ID1, TABLE_2_ID2) references TABLE_2 (ID1, ID2)
+                    on delete cascade on update set default
+                )""",
+                """
+                create table TABLE_4 (
+                  ID integer primary key using index ALT_INDEX_NAME_4,
+                  TABLE_2_ID1 integer,
+                  TABLE_2_ID2 integer,
+                  constraint FK_TABLE_4_TO_2 foreign key (TABLE_2_ID1, TABLE_2_ID2) references TABLE_2 (ID1, ID2)
+                    on delete set default on update set null
+                )""",
+                """
+                create table TABLE_5 (
+                  ID integer primary key,
+                  TABLE_2_ID1 integer,
+                  TABLE_2_ID2 integer,
+                  foreign key (TABLE_2_ID1, TABLE_2_ID2) references TABLE_2 (ID1, ID2)
+                    on delete set null on update no action using index ALT_INDEX_NAME_5
+                )""",
+                """
+                create table TABLE_6 (
+                  ID integer primary key,
+                  TABLE_2_ID1 integer,
+                  TABLE_2_ID2 integer,
+                  foreign key (TABLE_2_ID1, TABLE_2_ID2) references TABLE_2 (ID1, ID2)
+                    on delete no action on update cascade
+                )"""
+        ));
+        if (!getDefaultSupportInfo().supportsSchemas()) {
+            statements.add("""
+                create table TABLE_7 (
+                  ID integer primary key,
+                  TABLE_6_ID integer constraint FK_TABLE_7_TO_6 references TABLE_6 (ID) on update cascade
+                )""");
+        } else {
+            statements.add("create schema OTHER_SCHEMA");
+            statements.add("""
+                    create table OTHER_SCHEMA.TABLE_8 (
+                      ID integer primary key,
+                      TABLE_1_ID integer constraint FK_TABLE_8_TO_1 references PUBLIC.TABLE_1 (ID)
+                    )""");
+            statements.add("""
+                create table TABLE_7 (
+                  ID integer primary key,
+                  TABLE_6_ID integer constraint FK_TABLE_7_TO_6 references TABLE_6 (ID) on update cascade,
+                  TABLE_8_ID integer constraint FK_TABLE_7_TO_8 references OTHER_SCHEMA.TABLE_8 (ID) on delete cascade
+                )""");
+        }
+
+        return statements;
+    }
+
     @BeforeAll
     static void setupAll() throws SQLException {
         con = getConnectionViaDriverManager();
@@ -163,13 +185,26 @@ protected static List<Map<KeysMetaData, Object>> table6Fks() {
                         UNNAMED_CONSTRAINT_PREFIX, "ALT_INDEX_NAME_2", UNNAMED_FK_INDEX_PREFIX));
     }
 
-    protected static List<Map<KeysMetaData, Object>> table7Fks() {
+    protected static List<Map<KeysMetaData, Object>> table7to6Fks() {
         return List.of(
                 createKeysTestData("TABLE_6", "ID", "TABLE_7", "TABLE_6_ID", 1, DatabaseMetaData.importedKeyCascade,
                         DatabaseMetaData.importedKeyNoAction, UNNAMED_CONSTRAINT_PREFIX, "FK_TABLE_7_TO_6",
                         UNNAMED_PK_INDEX_PREFIX, "FK_TABLE_7_TO_6"));
     }
 
+    protected static List<Map<KeysMetaData, Object>> table7to8Fks() {
+        return List.of(createKeysTestData("OTHER_SCHEMA", "TABLE_8", "ID", "PUBLIC", "TABLE_7", "TABLE_8_ID", 1,
+                DatabaseMetaData.importedKeyNoAction, DatabaseMetaData.importedKeyCascade,
+                UNNAMED_CONSTRAINT_PREFIX, "FK_TABLE_7_TO_8", UNNAMED_PK_INDEX_PREFIX, "FK_TABLE_7_TO_8"));
+    }
+
+    protected static List<Map<KeysMetaData, Object>> table8Fks() {
+        return List.of(
+                createKeysTestData("PUBLIC", "TABLE_1", "ID", "OTHER_SCHEMA", "TABLE_8", "TABLE_1_ID", 1,
+                        DatabaseMetaData.importedKeyNoAction, DatabaseMetaData.importedKeyNoAction,
+                        "PK_TABLE_1", "FK_TABLE_8_TO_1", "PK_TABLE_1", "FK_TABLE_8_TO_1"));
+    }
+
     protected void validateExpectedKeys(ResultSet keys, List<Map<KeysMetaData, Object>> expectedKeys)
             throws Exception {
         for (Map<KeysMetaData, Object> expectedColumn : expectedKeys) {