diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/Keys.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/Keys.java index c90de1c211..df62e1af30 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/Keys.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/Keys.java @@ -68,6 +68,7 @@ public class Keys { // ------------------------------------------------------------------------- public static final ForeignKey PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_CLASS = Internal.createForeignKey(PgAttribute.PG_ATTRIBUTE, DSL.name("SYNTHETIC_FK_pg_attribute__SYNTHETIC_PK_pg_class"), new TableField[] { PgAttribute.PG_ATTRIBUTE.ATTRELID }, Keys.SYNTHETIC_PK_PG_CLASS, new TableField[] { PgClass.PG_CLASS.OID }, true); + public static final ForeignKey PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_TYPE = Internal.createForeignKey(PgAttribute.PG_ATTRIBUTE, DSL.name("SYNTHETIC_FK_pg_attribute__SYNTHETIC_PK_pg_type"), new TableField[] { PgAttribute.PG_ATTRIBUTE.ATTTYPID }, Keys.SYNTHETIC_PK_PG_TYPE, new TableField[] { PgType.PG_TYPE.OID }, true); public static final ForeignKey PG_CLASS__SYNTHETIC_FK_PG_CLASS__SYNTHETIC_PK_PG_NAMESPACE = Internal.createForeignKey(PgClass.PG_CLASS, DSL.name("SYNTHETIC_FK_pg_class__SYNTHETIC_PK_pg_namespace"), new TableField[] { PgClass.PG_CLASS.RELNAMESPACE }, Keys.SYNTHETIC_PK_PG_NAMESPACE, new TableField[] { PgNamespace.PG_NAMESPACE.OID }, true); public static final ForeignKey PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_CLASS = Internal.createForeignKey(PgConstraint.PG_CONSTRAINT, DSL.name("SYNTHETIC_FK_pg_constraint__SYNTHETIC_PK_pg_class"), new TableField[] { PgConstraint.PG_CONSTRAINT.CONRELID }, Keys.SYNTHETIC_PK_PG_CLASS, new TableField[] { PgClass.PG_CLASS.OID }, true); public static final ForeignKey PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_NAMESPACE = Internal.createForeignKey(PgConstraint.PG_CONSTRAINT, DSL.name("SYNTHETIC_FK_pg_constraint__SYNTHETIC_PK_pg_namespace"), new TableField[] { PgConstraint.PG_CONSTRAINT.CONNAMESPACE }, Keys.SYNTHETIC_PK_PG_NAMESPACE, new TableField[] { PgNamespace.PG_NAMESPACE.OID }, true); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgAttrdef.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgAttrdef.java index 4d96353e20..9a600d0d63 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgAttrdef.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgAttrdef.java @@ -17,6 +17,7 @@ import org.jooq.TableField; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.impl.DSL; +import org.jooq.impl.DefaultDataType; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; @@ -68,7 +69,7 @@ public class PgAttrdef extends TableImpl { * configuration. */ @Deprecated - public final TableField ADBIN = createField(DSL.name("adbin"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\"").nullable(false), this, ""); + public final TableField ADBIN = createField(DSL.name("adbin"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\"").nullable(false), this, ""); private PgAttrdef(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgAttribute.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgAttribute.java index 6290006ac4..dee6dc29a1 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgAttribute.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgAttribute.java @@ -12,7 +12,6 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.Record; import org.jooq.Schema; import org.jooq.Table; @@ -24,7 +23,6 @@ import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; import org.jooq.meta.postgres.pg_catalog.PgCatalog; -import org.jooq.meta.postgres.pg_catalog.tables.PgClass.PgClassPath; /** @@ -211,12 +209,6 @@ public class PgAttribute extends TableImpl { super(path, childPath, parentPath, PG_ATTRIBUTE); } - public static class PgAttributePath extends PgAttribute implements Path { - public PgAttributePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - } - @Override public Schema getSchema() { return aliased() ? null : PgCatalog.PG_CATALOG; @@ -234,21 +226,33 @@ public class PgAttribute extends TableImpl { @Override public List> getReferences() { - return Arrays.asList(Keys.PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_CLASS); + return Arrays.asList(Keys.PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_CLASS, Keys.PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_TYPE); } - private transient PgClassPath _pgClass; + private transient PgClass _pgClass; /** * Get the implicit join path to the pg_catalog.pg_class table. */ - public PgClassPath pgClass() { + public PgClass pgClass() { if (_pgClass == null) - _pgClass = new PgClassPath(this, Keys.PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_CLASS, null); + _pgClass = new PgClass(this, Keys.PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_CLASS, null); return _pgClass; } + private transient PgType _pgType; + + /** + * Get the implicit join path to the pg_catalog.pg_type table. + */ + public PgType pgType() { + if (_pgType == null) + _pgType = new PgType(this, Keys.PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_TYPE, null); + + return _pgType; + } + @Override public PgAttribute as(String alias) { return new PgAttribute(DSL.name(alias), this); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgClass.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgClass.java index a64547e8ca..02f7bd1c2b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgClass.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgClass.java @@ -12,7 +12,6 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.Record; import org.jooq.Schema; import org.jooq.Table; @@ -20,15 +19,11 @@ import org.jooq.TableField; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.impl.DSL; +import org.jooq.impl.DefaultDataType; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; import org.jooq.meta.postgres.pg_catalog.PgCatalog; -import org.jooq.meta.postgres.pg_catalog.tables.PgAttribute.PgAttributePath; -import org.jooq.meta.postgres.pg_catalog.tables.PgConstraint.PgConstraintPath; -import org.jooq.meta.postgres.pg_catalog.tables.PgIndex.PgIndexPath; -import org.jooq.meta.postgres.pg_catalog.tables.PgNamespace.PgNamespacePath; -import org.jooq.meta.postgres.pg_catalog.tables.PgSequence.PgSequencePath; /** @@ -221,7 +216,7 @@ public class PgClass extends TableImpl { * configuration. */ @Deprecated - public final TableField RELPARTBOUND = createField(DSL.name("relpartbound"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); + public final TableField RELPARTBOUND = createField(DSL.name("relpartbound"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); private PgClass(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); @@ -256,12 +251,6 @@ public class PgClass extends TableImpl { super(path, childPath, parentPath, PG_CLASS); } - public static class PgClassPath extends PgClass implements Path { - public PgClassPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - } - @Override public Schema getSchema() { return aliased() ? null : PgCatalog.PG_CATALOG; @@ -282,82 +271,82 @@ public class PgClass extends TableImpl { return Arrays.asList(Keys.PG_CLASS__SYNTHETIC_FK_PG_CLASS__SYNTHETIC_PK_PG_NAMESPACE); } - private transient PgNamespacePath _pgNamespace; + private transient PgNamespace _pgNamespace; /** * Get the implicit join path to the pg_catalog.pg_namespace * table. */ - public PgNamespacePath pgNamespace() { + public PgNamespace pgNamespace() { if (_pgNamespace == null) - _pgNamespace = new PgNamespacePath(this, Keys.PG_CLASS__SYNTHETIC_FK_PG_CLASS__SYNTHETIC_PK_PG_NAMESPACE, null); + _pgNamespace = new PgNamespace(this, Keys.PG_CLASS__SYNTHETIC_FK_PG_CLASS__SYNTHETIC_PK_PG_NAMESPACE, null); return _pgNamespace; } - private transient PgAttributePath _pgAttribute; + private transient PgAttribute _pgAttribute; /** * Get the implicit to-many join path to the * pg_catalog.pg_attribute table */ - public PgAttributePath pgAttribute() { + public PgAttribute pgAttribute() { if (_pgAttribute == null) - _pgAttribute = new PgAttributePath(this, null, Keys.PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_CLASS.getInverseKey()); + _pgAttribute = new PgAttribute(this, null, Keys.PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_CLASS.getInverseKey()); return _pgAttribute; } - private transient PgConstraintPath _pgConstraint; + private transient PgConstraint _pgConstraint; /** * Get the implicit to-many join path to the * pg_catalog.pg_constraint table */ - public PgConstraintPath pgConstraint() { + public PgConstraint pgConstraint() { if (_pgConstraint == null) - _pgConstraint = new PgConstraintPath(this, null, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_CLASS.getInverseKey()); + _pgConstraint = new PgConstraint(this, null, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_CLASS.getInverseKey()); return _pgConstraint; } - private transient PgIndexPath _indexClass; + private transient PgIndex _indexClass; /** * Get the implicit to-many join path to the * pg_catalog.pg_index table, via the INDEX_CLASS * key */ - public PgIndexPath indexClass() { + public PgIndex indexClass() { if (_indexClass == null) - _indexClass = new PgIndexPath(this, null, Keys.PG_INDEX__INDEX_CLASS.getInverseKey()); + _indexClass = new PgIndex(this, null, Keys.PG_INDEX__INDEX_CLASS.getInverseKey()); return _indexClass; } - private transient PgIndexPath _tableClass; + private transient PgIndex _tableClass; /** * Get the implicit to-many join path to the * pg_catalog.pg_index table, via the TABLE_CLASS * key */ - public PgIndexPath tableClass() { + public PgIndex tableClass() { if (_tableClass == null) - _tableClass = new PgIndexPath(this, null, Keys.PG_INDEX__TABLE_CLASS.getInverseKey()); + _tableClass = new PgIndex(this, null, Keys.PG_INDEX__TABLE_CLASS.getInverseKey()); return _tableClass; } - private transient PgSequencePath _pgSequence; + private transient PgSequence _pgSequence; /** * Get the implicit to-many join path to the * pg_catalog.pg_sequence table */ - public PgSequencePath pgSequence() { + public PgSequence pgSequence() { if (_pgSequence == null) - _pgSequence = new PgSequencePath(this, null, Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_CLASS.getInverseKey()); + _pgSequence = new PgSequence(this, null, Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_CLASS.getInverseKey()); return _pgSequence; } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgConstraint.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgConstraint.java index 8335c9bcb2..0f5b05b857 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgConstraint.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgConstraint.java @@ -12,7 +12,6 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.Record; import org.jooq.Schema; import org.jooq.Table; @@ -20,12 +19,11 @@ import org.jooq.TableField; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.impl.DSL; +import org.jooq.impl.DefaultDataType; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; import org.jooq.meta.postgres.pg_catalog.PgCatalog; -import org.jooq.meta.postgres.pg_catalog.tables.PgClass.PgClassPath; -import org.jooq.meta.postgres.pg_catalog.tables.PgNamespace.PgNamespacePath; /** @@ -183,7 +181,7 @@ public class PgConstraint extends TableImpl { * configuration. */ @Deprecated - public final TableField CONBIN = createField(DSL.name("conbin"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); + public final TableField CONBIN = createField(DSL.name("conbin"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); private PgConstraint(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); @@ -218,12 +216,6 @@ public class PgConstraint extends TableImpl { super(path, childPath, parentPath, PG_CONSTRAINT); } - public static class PgConstraintPath extends PgConstraint implements Path { - public PgConstraintPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - } - @Override public Schema getSchema() { return aliased() ? null : PgCatalog.PG_CATALOG; @@ -244,27 +236,27 @@ public class PgConstraint extends TableImpl { return Arrays.asList(Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_NAMESPACE, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_CLASS); } - private transient PgNamespacePath _pgNamespace; + private transient PgNamespace _pgNamespace; /** * Get the implicit join path to the pg_catalog.pg_namespace * table. */ - public PgNamespacePath pgNamespace() { + public PgNamespace pgNamespace() { if (_pgNamespace == null) - _pgNamespace = new PgNamespacePath(this, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_NAMESPACE, null); + _pgNamespace = new PgNamespace(this, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_NAMESPACE, null); return _pgNamespace; } - private transient PgClassPath _pgClass; + private transient PgClass _pgClass; /** * Get the implicit join path to the pg_catalog.pg_class table. */ - public PgClassPath pgClass() { + public PgClass pgClass() { if (_pgClass == null) - _pgClass = new PgClassPath(this, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_CLASS, null); + _pgClass = new PgClass(this, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_CLASS, null); return _pgClass; } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgEnum.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgEnum.java index 6ef743c3f7..8bef9fb3c3 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgEnum.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgEnum.java @@ -12,7 +12,6 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.Record; import org.jooq.Schema; import org.jooq.Table; @@ -24,7 +23,6 @@ import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; import org.jooq.meta.postgres.pg_catalog.PgCatalog; -import org.jooq.meta.postgres.pg_catalog.tables.PgType.PgTypePath; /** @@ -101,12 +99,6 @@ public class PgEnum extends TableImpl { super(path, childPath, parentPath, PG_ENUM); } - public static class PgEnumPath extends PgEnum implements Path { - public PgEnumPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - } - @Override public Schema getSchema() { return aliased() ? null : PgCatalog.PG_CATALOG; @@ -127,14 +119,14 @@ public class PgEnum extends TableImpl { return Arrays.asList(Keys.PG_ENUM__SYNTHETIC_FK_PG_ENUM__SYNTHETIC_PK_PG_TYPE); } - private transient PgTypePath _pgType; + private transient PgType _pgType; /** * Get the implicit join path to the pg_catalog.pg_type table. */ - public PgTypePath pgType() { + public PgType pgType() { if (_pgType == null) - _pgType = new PgTypePath(this, Keys.PG_ENUM__SYNTHETIC_FK_PG_ENUM__SYNTHETIC_PK_PG_TYPE, null); + _pgType = new PgType(this, Keys.PG_ENUM__SYNTHETIC_FK_PG_ENUM__SYNTHETIC_PK_PG_TYPE, null); return _pgType; } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgIndex.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgIndex.java index 10aa7e661f..35bf1d3d6f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgIndex.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgIndex.java @@ -12,7 +12,6 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.Record; import org.jooq.Schema; import org.jooq.Table; @@ -20,11 +19,11 @@ import org.jooq.TableField; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.impl.DSL; +import org.jooq.impl.DefaultDataType; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; import org.jooq.meta.postgres.pg_catalog.PgCatalog; -import org.jooq.meta.postgres.pg_catalog.tables.PgClass.PgClassPath; /** @@ -126,22 +125,22 @@ public class PgIndex extends TableImpl { /** * The column pg_catalog.pg_index.indkey. */ - public final TableField INDKEY = createField(DSL.name("indkey"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"nt2vector\"").nullable(false).array(), this, ""); + public final TableField INDKEY = createField(DSL.name("indkey"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"nt2vector\"").nullable(false).array(), this, ""); /** * The column pg_catalog.pg_index.indcollation. */ - public final TableField INDCOLLATION = createField(DSL.name("indcollation"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"idvector\"").nullable(false).array(), this, ""); + public final TableField INDCOLLATION = createField(DSL.name("indcollation"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"idvector\"").nullable(false).array(), this, ""); /** * The column pg_catalog.pg_index.indclass. */ - public final TableField INDCLASS = createField(DSL.name("indclass"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"idvector\"").nullable(false).array(), this, ""); + public final TableField INDCLASS = createField(DSL.name("indclass"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"idvector\"").nullable(false).array(), this, ""); /** * The column pg_catalog.pg_index.indoption. */ - public final TableField INDOPTION = createField(DSL.name("indoption"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"nt2vector\"").nullable(false).array(), this, ""); + public final TableField INDOPTION = createField(DSL.name("indoption"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"nt2vector\"").nullable(false).array(), this, ""); /** * @deprecated Unknown data type. If this is a qualified, user-defined type, @@ -152,7 +151,7 @@ public class PgIndex extends TableImpl { * configuration. */ @Deprecated - public final TableField INDEXPRS = createField(DSL.name("indexprs"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); + public final TableField INDEXPRS = createField(DSL.name("indexprs"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); /** * @deprecated Unknown data type. If this is a qualified, user-defined type, @@ -163,7 +162,7 @@ public class PgIndex extends TableImpl { * configuration. */ @Deprecated - public final TableField INDPRED = createField(DSL.name("indpred"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); + public final TableField INDPRED = createField(DSL.name("indpred"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); private PgIndex(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); @@ -198,12 +197,6 @@ public class PgIndex extends TableImpl { super(path, childPath, parentPath, PG_INDEX); } - public static class PgIndexPath extends PgIndex implements Path { - public PgIndexPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - } - @Override public Schema getSchema() { return aliased() ? null : PgCatalog.PG_CATALOG; @@ -219,28 +212,28 @@ public class PgIndex extends TableImpl { return Arrays.asList(Keys.PG_INDEX__INDEX_CLASS, Keys.PG_INDEX__TABLE_CLASS); } - private transient PgClassPath _indexClass; + private transient PgClass _indexClass; /** * Get the implicit join path to the pg_catalog.pg_class table, * via the INDEX_CLASS key. */ - public PgClassPath indexClass() { + public PgClass indexClass() { if (_indexClass == null) - _indexClass = new PgClassPath(this, Keys.PG_INDEX__INDEX_CLASS, null); + _indexClass = new PgClass(this, Keys.PG_INDEX__INDEX_CLASS, null); return _indexClass; } - private transient PgClassPath _tableClass; + private transient PgClass _tableClass; /** * Get the implicit join path to the pg_catalog.pg_class table, * via the TABLE_CLASS key. */ - public PgClassPath tableClass() { + public PgClass tableClass() { if (_tableClass == null) - _tableClass = new PgClassPath(this, Keys.PG_INDEX__TABLE_CLASS, null); + _tableClass = new PgClass(this, Keys.PG_INDEX__TABLE_CLASS, null); return _tableClass; } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgNamespace.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgNamespace.java index ec1b746a10..de8ba11cb1 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgNamespace.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgNamespace.java @@ -12,7 +12,6 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.Record; import org.jooq.Schema; import org.jooq.Table; @@ -24,10 +23,6 @@ import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; import org.jooq.meta.postgres.pg_catalog.PgCatalog; -import org.jooq.meta.postgres.pg_catalog.tables.PgClass.PgClassPath; -import org.jooq.meta.postgres.pg_catalog.tables.PgConstraint.PgConstraintPath; -import org.jooq.meta.postgres.pg_catalog.tables.PgProc.PgProcPath; -import org.jooq.meta.postgres.pg_catalog.tables.PgType.PgTypePath; /** @@ -104,12 +99,6 @@ public class PgNamespace extends TableImpl { super(path, childPath, parentPath, PG_NAMESPACE); } - public static class PgNamespacePath extends PgNamespace implements Path { - public PgNamespacePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - } - @Override public Schema getSchema() { return aliased() ? null : PgCatalog.PG_CATALOG; @@ -125,54 +114,54 @@ public class PgNamespace extends TableImpl { return Arrays.asList(Keys.PG_NAMESPACE_OID_INDEX, Keys.PG_NAMESPACE_NSPNAME_INDEX); } - private transient PgClassPath _pgClass; + private transient PgClass _pgClass; /** * Get the implicit to-many join path to the * pg_catalog.pg_class table */ - public PgClassPath pgClass() { + public PgClass pgClass() { if (_pgClass == null) - _pgClass = new PgClassPath(this, null, Keys.PG_CLASS__SYNTHETIC_FK_PG_CLASS__SYNTHETIC_PK_PG_NAMESPACE.getInverseKey()); + _pgClass = new PgClass(this, null, Keys.PG_CLASS__SYNTHETIC_FK_PG_CLASS__SYNTHETIC_PK_PG_NAMESPACE.getInverseKey()); return _pgClass; } - private transient PgConstraintPath _pgConstraint; + private transient PgConstraint _pgConstraint; /** * Get the implicit to-many join path to the * pg_catalog.pg_constraint table */ - public PgConstraintPath pgConstraint() { + public PgConstraint pgConstraint() { if (_pgConstraint == null) - _pgConstraint = new PgConstraintPath(this, null, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_NAMESPACE.getInverseKey()); + _pgConstraint = new PgConstraint(this, null, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_NAMESPACE.getInverseKey()); return _pgConstraint; } - private transient PgProcPath _pgProc; + private transient PgProc _pgProc; /** * Get the implicit to-many join path to the pg_catalog.pg_proc * table */ - public PgProcPath pgProc() { + public PgProc pgProc() { if (_pgProc == null) - _pgProc = new PgProcPath(this, null, Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_NAMESPACE.getInverseKey()); + _pgProc = new PgProc(this, null, Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_NAMESPACE.getInverseKey()); return _pgProc; } - private transient PgTypePath _pgType; + private transient PgType _pgType; /** * Get the implicit to-many join path to the pg_catalog.pg_type * table */ - public PgTypePath pgType() { + public PgType pgType() { if (_pgType == null) - _pgType = new PgTypePath(this, null, Keys.PG_TYPE__SYNTHETIC_FK_PG_TYPE__SYNTHETIC_PK_PG_NAMESPACE.getInverseKey()); + _pgType = new PgType(this, null, Keys.PG_TYPE__SYNTHETIC_FK_PG_TYPE__SYNTHETIC_PK_PG_NAMESPACE.getInverseKey()); return _pgType; } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgProc.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgProc.java index a6c1fc2618..79db27084a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgProc.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgProc.java @@ -12,7 +12,6 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.Record; import org.jooq.Schema; import org.jooq.Table; @@ -20,12 +19,11 @@ import org.jooq.TableField; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.impl.DSL; +import org.jooq.impl.DefaultDataType; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; import org.jooq.meta.postgres.pg_catalog.PgCatalog; -import org.jooq.meta.postgres.pg_catalog.tables.PgNamespace.PgNamespacePath; -import org.jooq.meta.postgres.pg_catalog.tables.PgType.PgTypePath; /** @@ -147,7 +145,7 @@ public class PgProc extends TableImpl { /** * The column pg_catalog.pg_proc.proargtypes. */ - public final TableField PROARGTYPES = createField(DSL.name("proargtypes"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"idvector\"").nullable(false).array(), this, ""); + public final TableField PROARGTYPES = createField(DSL.name("proargtypes"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"idvector\"").nullable(false).array(), this, ""); /** * The column pg_catalog.pg_proc.proallargtypes. @@ -173,7 +171,7 @@ public class PgProc extends TableImpl { * configuration. */ @Deprecated - public final TableField PROARGDEFAULTS = createField(DSL.name("proargdefaults"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); + public final TableField PROARGDEFAULTS = createField(DSL.name("proargdefaults"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); /** * The column pg_catalog.pg_proc.protrftypes. @@ -199,7 +197,7 @@ public class PgProc extends TableImpl { * configuration. */ @Deprecated - public final TableField PROSQLBODY = createField(DSL.name("prosqlbody"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); + public final TableField PROSQLBODY = createField(DSL.name("prosqlbody"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); /** * The column pg_catalog.pg_proc.proconfig. @@ -244,12 +242,6 @@ public class PgProc extends TableImpl { super(path, childPath, parentPath, PG_PROC); } - public static class PgProcPath extends PgProc implements Path { - public PgProcPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - } - @Override public Schema getSchema() { return aliased() ? null : PgCatalog.PG_CATALOG; @@ -270,27 +262,27 @@ public class PgProc extends TableImpl { return Arrays.asList(Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_NAMESPACE, Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_TYPE); } - private transient PgNamespacePath _pgNamespace; + private transient PgNamespace _pgNamespace; /** * Get the implicit join path to the pg_catalog.pg_namespace * table. */ - public PgNamespacePath pgNamespace() { + public PgNamespace pgNamespace() { if (_pgNamespace == null) - _pgNamespace = new PgNamespacePath(this, Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_NAMESPACE, null); + _pgNamespace = new PgNamespace(this, Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_NAMESPACE, null); return _pgNamespace; } - private transient PgTypePath _pgType; + private transient PgType _pgType; /** * Get the implicit join path to the pg_catalog.pg_type table. */ - public PgTypePath pgType() { + public PgType pgType() { if (_pgType == null) - _pgType = new PgTypePath(this, Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_TYPE, null); + _pgType = new PgType(this, Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_TYPE, null); return _pgType; } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgSequence.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgSequence.java index 2c45accd7f..6ec291ec8d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgSequence.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgSequence.java @@ -12,7 +12,6 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.Record; import org.jooq.Schema; import org.jooq.Table; @@ -24,8 +23,6 @@ import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; import org.jooq.meta.postgres.pg_catalog.PgCatalog; -import org.jooq.meta.postgres.pg_catalog.tables.PgClass.PgClassPath; -import org.jooq.meta.postgres.pg_catalog.tables.PgType.PgTypePath; /** @@ -122,12 +119,6 @@ public class PgSequence extends TableImpl { super(path, childPath, parentPath, PG_SEQUENCE); } - public static class PgSequencePath extends PgSequence implements Path { - public PgSequencePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - } - @Override public Schema getSchema() { return aliased() ? null : PgCatalog.PG_CATALOG; @@ -143,26 +134,26 @@ public class PgSequence extends TableImpl { return Arrays.asList(Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_CLASS, Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_TYPE); } - private transient PgClassPath _pgClass; + private transient PgClass _pgClass; /** * Get the implicit join path to the pg_catalog.pg_class table. */ - public PgClassPath pgClass() { + public PgClass pgClass() { if (_pgClass == null) - _pgClass = new PgClassPath(this, Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_CLASS, null); + _pgClass = new PgClass(this, Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_CLASS, null); return _pgClass; } - private transient PgTypePath _pgType; + private transient PgType _pgType; /** * Get the implicit join path to the pg_catalog.pg_type table. */ - public PgTypePath pgType() { + public PgType pgType() { if (_pgType == null) - _pgType = new PgTypePath(this, Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_TYPE, null); + _pgType = new PgType(this, Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_TYPE, null); return _pgType; } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgType.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgType.java index b7ff711912..543570e901 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgType.java @@ -12,7 +12,6 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.Record; import org.jooq.Schema; import org.jooq.Table; @@ -20,14 +19,11 @@ import org.jooq.TableField; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.impl.DSL; +import org.jooq.impl.DefaultDataType; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.pg_catalog.Keys; import org.jooq.meta.postgres.pg_catalog.PgCatalog; -import org.jooq.meta.postgres.pg_catalog.tables.PgEnum.PgEnumPath; -import org.jooq.meta.postgres.pg_catalog.tables.PgNamespace.PgNamespacePath; -import org.jooq.meta.postgres.pg_catalog.tables.PgProc.PgProcPath; -import org.jooq.meta.postgres.pg_catalog.tables.PgSequence.PgSequencePath; /** @@ -205,7 +201,7 @@ public class PgType extends TableImpl { * configuration. */ @Deprecated - public final TableField TYPDEFAULTBIN = createField(DSL.name("typdefaultbin"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); + public final TableField TYPDEFAULTBIN = createField(DSL.name("typdefaultbin"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"pg_node_tree\""), this, ""); /** * The column pg_catalog.pg_type.typdefault. @@ -250,12 +246,6 @@ public class PgType extends TableImpl { super(path, childPath, parentPath, PG_TYPE); } - public static class PgTypePath extends PgType implements Path { - public PgTypePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - } - @Override public Schema getSchema() { return aliased() ? null : PgCatalog.PG_CATALOG; @@ -276,54 +266,67 @@ public class PgType extends TableImpl { return Arrays.asList(Keys.PG_TYPE__SYNTHETIC_FK_PG_TYPE__SYNTHETIC_PK_PG_NAMESPACE); } - private transient PgNamespacePath _pgNamespace; + private transient PgNamespace _pgNamespace; /** * Get the implicit join path to the pg_catalog.pg_namespace * table. */ - public PgNamespacePath pgNamespace() { + public PgNamespace pgNamespace() { if (_pgNamespace == null) - _pgNamespace = new PgNamespacePath(this, Keys.PG_TYPE__SYNTHETIC_FK_PG_TYPE__SYNTHETIC_PK_PG_NAMESPACE, null); + _pgNamespace = new PgNamespace(this, Keys.PG_TYPE__SYNTHETIC_FK_PG_TYPE__SYNTHETIC_PK_PG_NAMESPACE, null); return _pgNamespace; } - private transient PgEnumPath _pgEnum; + private transient PgAttribute _pgAttribute; + + /** + * Get the implicit to-many join path to the + * pg_catalog.pg_attribute table + */ + public PgAttribute pgAttribute() { + if (_pgAttribute == null) + _pgAttribute = new PgAttribute(this, null, Keys.PG_ATTRIBUTE__SYNTHETIC_FK_PG_ATTRIBUTE__SYNTHETIC_PK_PG_TYPE.getInverseKey()); + + return _pgAttribute; + } + + private transient PgEnum _pgEnum; /** * Get the implicit to-many join path to the pg_catalog.pg_enum * table */ - public PgEnumPath pgEnum() { + public PgEnum pgEnum() { if (_pgEnum == null) - _pgEnum = new PgEnumPath(this, null, Keys.PG_ENUM__SYNTHETIC_FK_PG_ENUM__SYNTHETIC_PK_PG_TYPE.getInverseKey()); + _pgEnum = new PgEnum(this, null, Keys.PG_ENUM__SYNTHETIC_FK_PG_ENUM__SYNTHETIC_PK_PG_TYPE.getInverseKey()); return _pgEnum; } - private transient PgProcPath _pgProc; + private transient PgProc _pgProc; /** * Get the implicit to-many join path to the pg_catalog.pg_proc * table */ - public PgProcPath pgProc() { + public PgProc pgProc() { if (_pgProc == null) - _pgProc = new PgProcPath(this, null, Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_TYPE.getInverseKey()); + _pgProc = new PgProc(this, null, Keys.PG_PROC__SYNTHETIC_FK_PG_PROC__SYNTHETIC_PK_PG_TYPE.getInverseKey()); return _pgProc; } - private transient PgSequencePath _pgSequence; + private transient PgSequence _pgSequence; /** * Get the implicit to-many join path to the * pg_catalog.pg_sequence table */ - public PgSequencePath pgSequence() { + public PgSequence pgSequence() { if (_pgSequence == null) - _pgSequence = new PgSequencePath(this, null, Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_TYPE.getInverseKey()); + _pgSequence = new PgSequence(this, null, Keys.PG_SEQUENCE__SYNTHETIC_FK_PG_SEQUENCE__SYNTHETIC_PK_PG_TYPE.getInverseKey()); return _pgSequence; }