From 5f0de09cbc0da5fad7047058a410476caa766ee1 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 16 Jun 2020 11:53:23 +0200 Subject: [PATCH] [jOOQ/jOOQ#10284] Add UDT.getPackage() in the OSS edition API --- jOOQ/src/main/java/org/jooq/UDT.java | 11 ++++------ .../main/java/org/jooq/impl/DetachedMeta.java | 2 +- jOOQ/src/main/java/org/jooq/impl/UDTImpl.java | 21 ++++++------------- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/UDT.java b/jOOQ/src/main/java/org/jooq/UDT.java index 8986673d6f..0c73fdb749 100644 --- a/jOOQ/src/main/java/org/jooq/UDT.java +++ b/jOOQ/src/main/java/org/jooq/UDT.java @@ -180,13 +180,10 @@ public interface UDT> extends Named { */ Schema getSchema(); - - - - - - - + /** + * Get the UDT package. + */ + Package getPackage(); /** * @return The record type produced by this table. diff --git a/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java b/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java index bf9787fbf1..7e114d4574 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java +++ b/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java @@ -316,7 +316,7 @@ final class DetachedMeta extends AbstractMeta { private static final long serialVersionUID = -5732449514562314202L; DetachedUDT(DetachedSchema schema, UDT udt) { - super(udt.getName(), schema, udt.isSynthetic()); + super(udt.getName(), schema, udt.getPackage(), udt.isSynthetic()); } } } \ No newline at end of file diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java index 72fa2d2d0b..46bb881553 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java @@ -47,7 +47,6 @@ import org.jooq.DataType; import org.jooq.Field; import org.jooq.Name; import org.jooq.Package; -// ... import org.jooq.Record; import org.jooq.Row; import org.jooq.Schema; @@ -69,10 +68,7 @@ public class UDTImpl> extends AbstractNamed implements UD private final Schema schema; private final Fields fields; - - - - + private final Package pkg; private final boolean synthetic; private transient DataType type; @@ -89,9 +85,7 @@ public class UDTImpl> extends AbstractNamed implements UD this.fields = new Fields<>(); this.schema = schema; - - - + this.pkg = pkg; this.synthetic = synthetic; } @@ -111,13 +105,10 @@ public class UDTImpl> extends AbstractNamed implements UD return s == null ? super.getQualifiedName() : s.getQualifiedName().append(getUnqualifiedName()); } - - - - - - - + @Override + public final Package getPackage() { + return pkg; + } @Override public final Row fieldsRow() {