From 8558387efe94a346812bc40ac27eb34f97bb0041 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 22 Jul 2021 11:24:38 +0200 Subject: [PATCH] [jOOQ/jOOQ#12240] Fixed regression for Firebird, SQLite --- jOOQ/src/main/java/org/jooq/impl/MetaImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java index 9b9c0fa993..d7a61be373 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java @@ -828,10 +828,15 @@ final class MetaImpl extends AbstractMeta { groups.forEach((k, v) -> { // [#7377] The schema may be null instead of "" in some dialects - Schema schema = schemas.get(name( - hasCatalog(getCatalog()) ? defaultString(k.get(0, String.class)) : null, - defaultString(k.get(1, String.class)) - )); + // [#12243] [#12240] Not all dialects have catalog support + Schema schema = schemas.get( + hasCatalog(getCatalog()) + ? name( + defaultString(k.get(0, String.class)), + defaultString(k.get(1, String.class)) + ) + : name(defaultString(k.get(1, String.class))) + ); String fkName = k.get(3, String.class); String pkName = k.get(4, String.class);