From b69cc3eba3db3aa38dc0d47479fc02af1287ebf9 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 5 Nov 2020 14:16:51 +0100 Subject: [PATCH] [jOOQ/jOOQ#10824] Stop using information_schema.table_constraints in PostgresDatabase --- .../jooq/meta/postgres/PostgresDatabase.java | 83 ++++----- .../information_schema/DefaultCatalog.java | 2 +- .../information_schema/InformationSchema.java | 9 +- .../postgres/information_schema/Keys.java | 15 +- .../postgres/information_schema/Tables.java | 6 - .../information_schema/tables/Attributes.java | 2 +- .../tables/CheckConstraints.java | 12 +- .../information_schema/tables/Columns.java | 2 +- .../tables/ConstraintColumnUsage.java | 2 +- .../information_schema/tables/Domains.java | 17 +- .../tables/KeyColumnUsage.java | 15 +- .../information_schema/tables/Parameters.java | 15 +- .../tables/ReferentialConstraints.java | 19 +- .../information_schema/tables/Routines.java | 16 +- .../information_schema/tables/Schemata.java | 2 +- .../information_schema/tables/Sequences.java | 2 +- .../tables/TableConstraints.java | 170 ------------------ .../information_schema/tables/Tables.java | 2 +- .../information_schema/tables/Views.java | 2 +- .../postgres/pg_catalog/DefaultCatalog.java | 2 +- .../jooq/meta/postgres/pg_catalog/Keys.java | 3 +- .../meta/postgres/pg_catalog/PgCatalog.java | 2 +- .../postgres/pg_catalog/routines/Count1.java | 2 +- .../postgres/pg_catalog/routines/Count2.java | 2 +- .../pg_catalog/routines/FormatType.java | 2 +- .../postgres/pg_catalog/tables/PgAttrdef.java | 2 +- .../pg_catalog/tables/PgAttribute.java | 2 +- .../postgres/pg_catalog/tables/PgClass.java | 2 +- .../pg_catalog/tables/PgCollation.java | 2 +- .../pg_catalog/tables/PgConstraint.java | 8 +- .../pg_catalog/tables/PgDescription.java | 2 +- .../postgres/pg_catalog/tables/PgEnum.java | 6 +- .../postgres/pg_catalog/tables/PgIndex.java | 2 +- .../pg_catalog/tables/PgInherits.java | 2 +- .../pg_catalog/tables/PgNamespace.java | 2 +- .../postgres/pg_catalog/tables/PgProc.java | 2 +- .../pg_catalog/tables/PgSequence.java | 2 +- .../postgres/pg_catalog/tables/PgType.java | 2 +- jOOQ/src/main/java/org/jooq/impl/MetaSQL.java | 2 +- 39 files changed, 110 insertions(+), 334 deletions(-) delete mode 100644 jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/TableConstraints.java diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java index 27e5f906d1..91b80a1eb0 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java @@ -73,7 +73,6 @@ import static org.jooq.meta.postgres.information_schema.Tables.PARAMETERS; import static org.jooq.meta.postgres.information_schema.Tables.ROUTINES; import static org.jooq.meta.postgres.information_schema.Tables.SEQUENCES; import static org.jooq.meta.postgres.information_schema.Tables.TABLES; -import static org.jooq.meta.postgres.information_schema.Tables.TABLE_CONSTRAINTS; import static org.jooq.meta.postgres.information_schema.Tables.VIEWS; import static org.jooq.meta.postgres.pg_catalog.Tables.PG_CLASS; import static org.jooq.meta.postgres.pg_catalog.Tables.PG_CONSTRAINT; @@ -143,8 +142,8 @@ import org.jooq.meta.TableDefinition; import org.jooq.meta.UDTDefinition; import org.jooq.meta.hsqldb.HSQLDBDatabase; import org.jooq.meta.postgres.information_schema.tables.CheckConstraints; +import org.jooq.meta.postgres.information_schema.tables.KeyColumnUsage; import org.jooq.meta.postgres.information_schema.tables.Routines; -import org.jooq.meta.postgres.information_schema.tables.TableConstraints; import org.jooq.meta.postgres.pg_catalog.tables.PgClass; import org.jooq.meta.postgres.pg_catalog.tables.PgConstraint; import org.jooq.meta.postgres.pg_catalog.tables.PgIndex; @@ -179,6 +178,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat PgIndex i = PG_INDEX.as("i"); PgClass trel = PG_CLASS.as("trel"); + PgConstraint c = PG_CONSTRAINT.as("c"); indexLoop: for (Record6 record : create() @@ -200,8 +200,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat .and(getIncludeSystemIndexes() ? noCondition() : row(trel.pgNamespace().NSPNAME, i.indexClass().RELNAME).notIn( - select(TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA, TABLE_CONSTRAINTS.CONSTRAINT_NAME) - .from(TABLE_CONSTRAINTS) + select(c.pgNamespace().NSPNAME, c.CONNAME).from(c) )) .orderBy(1, 2, 3)) { @@ -290,31 +289,39 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat @Override public ResultQuery> primaryKeys(List schemas) { - return keys(schemas, inline("PRIMARY KEY")); + return keys(schemas, inline("p")); } @Override public ResultQuery> uniqueKeys(List schemas) { - return keys(schemas, inline("UNIQUE")); + return keys(schemas, inline("u")); } private ResultQuery> keys(List schemas, Field constraintType) { + KeyColumnUsage k = KEY_COLUMN_USAGE.as("k"); + PgConstraint c = PG_CONSTRAINT.as("c"); + return create() .select( - KEY_COLUMN_USAGE.TABLE_CATALOG, - KEY_COLUMN_USAGE.TABLE_SCHEMA, - KEY_COLUMN_USAGE.TABLE_NAME, - KEY_COLUMN_USAGE.CONSTRAINT_NAME, - KEY_COLUMN_USAGE.COLUMN_NAME, - KEY_COLUMN_USAGE.ORDINAL_POSITION) - .from(KEY_COLUMN_USAGE) - .where(KEY_COLUMN_USAGE.tableConstraints().CONSTRAINT_TYPE.eq(constraintType)) - .and(KEY_COLUMN_USAGE.tableConstraints().TABLE_SCHEMA.in(schemas)) + k.TABLE_CATALOG, + k.TABLE_SCHEMA, + k.TABLE_NAME, + k.CONSTRAINT_NAME, + k.COLUMN_NAME, + k.ORDINAL_POSITION) + .from(c) + .join(k) + .on(k.TABLE_SCHEMA.eq(c.pgClass().pgNamespace().NSPNAME)) + .and(k.TABLE_NAME.eq(c.pgClass().RELNAME)) + .and(k.CONSTRAINT_SCHEMA.eq(c.pgNamespace().NSPNAME)) + .and(k.CONSTRAINT_NAME.eq(c.CONNAME)) + .where(c.CONTYPE.eq(constraintType)) + .and(c.pgNamespace().NSPNAME.in(schemas)) .orderBy( - KEY_COLUMN_USAGE.TABLE_SCHEMA.asc(), - KEY_COLUMN_USAGE.TABLE_NAME.asc(), - KEY_COLUMN_USAGE.CONSTRAINT_NAME.asc(), - KEY_COLUMN_USAGE.ORDINAL_POSITION.asc()); + k.TABLE_SCHEMA.asc(), + k.TABLE_NAME.asc(), + k.CONSTRAINT_NAME.asc(), + k.ORDINAL_POSITION.asc()); } @Override @@ -364,48 +371,44 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat @Override protected void loadCheckConstraints(DefaultRelations relations) throws SQLException { - TableConstraints tc = TABLE_CONSTRAINTS.as("tc"); CheckConstraints cc = CHECK_CONSTRAINTS.as("cc"); - - PgNamespace pn = PG_NAMESPACE.as("pn"); - PgClass pt = PG_CLASS.as("pt"); PgConstraint pc = PG_CONSTRAINT.as("pc"); for (Record record : create() .select( - pn.NSPNAME.as(tc.TABLE_SCHEMA), - pt.RELNAME.as(tc.TABLE_NAME), + pc.pgClass().pgNamespace().NSPNAME, + pc.pgClass().RELNAME, pc.CONNAME.as(cc.CONSTRAINT_NAME), replace(field("pg_get_constraintdef({0}.oid)", VARCHAR, pc), inline("CHECK "), inline("")).as(cc.CHECK_CLAUSE)) - .from(pn) - .join(pt).on(pn.OID.eq(pt.RELNAMESPACE)) - .join(pc).on(pt.OID.eq(pc.CONRELID)) - .where(pn.NSPNAME.in(getInputSchemata())) + .from(pc) + .where(pc.pgClass().pgNamespace().NSPNAME.in(getInputSchemata())) .and(pc.CONTYPE.eq(inline("c"))) .unionAll( getIncludeSystemCheckConstraints() ? select( - tc.TABLE_SCHEMA, - tc.TABLE_NAME, + pc.pgClass().pgNamespace().NSPNAME, + pc.pgClass().RELNAME, cc.CONSTRAINT_NAME, cc.CHECK_CLAUSE ) - .from(tc) + .from(pc) .join(cc) - .using(tc.CONSTRAINT_CATALOG, tc.CONSTRAINT_SCHEMA, tc.CONSTRAINT_NAME) - .where(tc.TABLE_SCHEMA.in(getInputSchemata())) - .and(row(tc.TABLE_SCHEMA, tc.TABLE_NAME, cc.CONSTRAINT_NAME).notIn( - select(pn.NSPNAME, pt.RELNAME, pc.CONNAME) + .on(pc.CONNAME.eq(cc.CONSTRAINT_NAME)) + .and(pc.pgNamespace().NSPNAME.eq(cc.CONSTRAINT_NAME)) + .where(pc.pgNamespace().NSPNAME.in(getInputSchemata())) + .and(row(pc.pgClass().pgNamespace().NSPNAME, pc.pgClass().RELNAME, cc.CONSTRAINT_NAME).notIn( + select( + pc.pgClass().pgNamespace().NSPNAME, + pc.pgClass().RELNAME, + pc.CONNAME) .from(pc) - .join(pt).on(pc.CONRELID.eq(oid(pt))) - .join(pn).on(pc.CONNAMESPACE.eq(oid(pn))) .where(pc.CONTYPE.eq(inline("c"))) )) : select(inline(""), inline(""), inline(""), inline("")).where(falseCondition())) .orderBy(1, 2, 3) ) { - SchemaDefinition schema = getSchema(record.get(tc.TABLE_SCHEMA)); - TableDefinition table = getTable(schema, record.get(tc.TABLE_NAME)); + SchemaDefinition schema = getSchema(record.get(pc.pgClass().pgNamespace().NSPNAME)); + TableDefinition table = getTable(schema, record.get(pc.pgClass().RELNAME)); if (table != null) { relations.addCheckConstraint(table, new DefaultCheckConstraintDefinition( diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/DefaultCatalog.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/DefaultCatalog.java index 9c1740c1d3..cbe0a4e27f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/DefaultCatalog.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/DefaultCatalog.java @@ -17,7 +17,7 @@ import org.jooq.impl.CatalogImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = 1692669599; + private static final long serialVersionUID = 1L; /** * The reference instance of DEFAULT_CATALOG diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/InformationSchema.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/InformationSchema.java index 0819468818..589e8b60fa 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/InformationSchema.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/InformationSchema.java @@ -21,7 +21,6 @@ import org.jooq.meta.postgres.information_schema.tables.ReferentialConstraints; import org.jooq.meta.postgres.information_schema.tables.Routines; import org.jooq.meta.postgres.information_schema.tables.Schemata; import org.jooq.meta.postgres.information_schema.tables.Sequences; -import org.jooq.meta.postgres.information_schema.tables.TableConstraints; import org.jooq.meta.postgres.information_schema.tables.Tables; import org.jooq.meta.postgres.information_schema.tables.Views; @@ -32,7 +31,7 @@ import org.jooq.meta.postgres.information_schema.tables.Views; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class InformationSchema extends SchemaImpl { - private static final long serialVersionUID = -424520553; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema @@ -94,11 +93,6 @@ public class InformationSchema extends SchemaImpl { */ public final Sequences SEQUENCES = Sequences.SEQUENCES; - /** - * The table information_schema.table_constraints. - */ - public final TableConstraints TABLE_CONSTRAINTS = TableConstraints.TABLE_CONSTRAINTS; - /** * The table information_schema.tables. */ @@ -136,7 +130,6 @@ public class InformationSchema extends SchemaImpl { Routines.ROUTINES, Schemata.SCHEMATA, Sequences.SEQUENCES, - TableConstraints.TABLE_CONSTRAINTS, Tables.TABLES, Views.VIEWS); } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/Keys.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/Keys.java index e32fed324b..d2cd6dfb18 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/Keys.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/Keys.java @@ -11,13 +11,9 @@ import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.meta.postgres.information_schema.tables.CheckConstraints; -import org.jooq.meta.postgres.information_schema.tables.KeyColumnUsage; -import org.jooq.meta.postgres.information_schema.tables.Parameters; -import org.jooq.meta.postgres.information_schema.tables.ReferentialConstraints; -import org.jooq.meta.postgres.information_schema.tables.Routines; +import org.jooq.meta.postgres.information_schema.tables.Domains; import org.jooq.meta.postgres.information_schema.tables.Schemata; import org.jooq.meta.postgres.information_schema.tables.Sequences; -import org.jooq.meta.postgres.information_schema.tables.TableConstraints; import org.jooq.meta.postgres.information_schema.tables.Tables; import org.jooq.meta.postgres.information_schema.tables.Views; @@ -33,21 +29,16 @@ public class Keys { // UNIQUE and PRIMARY KEY definitions // ------------------------------------------------------------------------- - public static final UniqueKey SYNTHETIC_PK_ROUTINES = Internal.createUniqueKey(Routines.ROUTINES, DSL.name("SYNTHETIC_PK_routines"), new TableField[] { Routines.ROUTINES.SPECIFIC_CATALOG, Routines.ROUTINES.SPECIFIC_SCHEMA, Routines.ROUTINES.SPECIFIC_NAME }, true); + public static final UniqueKey SYNTHETIC_PK_CHECK_CONSTRAINTS = Internal.createUniqueKey(CheckConstraints.CHECK_CONSTRAINTS, DSL.name("SYNTHETIC_PK_check_constraints"), new TableField[] { CheckConstraints.CHECK_CONSTRAINTS.CONSTRAINT_CATALOG, CheckConstraints.CHECK_CONSTRAINTS.CONSTRAINT_SCHEMA, CheckConstraints.CHECK_CONSTRAINTS.CONSTRAINT_NAME }, true); + public static final UniqueKey SYNTHETIC_PK_DOMAINS = Internal.createUniqueKey(Domains.DOMAINS, DSL.name("SYNTHETIC_PK_domains"), new TableField[] { Domains.DOMAINS.DOMAIN_CATALOG, Domains.DOMAINS.DOMAIN_SCHEMA, Domains.DOMAINS.DOMAIN_NAME }, true); public static final UniqueKey SYNTHETIC_PK_SCHEMATA = Internal.createUniqueKey(Schemata.SCHEMATA, DSL.name("SYNTHETIC_PK_schemata"), new TableField[] { Schemata.SCHEMATA.CATALOG_NAME, Schemata.SCHEMATA.SCHEMA_NAME }, true); public static final UniqueKey SYNTHETIC_PK_SEQUENCES = Internal.createUniqueKey(Sequences.SEQUENCES, DSL.name("SYNTHETIC_PK_sequences"), new TableField[] { Sequences.SEQUENCES.SEQUENCE_CATALOG, Sequences.SEQUENCES.SEQUENCE_SCHEMA, Sequences.SEQUENCES.SEQUENCE_NAME }, true); - public static final UniqueKey SYNTHETIC_PK_TABLE_CONSTRAINTS = Internal.createUniqueKey(TableConstraints.TABLE_CONSTRAINTS, DSL.name("SYNTHETIC_PK_table_constraints"), new TableField[] { TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_CATALOG, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_NAME }, true); public static final UniqueKey SYNTHETIC_PK_TABLES = Internal.createUniqueKey(Tables.TABLES, DSL.name("SYNTHETIC_PK_tables"), new TableField[] { Tables.TABLES.TABLE_CATALOG, Tables.TABLES.TABLE_SCHEMA, Tables.TABLES.TABLE_NAME }, true); // ------------------------------------------------------------------------- // FOREIGN KEY definitions // ------------------------------------------------------------------------- - public static final ForeignKey CHECK_CONSTRAINTS__SYNTHETIC_FK_CHECK_CONSTRAINTS__SYNTHETIC_PK_TABLE_CONSTRAINTS = Internal.createForeignKey(CheckConstraints.CHECK_CONSTRAINTS, DSL.name("SYNTHETIC_FK_check_constraints__SYNTHETIC_PK_table_constraints"), new TableField[] { CheckConstraints.CHECK_CONSTRAINTS.CONSTRAINT_CATALOG, CheckConstraints.CHECK_CONSTRAINTS.CONSTRAINT_SCHEMA, CheckConstraints.CHECK_CONSTRAINTS.CONSTRAINT_NAME }, Keys.SYNTHETIC_PK_TABLE_CONSTRAINTS, new TableField[] { TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_CATALOG, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_NAME }, true); - public static final ForeignKey KEY_COLUMN_USAGE__SYNTHETIC_FK_KEY_COLUMN_USAGE__SYNTHETIC_PK_TABLE_CONSTRAINTS = Internal.createForeignKey(KeyColumnUsage.KEY_COLUMN_USAGE, DSL.name("SYNTHETIC_FK_key_column_usage__SYNTHETIC_PK_table_constraints"), new TableField[] { KeyColumnUsage.KEY_COLUMN_USAGE.CONSTRAINT_CATALOG, KeyColumnUsage.KEY_COLUMN_USAGE.CONSTRAINT_SCHEMA, KeyColumnUsage.KEY_COLUMN_USAGE.CONSTRAINT_NAME }, Keys.SYNTHETIC_PK_TABLE_CONSTRAINTS, new TableField[] { TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_CATALOG, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_NAME }, true); - public static final ForeignKey PARAMETERS__SYNTHETIC_FK_PARAMETERS__SYNTHETIC_PK_ROUTINES = Internal.createForeignKey(Parameters.PARAMETERS, DSL.name("SYNTHETIC_FK_parameters__SYNTHETIC_PK_routines"), new TableField[] { Parameters.PARAMETERS.SPECIFIC_CATALOG, Parameters.PARAMETERS.SPECIFIC_SCHEMA, Parameters.PARAMETERS.SPECIFIC_NAME }, Keys.SYNTHETIC_PK_ROUTINES, new TableField[] { Routines.ROUTINES.SPECIFIC_CATALOG, Routines.ROUTINES.SPECIFIC_SCHEMA, Routines.ROUTINES.SPECIFIC_NAME }, true); - public static final ForeignKey REFERENTIAL_CONSTRAINTS__REFERENCED_CONSTRAINT = Internal.createForeignKey(ReferentialConstraints.REFERENTIAL_CONSTRAINTS, DSL.name("REFERENCED_CONSTRAINT"), new TableField[] { ReferentialConstraints.REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_CATALOG, ReferentialConstraints.REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_SCHEMA, ReferentialConstraints.REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_NAME }, Keys.SYNTHETIC_PK_TABLE_CONSTRAINTS, new TableField[] { TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_CATALOG, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_NAME }, true); - public static final ForeignKey REFERENTIAL_CONSTRAINTS__REFERENCING_CONSTRAINT = Internal.createForeignKey(ReferentialConstraints.REFERENTIAL_CONSTRAINTS, DSL.name("REFERENCING_CONSTRAINT"), new TableField[] { ReferentialConstraints.REFERENTIAL_CONSTRAINTS.CONSTRAINT_CATALOG, ReferentialConstraints.REFERENTIAL_CONSTRAINTS.CONSTRAINT_SCHEMA, ReferentialConstraints.REFERENTIAL_CONSTRAINTS.CONSTRAINT_NAME }, Keys.SYNTHETIC_PK_TABLE_CONSTRAINTS, new TableField[] { TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_CATALOG, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA, TableConstraints.TABLE_CONSTRAINTS.CONSTRAINT_NAME }, true); public static final ForeignKey SEQUENCES__SYNTHETIC_FK_SEQUENCES__SYNTHETIC_PK_SCHEMATA = Internal.createForeignKey(Sequences.SEQUENCES, DSL.name("SYNTHETIC_FK_sequences__SYNTHETIC_PK_schemata"), new TableField[] { Sequences.SEQUENCES.SEQUENCE_CATALOG, Sequences.SEQUENCES.SEQUENCE_SCHEMA }, Keys.SYNTHETIC_PK_SCHEMATA, new TableField[] { Schemata.SCHEMATA.CATALOG_NAME, Schemata.SCHEMATA.SCHEMA_NAME }, true); public static final ForeignKey VIEWS__SYNTHETIC_FK_VIEWS__SYNTHETIC_PK_TABLES = Internal.createForeignKey(Views.VIEWS, DSL.name("SYNTHETIC_FK_views__SYNTHETIC_PK_tables"), new TableField[] { Views.VIEWS.TABLE_CATALOG, Views.VIEWS.TABLE_SCHEMA, Views.VIEWS.TABLE_NAME }, Keys.SYNTHETIC_PK_TABLES, new TableField[] { Tables.TABLES.TABLE_CATALOG, Tables.TABLES.TABLE_SCHEMA, Tables.TABLES.TABLE_NAME }, true); } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/Tables.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/Tables.java index 83b3900745..9b39d626d8 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/Tables.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/Tables.java @@ -15,7 +15,6 @@ import org.jooq.meta.postgres.information_schema.tables.ReferentialConstraints; import org.jooq.meta.postgres.information_schema.tables.Routines; import org.jooq.meta.postgres.information_schema.tables.Schemata; import org.jooq.meta.postgres.information_schema.tables.Sequences; -import org.jooq.meta.postgres.information_schema.tables.TableConstraints; import org.jooq.meta.postgres.information_schema.tables.Views; @@ -80,11 +79,6 @@ public class Tables { */ public static final Sequences SEQUENCES = Sequences.SEQUENCES; - /** - * The table information_schema.table_constraints. - */ - public static final TableConstraints TABLE_CONSTRAINTS = TableConstraints.TABLE_CONSTRAINTS; - /** * The table information_schema.tables. */ diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Attributes.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Attributes.java index 98cd73fcfe..a13fa22751 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Attributes.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Attributes.java @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.information_schema.InformationSchema; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Attributes extends TableImpl { - private static final long serialVersionUID = -1746890016; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.attributes diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/CheckConstraints.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/CheckConstraints.java index 62cccb284c..9b497868d2 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/CheckConstraints.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/CheckConstraints.java @@ -15,6 +15,7 @@ import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; +import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -28,7 +29,7 @@ import org.jooq.meta.postgres.information_schema.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class CheckConstraints extends TableImpl { - private static final long serialVersionUID = -1318152086; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.check_constraints @@ -102,12 +103,13 @@ public class CheckConstraints extends TableImpl { } @Override - public List> getReferences() { - return Arrays.>asList(Keys.CHECK_CONSTRAINTS__SYNTHETIC_FK_CHECK_CONSTRAINTS__SYNTHETIC_PK_TABLE_CONSTRAINTS); + public UniqueKey getPrimaryKey() { + return Keys.SYNTHETIC_PK_CHECK_CONSTRAINTS; } - public TableConstraints tableConstraints() { - return new TableConstraints(this, Keys.CHECK_CONSTRAINTS__SYNTHETIC_FK_CHECK_CONSTRAINTS__SYNTHETIC_PK_TABLE_CONSTRAINTS); + @Override + public List> getKeys() { + return Arrays.>asList(Keys.SYNTHETIC_PK_CHECK_CONSTRAINTS); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Columns.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Columns.java index e853164b43..05e887fd8e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Columns.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Columns.java @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.information_schema.InformationSchema; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Columns extends TableImpl { - private static final long serialVersionUID = -1114060488; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.columns diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/ConstraintColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/ConstraintColumnUsage.java index 683cd866b0..6465d67c24 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/ConstraintColumnUsage.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/ConstraintColumnUsage.java @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.information_schema.InformationSchema; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class ConstraintColumnUsage extends TableImpl { - private static final long serialVersionUID = -1916631194; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.constraint_column_usage diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Domains.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Domains.java index c2c5c446b1..ae2b22d61b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Domains.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Domains.java @@ -4,6 +4,9 @@ package org.jooq.meta.postgres.information_schema.tables; +import java.util.Arrays; +import java.util.List; + import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Name; @@ -12,10 +15,12 @@ import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; +import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.information_schema.InformationSchema; +import org.jooq.meta.postgres.information_schema.Keys; /** @@ -24,7 +29,7 @@ import org.jooq.meta.postgres.information_schema.InformationSchema; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Domains extends TableImpl { - private static final long serialVersionUID = -990199018; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.domains @@ -212,6 +217,16 @@ public class Domains extends TableImpl { return InformationSchema.INFORMATION_SCHEMA; } + @Override + public UniqueKey getPrimaryKey() { + return Keys.SYNTHETIC_PK_DOMAINS; + } + + @Override + public List> getKeys() { + return Arrays.>asList(Keys.SYNTHETIC_PK_DOMAINS); + } + @Override public Domains as(String alias) { return new Domains(DSL.name(alias), this); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/KeyColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/KeyColumnUsage.java index 7cd16d073b..c5a1c24503 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/KeyColumnUsage.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/KeyColumnUsage.java @@ -4,9 +4,6 @@ package org.jooq.meta.postgres.information_schema.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Name; @@ -19,7 +16,6 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.information_schema.InformationSchema; -import org.jooq.meta.postgres.information_schema.Keys; /** @@ -28,7 +24,7 @@ import org.jooq.meta.postgres.information_schema.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class KeyColumnUsage extends TableImpl { - private static final long serialVersionUID = 96890073; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.key_column_usage @@ -126,15 +122,6 @@ public class KeyColumnUsage extends TableImpl { return InformationSchema.INFORMATION_SCHEMA; } - @Override - public List> getReferences() { - return Arrays.>asList(Keys.KEY_COLUMN_USAGE__SYNTHETIC_FK_KEY_COLUMN_USAGE__SYNTHETIC_PK_TABLE_CONSTRAINTS); - } - - public TableConstraints tableConstraints() { - return new TableConstraints(this, Keys.KEY_COLUMN_USAGE__SYNTHETIC_FK_KEY_COLUMN_USAGE__SYNTHETIC_PK_TABLE_CONSTRAINTS); - } - @Override public KeyColumnUsage as(String alias) { return new KeyColumnUsage(DSL.name(alias), this); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Parameters.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Parameters.java index ee29f4864d..300b737347 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Parameters.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Parameters.java @@ -4,9 +4,6 @@ package org.jooq.meta.postgres.information_schema.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Name; @@ -19,7 +16,6 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.information_schema.InformationSchema; -import org.jooq.meta.postgres.information_schema.Keys; /** @@ -28,7 +24,7 @@ import org.jooq.meta.postgres.information_schema.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Parameters extends TableImpl { - private static final long serialVersionUID = -208102988; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.parameters @@ -241,15 +237,6 @@ public class Parameters extends TableImpl { return InformationSchema.INFORMATION_SCHEMA; } - @Override - public List> getReferences() { - return Arrays.>asList(Keys.PARAMETERS__SYNTHETIC_FK_PARAMETERS__SYNTHETIC_PK_ROUTINES); - } - - public Routines routines() { - return new Routines(this, Keys.PARAMETERS__SYNTHETIC_FK_PARAMETERS__SYNTHETIC_PK_ROUTINES); - } - @Override public Parameters as(String alias) { return new Parameters(DSL.name(alias), this); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/ReferentialConstraints.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/ReferentialConstraints.java index ca4c514450..0d9556df2a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/ReferentialConstraints.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/ReferentialConstraints.java @@ -4,9 +4,6 @@ package org.jooq.meta.postgres.information_schema.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Name; @@ -19,7 +16,6 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.information_schema.InformationSchema; -import org.jooq.meta.postgres.information_schema.Keys; /** @@ -28,7 +24,7 @@ import org.jooq.meta.postgres.information_schema.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class ReferentialConstraints extends TableImpl { - private static final long serialVersionUID = 2065806373; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.referential_constraints @@ -126,19 +122,6 @@ public class ReferentialConstraints extends TableImpl { return InformationSchema.INFORMATION_SCHEMA; } - @Override - public List> getReferences() { - return Arrays.>asList(Keys.REFERENTIAL_CONSTRAINTS__REFERENCING_CONSTRAINT, Keys.REFERENTIAL_CONSTRAINTS__REFERENCED_CONSTRAINT); - } - - public TableConstraints referencingConstraint() { - return new TableConstraints(this, Keys.REFERENTIAL_CONSTRAINTS__REFERENCING_CONSTRAINT); - } - - public TableConstraints referencedConstraint() { - return new TableConstraints(this, Keys.REFERENTIAL_CONSTRAINTS__REFERENCED_CONSTRAINT); - } - @Override public ReferentialConstraints as(String alias) { return new ReferentialConstraints(DSL.name(alias), this); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Routines.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Routines.java index a278a2c470..4521d5c753 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Routines.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Routines.java @@ -5,8 +5,6 @@ package org.jooq.meta.postgres.information_schema.tables; import java.sql.Timestamp; -import java.util.Arrays; -import java.util.List; import org.jooq.Field; import org.jooq.ForeignKey; @@ -16,12 +14,10 @@ import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; -import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; import org.jooq.meta.postgres.information_schema.InformationSchema; -import org.jooq.meta.postgres.information_schema.Keys; /** @@ -30,7 +26,7 @@ import org.jooq.meta.postgres.information_schema.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Routines extends TableImpl { - private static final long serialVersionUID = -1881319768; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.routines @@ -493,16 +489,6 @@ public class Routines extends TableImpl { return InformationSchema.INFORMATION_SCHEMA; } - @Override - public UniqueKey getPrimaryKey() { - return Keys.SYNTHETIC_PK_ROUTINES; - } - - @Override - public List> getKeys() { - return Arrays.>asList(Keys.SYNTHETIC_PK_ROUTINES); - } - @Override public Routines as(String alias) { return new Routines(DSL.name(alias), this); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Schemata.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Schemata.java index 46d45d0fab..58f2ac4bde 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Schemata.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Schemata.java @@ -29,7 +29,7 @@ import org.jooq.meta.postgres.information_schema.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Schemata extends TableImpl { - private static final long serialVersionUID = -1387781475; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.schemata diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Sequences.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Sequences.java index 048149e76a..d24ad756f0 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Sequences.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Sequences.java @@ -29,7 +29,7 @@ import org.jooq.meta.postgres.information_schema.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Sequences extends TableImpl { - private static final long serialVersionUID = -132910416; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.sequences diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/TableConstraints.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/TableConstraints.java deleted file mode 100644 index 934cb455e1..0000000000 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/TableConstraints.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package org.jooq.meta.postgres.information_schema.tables; - - -import java.util.Arrays; -import java.util.List; - -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Name; -import org.jooq.Record; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.TableOptions; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.SQLDataType; -import org.jooq.impl.TableImpl; -import org.jooq.meta.postgres.information_schema.InformationSchema; -import org.jooq.meta.postgres.information_schema.Keys; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableConstraints extends TableImpl { - - private static final long serialVersionUID = -1640574570; - - /** - * The reference instance of information_schema.table_constraints - */ - public static final TableConstraints TABLE_CONSTRAINTS = new TableConstraints(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column information_schema.table_constraints.constraint_catalog. - */ - public final TableField CONSTRAINT_CATALOG = createField(DSL.name("constraint_catalog"), SQLDataType.VARCHAR, this, ""); - - /** - * The column information_schema.table_constraints.constraint_schema. - */ - public final TableField CONSTRAINT_SCHEMA = createField(DSL.name("constraint_schema"), SQLDataType.VARCHAR, this, ""); - - /** - * The column information_schema.table_constraints.constraint_name. - */ - public final TableField CONSTRAINT_NAME = createField(DSL.name("constraint_name"), SQLDataType.VARCHAR, this, ""); - - /** - * The column information_schema.table_constraints.table_catalog. - */ - public final TableField TABLE_CATALOG = createField(DSL.name("table_catalog"), SQLDataType.VARCHAR, this, ""); - - /** - * The column information_schema.table_constraints.table_schema. - */ - public final TableField TABLE_SCHEMA = createField(DSL.name("table_schema"), SQLDataType.VARCHAR, this, ""); - - /** - * The column information_schema.table_constraints.table_name. - */ - public final TableField TABLE_NAME = createField(DSL.name("table_name"), SQLDataType.VARCHAR, this, ""); - - /** - * The column information_schema.table_constraints.constraint_type. - */ - public final TableField CONSTRAINT_TYPE = createField(DSL.name("constraint_type"), SQLDataType.VARCHAR, this, ""); - - /** - * The column information_schema.table_constraints.is_deferrable. - */ - public final TableField IS_DEFERRABLE = createField(DSL.name("is_deferrable"), SQLDataType.VARCHAR(3), this, ""); - - /** - * The column information_schema.table_constraints.initially_deferred. - */ - public final TableField INITIALLY_DEFERRED = createField(DSL.name("initially_deferred"), SQLDataType.VARCHAR(3), this, ""); - - /** - * The column information_schema.table_constraints.enforced. - */ - public final TableField ENFORCED = createField(DSL.name("enforced"), SQLDataType.VARCHAR(3), this, ""); - - private TableConstraints(Name alias, Table aliased) { - this(alias, aliased, null); - } - - private TableConstraints(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view()); - } - - /** - * Create an aliased information_schema.table_constraints table reference - */ - public TableConstraints(String alias) { - this(DSL.name(alias), TABLE_CONSTRAINTS); - } - - /** - * Create an aliased information_schema.table_constraints table reference - */ - public TableConstraints(Name alias) { - this(alias, TABLE_CONSTRAINTS); - } - - /** - * Create a information_schema.table_constraints table reference - */ - public TableConstraints() { - this(DSL.name("table_constraints"), null); - } - - public TableConstraints(Table child, ForeignKey key) { - super(child, key, TABLE_CONSTRAINTS); - } - - @Override - public Schema getSchema() { - return InformationSchema.INFORMATION_SCHEMA; - } - - @Override - public UniqueKey getPrimaryKey() { - return Keys.SYNTHETIC_PK_TABLE_CONSTRAINTS; - } - - @Override - public List> getKeys() { - return Arrays.>asList(Keys.SYNTHETIC_PK_TABLE_CONSTRAINTS); - } - - @Override - public TableConstraints as(String alias) { - return new TableConstraints(DSL.name(alias), this); - } - - @Override - public TableConstraints as(Name alias) { - return new TableConstraints(alias, this); - } - - /** - * Rename this table - */ - @Override - public TableConstraints rename(String name) { - return new TableConstraints(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public TableConstraints rename(Name name) { - return new TableConstraints(name, null); - } -} diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Tables.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Tables.java index 7866566007..f99a8c8614 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Tables.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Tables.java @@ -29,7 +29,7 @@ import org.jooq.meta.postgres.information_schema.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables extends TableImpl { - private static final long serialVersionUID = 1135725221; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.tables diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Views.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Views.java index 42f9d40395..521ea9f87b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Views.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/information_schema/tables/Views.java @@ -28,7 +28,7 @@ import org.jooq.meta.postgres.information_schema.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Views extends TableImpl { - private static final long serialVersionUID = 937684986; + private static final long serialVersionUID = 1L; /** * The reference instance of information_schema.views diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/DefaultCatalog.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/DefaultCatalog.java index 620bf1cbe6..d3ff60ba22 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/DefaultCatalog.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/DefaultCatalog.java @@ -17,7 +17,7 @@ import org.jooq.impl.CatalogImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = 2096040957; + private static final long serialVersionUID = 1L; /** * The reference instance of DEFAULT_CATALOG 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 fbefeaacde..39f49ad065 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 @@ -38,8 +38,9 @@ public class Keys { // ------------------------------------------------------------------------- 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); - public static final ForeignKey PG_ENUM__REFERENCING_CONSTRAINT = Internal.createForeignKey(PgEnum.PG_ENUM, DSL.name("REFERENCING_CONSTRAINT"), new TableField[] { PgEnum.PG_ENUM.ENUMTYPID }, Keys.SYNTHETIC_PK_PG_TYPE, new TableField[] { PgType.PG_TYPE.OID }, true); + public static final ForeignKey PG_ENUM__SYNTHETIC_FK_PG_ENUM__SYNTHETIC_PK_PG_TYPE = Internal.createForeignKey(PgEnum.PG_ENUM, DSL.name("SYNTHETIC_FK_pg_enum__SYNTHETIC_PK_pg_type"), new TableField[] { PgEnum.PG_ENUM.ENUMTYPID }, Keys.SYNTHETIC_PK_PG_TYPE, new TableField[] { PgType.PG_TYPE.OID }, true); public static final ForeignKey PG_INDEX__INDEX_CLASS = Internal.createForeignKey(PgIndex.PG_INDEX, DSL.name("INDEX_CLASS"), new TableField[] { PgIndex.PG_INDEX.INDEXRELID }, Keys.SYNTHETIC_PK_PG_CLASS, new TableField[] { PgClass.PG_CLASS.OID }, true); public static final ForeignKey PG_INDEX__TABLE_CLASS = Internal.createForeignKey(PgIndex.PG_INDEX, DSL.name("TABLE_CLASS"), new TableField[] { PgIndex.PG_INDEX.INDRELID }, Keys.SYNTHETIC_PK_PG_CLASS, new TableField[] { PgClass.PG_CLASS.OID }, true); public static final ForeignKey PG_TYPE__SYNTHETIC_FK_PG_TYPE__SYNTHETIC_PK_PG_NAMESPACE = Internal.createForeignKey(PgType.PG_TYPE, DSL.name("SYNTHETIC_FK_pg_type__SYNTHETIC_PK_pg_namespace"), new TableField[] { PgType.PG_TYPE.TYPNAMESPACE }, 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/PgCatalog.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/PgCatalog.java index 0c2c516758..8b2218144e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/PgCatalog.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/PgCatalog.java @@ -31,7 +31,7 @@ import org.jooq.meta.postgres.pg_catalog.tables.PgType; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgCatalog extends SchemaImpl { - private static final long serialVersionUID = 1085930158; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/Count1.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/Count1.java index 89687a357e..24df6ba23e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/Count1.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/Count1.java @@ -18,7 +18,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Count1 extends AbstractRoutine { - private static final long serialVersionUID = 1466800425; + private static final long serialVersionUID = 1L; /** * The parameter pg_catalog.count.RETURN_VALUE. diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/Count2.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/Count2.java index c8cf8374eb..aeaf73347a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/Count2.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/Count2.java @@ -17,7 +17,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Count2 extends AbstractRoutine { - private static final long serialVersionUID = -693114807; + private static final long serialVersionUID = 1L; /** * The parameter pg_catalog.count.RETURN_VALUE. diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/FormatType.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/FormatType.java index 0e3078f68b..09f7f00b48 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/FormatType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/routines/FormatType.java @@ -18,7 +18,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class FormatType extends AbstractRoutine { - private static final long serialVersionUID = 1896410112; + private static final long serialVersionUID = 1L; /** * The parameter pg_catalog.format_type.RETURN_VALUE. 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 b864e282a4..e368fdc5ff 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 @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgAttrdef extends TableImpl { - private static final long serialVersionUID = 430142938; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_attrdef 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 e67f8b55c6..e782f68189 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 @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgAttribute extends TableImpl { - private static final long serialVersionUID = 672275510; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_attribute 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 81596e2e28..5b9692ee70 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 @@ -29,7 +29,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgClass extends TableImpl { - private static final long serialVersionUID = -218505687; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_class diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgCollation.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgCollation.java index 7a985cc2c6..7974861b49 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgCollation.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgCollation.java @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgCollation extends TableImpl { - private static final long serialVersionUID = -1853827620; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_collation 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 6a38bbd8f2..5205f25d7d 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 @@ -28,7 +28,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgConstraint extends TableImpl { - private static final long serialVersionUID = 404160814; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_constraint @@ -209,13 +209,17 @@ public class PgConstraint extends TableImpl { @Override public List> getReferences() { - return Arrays.>asList(Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_NAMESPACE); + 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); } public PgNamespace pgNamespace() { return new PgNamespace(this, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_NAMESPACE); } + public PgClass pgClass() { + return new PgClass(this, Keys.PG_CONSTRAINT__SYNTHETIC_FK_PG_CONSTRAINT__SYNTHETIC_PK_PG_CLASS); + } + @Override public PgConstraint as(String alias) { return new PgConstraint(DSL.name(alias), this); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgDescription.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgDescription.java index a45a36249b..f6b76ad4f9 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgDescription.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgDescription.java @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgDescription extends TableImpl { - private static final long serialVersionUID = -1984292078; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_description 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 014029e435..86528caa36 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 @@ -28,7 +28,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgEnum extends TableImpl { - private static final long serialVersionUID = -1870532870; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_enum @@ -103,11 +103,11 @@ public class PgEnum extends TableImpl { @Override public List> getReferences() { - return Arrays.>asList(Keys.PG_ENUM__REFERENCING_CONSTRAINT); + return Arrays.>asList(Keys.PG_ENUM__SYNTHETIC_FK_PG_ENUM__SYNTHETIC_PK_PG_TYPE); } public PgType pgType() { - return new PgType(this, Keys.PG_ENUM__REFERENCING_CONSTRAINT); + return new PgType(this, Keys.PG_ENUM__SYNTHETIC_FK_PG_ENUM__SYNTHETIC_PK_PG_TYPE); } @Override 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 86a394d8ec..431e886cde 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 @@ -28,7 +28,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgIndex extends TableImpl { - private static final long serialVersionUID = 1715995978; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_index diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgInherits.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgInherits.java index a18e490867..b924820859 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgInherits.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/pg_catalog/tables/PgInherits.java @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgInherits extends TableImpl { - private static final long serialVersionUID = 978457723; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_inherits 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 e63816ff4a..df1ecf396c 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 @@ -29,7 +29,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgNamespace extends TableImpl { - private static final long serialVersionUID = -1114033554; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_namespace 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 6f891924da..9d993238d6 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 @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgProc extends TableImpl { - private static final long serialVersionUID = -1945177977; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_proc 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 605fc410cd..0f45d11fcd 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 @@ -24,7 +24,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgSequence extends TableImpl { - private static final long serialVersionUID = -1398651846; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_sequence 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 7ad177b469..88fe2e2dbc 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 @@ -29,7 +29,7 @@ import org.jooq.meta.postgres.pg_catalog.PgCatalog; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgType extends TableImpl { - private static final long serialVersionUID = -1116590481; + private static final long serialVersionUID = 1L; /** * The reference instance of pg_catalog.pg_type diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaSQL.java b/jOOQ/src/main/java/org/jooq/impl/MetaSQL.java index b575bcf060..7af1b20d45 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaSQL.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaSQL.java @@ -18,7 +18,7 @@ final class MetaSQL { M_UNIQUE_KEYS.put(HSQLDB, "select INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_CATALOG, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.COLUMN_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.ORDINAL_POSITION from (INFORMATION_SCHEMA.KEY_COLUMN_USAGE left outer join INFORMATION_SCHEMA.TABLE_CONSTRAINTS as alias_10316587 on (INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_CATALOG = alias_10316587.CONSTRAINT_CATALOG and INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_SCHEMA = alias_10316587.CONSTRAINT_SCHEMA and INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME = alias_10316587.CONSTRAINT_NAME)) where (alias_10316587.CONSTRAINT_TYPE = 'UNIQUE' and alias_10316587.TABLE_SCHEMA in (cast(? as varchar(128)))) order by INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA asc, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_NAME asc, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME asc, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.ORDINAL_POSITION asc"); M_UNIQUE_KEYS.put(MARIADB, "select distinct null as TABLE_CATALOG, information_schema.STATISTICS.TABLE_SCHEMA, information_schema.STATISTICS.TABLE_NAME, information_schema.STATISTICS.INDEX_NAME, information_schema.STATISTICS.COLUMN_NAME, information_schema.STATISTICS.SEQ_IN_INDEX from information_schema.STATISTICS where (information_schema.STATISTICS.TABLE_SCHEMA in (?, 'ee7f6174-34f2-484b-8d81-20a4d9fc866d') and information_schema.STATISTICS.INDEX_NAME <> 'PRIMARY' and information_schema.STATISTICS.NON_UNIQUE = 0) order by information_schema.STATISTICS.TABLE_SCHEMA, information_schema.STATISTICS.TABLE_NAME, information_schema.STATISTICS.INDEX_NAME, information_schema.STATISTICS.SEQ_IN_INDEX"); M_UNIQUE_KEYS.put(MYSQL, "select distinct null as TABLE_CATALOG, information_schema.STATISTICS.TABLE_SCHEMA, information_schema.STATISTICS.TABLE_NAME, information_schema.STATISTICS.INDEX_NAME, information_schema.STATISTICS.COLUMN_NAME, information_schema.STATISTICS.SEQ_IN_INDEX from information_schema.STATISTICS where (information_schema.STATISTICS.TABLE_SCHEMA in (?, 'ee7f6174-34f2-484b-8d81-20a4d9fc866d') and information_schema.STATISTICS.INDEX_NAME <> 'PRIMARY' and information_schema.STATISTICS.NON_UNIQUE = 0) order by information_schema.STATISTICS.TABLE_SCHEMA, information_schema.STATISTICS.TABLE_NAME, information_schema.STATISTICS.INDEX_NAME, information_schema.STATISTICS.SEQ_IN_INDEX"); - M_UNIQUE_KEYS.put(POSTGRES, "select information_schema.key_column_usage.table_catalog, information_schema.key_column_usage.table_schema, information_schema.key_column_usage.table_name, information_schema.key_column_usage.constraint_name, information_schema.key_column_usage.column_name, information_schema.key_column_usage.ordinal_position from (information_schema.key_column_usage left outer join information_schema.table_constraints as alias_99043051 on (information_schema.key_column_usage.constraint_catalog = alias_99043051.constraint_catalog and information_schema.key_column_usage.constraint_schema = alias_99043051.constraint_schema and information_schema.key_column_usage.constraint_name = alias_99043051.constraint_name)) where (alias_99043051.constraint_type = 'UNIQUE' and alias_99043051.table_schema in (?)) order by information_schema.key_column_usage.table_schema asc, information_schema.key_column_usage.table_name asc, information_schema.key_column_usage.constraint_name asc, information_schema.key_column_usage.ordinal_position asc"); + M_UNIQUE_KEYS.put(POSTGRES, "select k.table_catalog, k.table_schema, k.table_name, k.constraint_name, k.column_name, k.ordinal_position from (pg_catalog.pg_constraint as c join (pg_catalog.pg_class as alias_89552482 join pg_catalog.pg_namespace as alias_126892781 on alias_89552482.relnamespace = alias_126892781.oid) on c.conrelid = alias_89552482.oid join pg_catalog.pg_namespace as alias_87501535 on c.connamespace = alias_87501535.oid) join information_schema.key_column_usage as k on (k.table_schema = alias_126892781.nspname and k.table_name = alias_89552482.relname and k.constraint_schema = alias_87501535.nspname and k.constraint_name = c.conname) where (c.contype = 'u' and alias_87501535.nspname in (?)) order by k.table_schema asc, k.table_name asc, k.constraint_name asc, k.ordinal_position asc");