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

[jOOQ/jOOQ#9457] UDT.getQualifiedName() doesn't return schema qualification for generated tables

Browse Source
This commit is contained in:
Lukas Eder 2019-10-29 15:15:30 +01:00
parent 080e3a6e4c
commit 70f0fe3426
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,11 +63,12 @@ abstract class AbstractNamed extends AbstractQueryPart implements Named {
@Override
public final String getName() {
return StringUtils.defaultIfNull(name.last(), "");
return StringUtils.defaultIfNull(getQualifiedName().last(), "");
}
/* [#7172] For lazy initialisation reasons, some subtypes need to override this method */
@Override
public final Name getQualifiedName() {
public /* non-final */ Name getQualifiedName() {
return name;
}
@ -90,7 +91,7 @@ abstract class AbstractNamed extends AbstractQueryPart implements Named {
// [#1938] This is a much more efficient hashCode() implementation
// compared to that of standard QueryParts
return name == null ? 0 : name.hashCode();
return getQualifiedName() == null ? 0 : getQualifiedName().hashCode();
}
@Override
@ -103,7 +104,7 @@ abstract class AbstractNamed extends AbstractQueryPart implements Named {
// [#2144] Non-equality can be decided early, without executing the
// rather expensive implementation of AbstractQueryPart.equals()
if (that instanceof AbstractNamed)
if (!name.equals(((AbstractNamed) that).name))
if (!getQualifiedName().equals(((AbstractNamed) that).getQualifiedName()))
return false;
return super.equals(that);

6
jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
View File

@ -105,6 +105,12 @@ public class UDTImpl<R extends UDTRecord<R>> extends AbstractNamed implements UD
return schema;
}
@Override
public /* non-final */ Name getQualifiedName() {
Schema s = getSchema();
return s == null ? super.getQualifiedName() : s.getQualifiedName().append(getUnqualifiedName());
}