diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java index 03a5439de0..86e8762d68 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java @@ -61,6 +61,7 @@ import static org.jooq.util.postgres.information_schema.Tables.SEQUENCES; import static org.jooq.util.postgres.information_schema.Tables.TABLES; import static org.jooq.util.postgres.information_schema.Tables.TABLE_CONSTRAINTS; import static org.jooq.util.postgres.pg_catalog.Tables.PG_CLASS; +import static org.jooq.util.postgres.pg_catalog.Tables.PG_DESCRIPTION; import static org.jooq.util.postgres.pg_catalog.Tables.PG_ENUM; import static org.jooq.util.postgres.pg_catalog.Tables.PG_INHERITS; import static org.jooq.util.postgres.pg_catalog.Tables.PG_NAMESPACE; @@ -253,8 +254,17 @@ public class PostgresDatabase extends AbstractDatabase { TABLES.TABLE_SCHEMA, TABLES.TABLE_NAME, TABLES.TABLE_NAME.as("specific_name"), - inline(false).as("table_valued_function")) + inline(false).as("table_valued_function"), + PG_DESCRIPTION.DESCRIPTION) .from(TABLES) + .join(PG_NAMESPACE) + .on(TABLES.TABLE_SCHEMA.eq(PG_NAMESPACE.NSPNAME)) + .join(PG_CLASS) + .on(PG_CLASS.RELNAME.eq(TABLES.TABLE_NAME)) + .and(PG_CLASS.RELNAMESPACE.eq(oid(PG_NAMESPACE))) + .leftOuterJoin(PG_DESCRIPTION) + .on(PG_DESCRIPTION.OBJOID.eq(oid(PG_CLASS))) + .and(PG_DESCRIPTION.OBJSUBID.eq(0)) .where(TABLES.TABLE_SCHEMA.in(getInputSchemata())) // [#3375] Include table-valued functions in the set of tables @@ -263,7 +273,8 @@ public class PostgresDatabase extends AbstractDatabase { ROUTINES.ROUTINE_SCHEMA, ROUTINES.ROUTINE_NAME, ROUTINES.SPECIFIC_NAME, - inline(true).as("table_valued_function")) + inline(true).as("table_valued_function"), + inline("")) .from(ROUTINES) .join(PG_NAMESPACE).on(ROUTINES.SPECIFIC_SCHEMA.eq(PG_NAMESPACE.NSPNAME)) .join(PG_PROC).on(PG_PROC.PRONAMESPACE.eq(oid(PG_NAMESPACE))) @@ -277,7 +288,7 @@ public class PostgresDatabase extends AbstractDatabase { SchemaDefinition schema = getSchema(record.getValue(TABLES.TABLE_SCHEMA)); String name = record.getValue(TABLES.TABLE_NAME); boolean tableValuedFunction = record.getValue("table_valued_function", boolean.class); - String comment = ""; + String comment = record.getValue(PG_DESCRIPTION.DESCRIPTION, String.class); if (tableValuedFunction) { result.add(new PostgresTableValuedFunction(schema, name, record.getValue(ROUTINES.SPECIFIC_NAME), comment)); diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresTableDefinition.java index 96a8cc76b4..4d8744ca5c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresTableDefinition.java @@ -42,7 +42,11 @@ package org.jooq.util.postgres; import static org.jooq.tools.StringUtils.defaultString; +import static org.jooq.util.postgres.PostgresDSL.oid; import static org.jooq.util.postgres.information_schema.Tables.COLUMNS; +import static org.jooq.util.postgres.pg_catalog.Tables.PG_CLASS; +import static org.jooq.util.postgres.pg_catalog.Tables.PG_DESCRIPTION; +import static org.jooq.util.postgres.pg_catalog.Tables.PG_NAMESPACE; import java.sql.SQLException; import java.util.ArrayList; @@ -78,8 +82,17 @@ public class PostgresTableDefinition extends AbstractTableDefinition { COLUMNS.NUMERIC_SCALE, COLUMNS.IS_NULLABLE, COLUMNS.COLUMN_DEFAULT, - COLUMNS.UDT_NAME) + COLUMNS.UDT_NAME, + PG_DESCRIPTION.DESCRIPTION) .from(COLUMNS) + .join(PG_NAMESPACE) + .on(COLUMNS.TABLE_SCHEMA.eq(PG_NAMESPACE.NSPNAME)) + .join(PG_CLASS) + .on(PG_CLASS.RELNAME.eq(COLUMNS.TABLE_NAME)) + .and(PG_CLASS.RELNAMESPACE.eq(oid(PG_NAMESPACE))) + .leftOuterJoin(PG_DESCRIPTION) + .on(PG_DESCRIPTION.OBJOID.eq(oid(PG_CLASS))) + .and(PG_DESCRIPTION.OBJSUBID.eq(COLUMNS.ORDINAL_POSITION)) .where(COLUMNS.TABLE_SCHEMA.equal(getSchema().getName())) .and(COLUMNS.TABLE_NAME.equal(getName())) .orderBy(COLUMNS.ORDINAL_POSITION) @@ -103,7 +116,7 @@ public class PostgresTableDefinition extends AbstractTableDefinition { record.getValue(COLUMNS.ORDINAL_POSITION, int.class), type, defaultString(record.getValue(COLUMNS.COLUMN_DEFAULT)).startsWith("nextval"), - null + record.getValue(PG_DESCRIPTION.DESCRIPTION) ); result.add(column); 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 59524643ea..42c6019858 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,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgCatalog extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 1879929305; + private static final long serialVersionUID = -547042235; /** * The singleton instance of pg_catalog @@ -36,6 +36,8 @@ public class PgCatalog extends org.jooq.impl.SchemaImpl { return java.util.Arrays.>asList( 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.PgCursor.PG_CURSOR, + org.jooq.util.postgres.pg_catalog.tables.PgDescription.PG_DESCRIPTION, org.jooq.util.postgres.pg_catalog.tables.PgEnum.PG_ENUM, org.jooq.util.postgres.pg_catalog.tables.PgInherits.PG_INHERITS, org.jooq.util.postgres.pg_catalog.tables.PgNamespace.PG_NAMESPACE, 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 7f18d3e7d9..b90f23cc96 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,59 +8,38 @@ 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", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Routines { /** - * Call pg_catalog.count + * Get pg_catalog.count as a field */ - public static java.lang.Long count1(org.jooq.Configuration configuration, java.lang.Object __1) { + public static org.jooq.AggregateFunction count1(java.lang.Object __1) { org.jooq.util.postgres.pg_catalog.routines.Count1 f = new org.jooq.util.postgres.pg_catalog.routines.Count1(); f.set__1(__1); - f.execute(configuration); - return f.getReturnValue(); + return f.asAggregateFunction(); } /** * Get pg_catalog.count as a field */ - public static org.jooq.Field count1(java.lang.Object __1) { + public static org.jooq.AggregateFunction count1(org.jooq.Field __1) { org.jooq.util.postgres.pg_catalog.routines.Count1 f = new org.jooq.util.postgres.pg_catalog.routines.Count1(); f.set__1(__1); - return f.asField(); + return f.asAggregateFunction(); } /** * Get pg_catalog.count as a field */ - public static org.jooq.Field count1(org.jooq.Field __1) { - org.jooq.util.postgres.pg_catalog.routines.Count1 f = new org.jooq.util.postgres.pg_catalog.routines.Count1(); - f.set__1(__1); - - return f.asField(); - } - - /** - * Call pg_catalog.count - */ - public static java.lang.Long count2(org.jooq.Configuration configuration) { + public static org.jooq.AggregateFunction count2() { org.jooq.util.postgres.pg_catalog.routines.Count2 f = new org.jooq.util.postgres.pg_catalog.routines.Count2(); - f.execute(configuration); - return f.getReturnValue(); - } - - /** - * Get pg_catalog.count as a field - */ - public static org.jooq.Field count2() { - org.jooq.util.postgres.pg_catalog.routines.Count2 f = new org.jooq.util.postgres.pg_catalog.routines.Count2(); - - return f.asField(); + return f.asAggregateFunction(); } /** @@ -98,12 +77,9 @@ public class Routines { } /** - * Call pg_catalog.pg_cursor + * Get pg_catalog.pg_cursor as a field */ - public static org.jooq.util.postgres.pg_catalog.routines.PgCursor pgCursor(org.jooq.Configuration configuration) { - org.jooq.util.postgres.pg_catalog.routines.PgCursor p = new org.jooq.util.postgres.pg_catalog.routines.PgCursor(); - - p.execute(configuration); - return p; + public static org.jooq.util.postgres.pg_catalog.tables.PgCursor pgCursor() { + return org.jooq.util.postgres.pg_catalog.tables.PgCursor.PG_CURSOR.call(); } } 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 e5debb84d9..75bd69f0b6 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", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { @@ -23,6 +23,16 @@ public class Tables { */ public static final org.jooq.util.postgres.pg_catalog.tables.PgClass PG_CLASS = org.jooq.util.postgres.pg_catalog.tables.PgClass.PG_CLASS; + /** + * The table pg_catalog.pg_cursor + */ + public static final org.jooq.util.postgres.pg_catalog.tables.PgCursor PG_CURSOR = org.jooq.util.postgres.pg_catalog.tables.PgCursor.PG_CURSOR; + + /** + * The table pg_catalog.pg_description + */ + public static final org.jooq.util.postgres.pg_catalog.tables.PgDescription PG_DESCRIPTION = org.jooq.util.postgres.pg_catalog.tables.PgDescription.PG_DESCRIPTION; + /** * The table pg_catalog.pg_enum */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java index 732e097326..e183ae5b53 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java @@ -6,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.routines; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Count1 extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = 1836057659; + private static final long serialVersionUID = 208079261; /** * The parameter pg_catalog.count.RETURN_VALUE. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java index 67766dce9b..35c7a4e60f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java @@ -6,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.routines; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Count2 extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = -547864034; + private static final long serialVersionUID = -1317511552; /** * The parameter pg_catalog.count.RETURN_VALUE. 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 ef805223bd..cca086ae9e 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,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.routines; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class FormatType extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = 1736331958; + private static final long serialVersionUID = -763218796; /** * The parameter pg_catalog.format_type.RETURN_VALUE. 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 26875379b7..79a5d79979 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,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgAttribute extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1552103127; + private static final long serialVersionUID = 622630497; /** * The singleton instance of pg_catalog.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 19cf343bb8..1c79b37d40 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,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgClass extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -1433095935; + private static final long serialVersionUID = -554390261; /** * The singleton instance of pg_catalog.pg_class diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgCursor.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgCursor.java new file mode 100644 index 0000000000..11dcec24a3 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgCursor.java @@ -0,0 +1,102 @@ +/** + * 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", "jOOQ version:3.5.0" }, + comments = "This class is generated by jOOQ") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class PgCursor extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = 1972650578; + + /** + * The singleton instance of pg_catalog.pg_cursor + */ + public static final org.jooq.util.postgres.pg_catalog.tables.PgCursor PG_CURSOR = new org.jooq.util.postgres.pg_catalog.tables.PgCursor(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return org.jooq.Record.class; + } + + /** + * The column pg_catalog.pg_cursor.name. + */ + public final org.jooq.TableField NAME = createField("name", org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column pg_catalog.pg_cursor.statement. + */ + public final org.jooq.TableField STATEMENT = createField("statement", org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column pg_catalog.pg_cursor.is_holdable. + */ + public final org.jooq.TableField IS_HOLDABLE = createField("is_holdable", org.jooq.impl.SQLDataType.BOOLEAN, this, ""); + + /** + * The column pg_catalog.pg_cursor.is_binary. + */ + public final org.jooq.TableField IS_BINARY = createField("is_binary", org.jooq.impl.SQLDataType.BOOLEAN, this, ""); + + /** + * The column pg_catalog.pg_cursor.is_scrollable. + */ + public final org.jooq.TableField IS_SCROLLABLE = createField("is_scrollable", org.jooq.impl.SQLDataType.BOOLEAN, this, ""); + + /** + * The column pg_catalog.pg_cursor.creation_time. + */ + public final org.jooq.TableField CREATION_TIME = createField("creation_time", org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); + + /** + * Create a pg_catalog.pg_cursor table reference + */ + public PgCursor() { + this("pg_cursor", null); + } + + /** + * Create an aliased pg_catalog.pg_cursor table reference + */ + public PgCursor(java.lang.String alias) { + this(alias, org.jooq.util.postgres.pg_catalog.tables.PgCursor.PG_CURSOR); + } + + private PgCursor(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private PgCursor(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field[] parameters) { + super(alias, org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.util.postgres.pg_catalog.tables.PgCursor as(java.lang.String alias) { + return new org.jooq.util.postgres.pg_catalog.tables.PgCursor(alias, this, parameters); + } + + /** + * Rename this table + */ + public org.jooq.util.postgres.pg_catalog.tables.PgCursor rename(java.lang.String name) { + return new org.jooq.util.postgres.pg_catalog.tables.PgCursor(name, null, parameters); + } + + /** + * Call this table-valued function + */ + public org.jooq.util.postgres.pg_catalog.tables.PgCursor call() { + return new org.jooq.util.postgres.pg_catalog.tables.PgCursor(getName(), null, new org.jooq.Field[] { }); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgDescription.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgDescription.java new file mode 100644 index 0000000000..a53f1d6447 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgDescription.java @@ -0,0 +1,85 @@ +/** + * 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", "jOOQ version:3.5.0" }, + comments = "This class is generated by jOOQ") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class PgDescription extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = -1078340299; + + /** + * The singleton instance of pg_catalog.pg_description + */ + public static final org.jooq.util.postgres.pg_catalog.tables.PgDescription PG_DESCRIPTION = new org.jooq.util.postgres.pg_catalog.tables.PgDescription(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return org.jooq.Record.class; + } + + /** + * The column pg_catalog.pg_description.objoid. + */ + public final org.jooq.TableField OBJOID = createField("objoid", org.jooq.impl.SQLDataType.BIGINT.nullable(false), this, ""); + + /** + * The column pg_catalog.pg_description.classoid. + */ + public final org.jooq.TableField CLASSOID = createField("classoid", org.jooq.impl.SQLDataType.BIGINT.nullable(false), this, ""); + + /** + * The column pg_catalog.pg_description.objsubid. + */ + public final org.jooq.TableField OBJSUBID = createField("objsubid", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column pg_catalog.pg_description.description. + */ + public final org.jooq.TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * Create a pg_catalog.pg_description table reference + */ + public PgDescription() { + this("pg_description", null); + } + + /** + * Create an aliased pg_catalog.pg_description table reference + */ + public PgDescription(java.lang.String alias) { + this(alias, org.jooq.util.postgres.pg_catalog.tables.PgDescription.PG_DESCRIPTION); + } + + private PgDescription(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private PgDescription(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field[] parameters) { + super(alias, org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.util.postgres.pg_catalog.tables.PgDescription as(java.lang.String alias) { + return new org.jooq.util.postgres.pg_catalog.tables.PgDescription(alias, this); + } + + /** + * Rename this table + */ + public org.jooq.util.postgres.pg_catalog.tables.PgDescription rename(java.lang.String name) { + return new org.jooq.util.postgres.pg_catalog.tables.PgDescription(name, null); + } +} 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 69914a8c62..5e7899e52b 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,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgEnum extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 207772735; + private static final long serialVersionUID = 1493557577; /** * The singleton instance of pg_catalog.pg_enum diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgInherits.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgInherits.java index 26d19d0afd..71d6971427 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgInherits.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgInherits.java @@ -6,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgInherits extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 99292399; + private static final long serialVersionUID = 2110502137; /** * The singleton instance of pg_catalog.pg_inherits 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 index 9026ccdad6..35f5b49cfe 100644 --- 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 @@ -6,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgNamespace extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -393640334; + private static final long serialVersionUID = -238235012; /** * The singleton instance of pg_catalog.pg_namespace 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 256336331c..10ddd6803f 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,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgProc extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -610308514; + private static final long serialVersionUID = -2023687916; /** * The singleton instance of pg_catalog.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 6a7bc0936a..c545ea0ed5 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,12 +6,12 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, +@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PgType extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -526211898; + private static final long serialVersionUID = 1535427324; /** * The singleton instance of pg_catalog.pg_type diff --git a/jOOQ-test/pom.xml b/jOOQ-test/pom.xml index d56080e81a..8fff2c0687 100644 --- a/jOOQ-test/pom.xml +++ b/jOOQ-test/pom.xml @@ -3058,7 +3058,7 @@ org.jooq.util.DefaultGenerator org.jooq.util.postgres.PostgresDatabase - pg_attribute|pg_class|pg_cursor|pg_enum|pg_inherits|pg_namespace|pg_proc|pg_type|format_type|count + pg_attribute|pg_class|pg_cursor|pg_description|pg_enum|pg_inherits|pg_namespace|pg_proc|pg_type|format_type|count