github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#7172] [jOOQ/jOOQ#10204] Can't use Table.getQualifiedName()

Browse Source
This commit is contained in:
Lukas Eder 2021-02-25 19:22:59 +01:00
parent 296cc536b1
commit 659d9f09eb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ/src/main/java/org/jooq/impl/AbstractNamed.java
View File

@ -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) {

5
jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java
View File

@ -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());