From 5e6b8f7d79890895ec051d423ef748360bef3ed9 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 3 Feb 2012 12:48:48 +0000 Subject: [PATCH] [#282] Add support for multi-schema databases - Re-generated Postgres pg_catalog meta schema --- .../util/postgres/pg_catalog/PgCatalog.java | 5 +- .../postgres/pg_catalog/PgCatalogFactory.java | 4 +- .../util/postgres/pg_catalog/Routines.java | 2 +- .../jooq/util/postgres/pg_catalog/Tables.java | 7 +- .../pg_catalog/routines/FormatType.java | 4 +- .../pg_catalog/tables/PgAttribute.java | 4 +- .../postgres/pg_catalog/tables/PgClass.java | 4 +- .../postgres/pg_catalog/tables/PgEnum.java | 4 +- .../pg_catalog/tables/PgNamespace.java | 66 +++++++++++++++++++ .../postgres/pg_catalog/tables/PgProc.java | 4 +- .../postgres/pg_catalog/tables/PgType.java | 4 +- .../tables/records/PgAttributeRecord.java | 4 +- .../tables/records/PgClassRecord.java | 4 +- .../tables/records/PgEnumRecord.java | 4 +- .../tables/records/PgNamespaceRecord.java | 63 ++++++++++++++++++ .../tables/records/PgProcRecord.java | 4 +- .../tables/records/PgTypeRecord.java | 4 +- 17 files changed, 163 insertions(+), 28 deletions(-) create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgNamespaceRecord.java diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java index 4398cfe0d2..ff0ff3e81d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgCatalog extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -1188892543; + private static final long serialVersionUID = 791750662; /** * The singleton instance of pg_catalog @@ -30,6 +30,7 @@ public class PgCatalog extends org.jooq.impl.SchemaImpl { org.jooq.util.postgres.pg_catalog.tables.PgAttribute.PG_ATTRIBUTE, org.jooq.util.postgres.pg_catalog.tables.PgClass.PG_CLASS, org.jooq.util.postgres.pg_catalog.tables.PgEnum.PG_ENUM, + org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE, org.jooq.util.postgres.pg_catalog.tables.PgProc.PG_PROC, org.jooq.util.postgres.pg_catalog.tables.PgType.PG_TYPE); } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalogFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalogFactory.java index 7ece62ef52..ca228140ba 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalogFactory.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalogFactory.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgCatalogFactory extends org.jooq.util.postgres.PostgresFactory { - private static final long serialVersionUID = 1176309791; + private static final long serialVersionUID = -1388784032; /** * Create a factory with a connection diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java index c036e56704..3c4dfa16c1 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java @@ -8,7 +8,7 @@ package org.jooq.util.postgres.pg_catalog; * * Convenience access to all stored procedures and functions in pg_catalog */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public final class Routines { diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java index 954d93a46a..475af3e840 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java @@ -8,7 +8,7 @@ package org.jooq.util.postgres.pg_catalog; * * Convenience access to all tables in pg_catalog */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public final class Tables { @@ -27,6 +27,11 @@ public final class Tables { */ public static org.jooq.util.postgres.pg_catalog.tables.PgEnum PG_ENUM = org.jooq.util.postgres.pg_catalog.tables.PgEnum.PG_ENUM; + /** + * The table pg_catalog.pg_namespace + */ + public static org.jooq.util.postgres.pg_catalog.tables.PgNamespace PG_NAMESPACE = org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE; + /** * The table pg_catalog.pg_proc */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java index 4902f6a197..eef2b33f6d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.routines; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class FormatType extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = 52003906; + private static final long serialVersionUID = 1204222339; /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java index 3be7924427..eb20955681 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgAttribute extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -729869737; + private static final long serialVersionUID = 753041846; /** * The singleton instance of pg_attribute diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java index a1b3b58fe9..88c0613052 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgClass extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -734953648; + private static final long serialVersionUID = 1169850129; /** * The singleton instance of pg_class diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java index a386b5edcb..ff8fc65e15 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgEnum extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -852851406; + private static final long serialVersionUID = -1311846575; /** * The singleton instance of pg_enum diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java new file mode 100644 index 0000000000..4417501129 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java @@ -0,0 +1,66 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.postgres.pg_catalog.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, + comments = "This class is generated by jOOQ") +public class PgNamespace extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = -1757898245; + + /** + * The singleton instance of pg_namespace + */ + public static final org.jooq.util.postgres.pg_catalog.tables.PgNamespace PG_NAMESPACE = new org.jooq.util.postgres.pg_catalog.tables.PgNamespace(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.util.postgres.pg_catalog.tables.records.PgNamespaceRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + */ + public final org.jooq.TableField NSPNAME = createField("nspname", org.jooq.impl.SQLDataType.VARCHAR, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField NSPOWNER = createField("nspowner", org.jooq.impl.SQLDataType.BIGINT, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField NSPACL = createField("nspacl", org.jooq.impl.SQLDataType.VARCHAR.getArrayDataType(), this); + + /** + * No further instances allowed + */ + private PgNamespace() { + super("pg_namespace", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG); + } + + /** + * No further instances allowed + */ + private PgNamespace(java.lang.String alias) { + super(alias, org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE); + } + + @Override + public org.jooq.util.postgres.pg_catalog.tables.PgNamespace as(java.lang.String alias) { + return new org.jooq.util.postgres.pg_catalog.tables.PgNamespace(alias); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java index cb87efe809..93fb95f52b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgProc extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -1600168068; + private static final long serialVersionUID = 990924029; /** * The singleton instance of pg_proc diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java index 370f1ed2f1..e427f6b8ba 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgType extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1464561442; + private static final long serialVersionUID = 900015809; /** * The singleton instance of pg_type diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgAttributeRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgAttributeRecord.java index 36fa7702ad..0b04ca8720 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgAttributeRecord.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgAttributeRecord.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgAttributeRecord extends org.jooq.impl.TableRecordImpl { - private static final long serialVersionUID = -1211512384; + private static final long serialVersionUID = 457353345; /** * An uncommented item diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgClassRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgClassRecord.java index 530ace6b9d..11c77e9ca1 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgClassRecord.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgClassRecord.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgClassRecord extends org.jooq.impl.TableRecordImpl { - private static final long serialVersionUID = 368688692; + private static final long serialVersionUID = -545497803; /** * An uncommented item diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgEnumRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgEnumRecord.java index 3fbc20736a..14b6face09 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgEnumRecord.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgEnumRecord.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgEnumRecord extends org.jooq.impl.TableRecordImpl { - private static final long serialVersionUID = 1837699198; + private static final long serialVersionUID = 1875819327; /** * An uncommented item diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgNamespaceRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgNamespaceRecord.java new file mode 100644 index 0000000000..3089dd0f9e --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgNamespaceRecord.java @@ -0,0 +1,63 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.postgres.pg_catalog.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, + comments = "This class is generated by jOOQ") +public class PgNamespaceRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = 621543853; + + /** + * An uncommented item + */ + public void setNspname(java.lang.String value) { + setValue(org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE.NSPNAME, value); + } + + /** + * An uncommented item + */ + public java.lang.String getNspname() { + return getValue(org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE.NSPNAME); + } + + /** + * An uncommented item + */ + public void setNspowner(java.lang.Long value) { + setValue(org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE.NSPOWNER, value); + } + + /** + * An uncommented item + */ + public java.lang.Long getNspowner() { + return getValue(org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE.NSPOWNER); + } + + /** + * An uncommented item + */ + public void setNspacl(java.lang.String[] value) { + setValue(org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE.NSPACL, value); + } + + /** + * An uncommented item + */ + public java.lang.String[] getNspacl() { + return getValue(org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE.NSPACL); + } + + /** + * Create a detached PgNamespaceRecord + */ + public PgNamespaceRecord() { + super(org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgProcRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgProcRecord.java index 824317a0f6..3a7558b67b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgProcRecord.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgProcRecord.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgProcRecord extends org.jooq.impl.TableRecordImpl { - private static final long serialVersionUID = -1278533302; + private static final long serialVersionUID = -1871166069; /** * An uncommented item diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgTypeRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgTypeRecord.java index f999512fea..b27d192dd9 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgTypeRecord.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgTypeRecord.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.3"}, comments = "This class is generated by jOOQ") public class PgTypeRecord extends org.jooq.impl.TableRecordImpl { - private static final long serialVersionUID = -1594558076; + private static final long serialVersionUID = 334831621; /** * An uncommented item