From 659d9f09ebd6351d3bf9d944e335860298eb4cfe Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 25 Feb 2021 19:22:59 +0100
Subject: [PATCH] [jOOQ/jOOQ#7172] [jOOQ/jOOQ#10204] Can't use
 Table.getQualifiedName()

---
 jOOQ/src/main/java/org/jooq/impl/AbstractNamed.java   | 2 +-
 jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractNamed.java b/jOOQ/src/main/java/org/jooq/impl/AbstractNamed.java
index 34baa8b3e1..03b2b7845d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractNamed.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractNamed.java
@@ -125,7 +125,7 @@ abstract class AbstractNamed extends AbstractQueryPart implements Named {
     // -------------------------------------------------------------------------
 
     static final Name nameOrDefault(Named named) {
-        return named == null ? NO_NAME : named.getQualifiedName();
+        return named == null ? NO_NAME : named.getUnqualifiedName();
     }
 
     static final Name qualify(Named qualifier, Name name) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java
index 305e280160..b304d01d75 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java
@@ -119,11 +119,12 @@ final class CatalogMetaImpl extends AbstractMeta {
         Map<Name, Schema> s = new LinkedHashMap<>();
         Map<Name, List<Table<?>>> mapping = new LinkedHashMap<>();
 
+        // TODO: [#7172] Can't use Table.getQualifiedName() here, yet
         for (Table<?> table : tables)
-            mapping.computeIfAbsent(nameOrDefault(table.getSchema()), k -> new ArrayList<>()).add(table);
+            mapping.computeIfAbsent(nameOrDefault(table.getCatalog()).append(nameOrDefault(table.getSchema())), k -> new ArrayList<>()).add(table);
 
         for (Table<?> table : tables)
-            s.computeIfAbsent(nameOrDefault(table.getSchema()), k -> new SchemaImpl(k, table.getCatalog()) {
+            s.computeIfAbsent(nameOrDefault(table.getCatalog()).append(nameOrDefault(table.getSchema())), k -> new SchemaImpl(k, table.getCatalog()) {
                 @Override
                 public List<Table<?>> getTables() {
                     return mapping.get(getQualifiedName());