diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java index 39563d7230..d46fe83773 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java @@ -2979,8 +2979,8 @@ public class DefaultGenerator implements Generator { String typeClass = "org.jooq.util." + db.getDialect().getName().toLowerCase() + - "."+ - db.getDialect().getName()+ + "." + + db.getDialect().getName() + "DataType"; sb.append(typeClass); @@ -3007,14 +3007,14 @@ public class DefaultGenerator implements Generator { // Mostly because of unsupported data types catch (SQLDialectNotSupportedException e) { sb.append("getDefaultDataType(\""); - sb.append(t); + sb.append(t.replace("\"", "\\\"")); sb.append("\")"); } // More unsupported data types catch (ReflectException e) { sb.append("getDefaultDataType(\""); - sb.append(t); + sb.append(t.replace("\"", "\\\"")); sb.append("\")"); } } 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 c25fa727be..ab067c29cf 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.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public class PgCatalog extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -1216270135; + private static final long serialVersionUID = -371905234; /** * The singleton instance of pg_catalog 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 9eb63024bc..3092452956 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.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public class PgCatalogFactory extends org.jooq.util.postgres.PostgresFactory { - private static final long serialVersionUID = -2055956907; + private static final long serialVersionUID = 1626557035; /** * Create a factory with a connection @@ -19,6 +19,8 @@ public class PgCatalogFactory extends org.jooq.util.postgres.PostgresFactory { */ public PgCatalogFactory(java.sql.Connection connection) { super(connection); + + initDefaultSchema(); } /** @@ -29,5 +31,16 @@ public class PgCatalogFactory extends org.jooq.util.postgres.PostgresFactory { */ public PgCatalogFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) { super(connection, settings); + + initDefaultSchema(); + } + + /** + * Initialise the render mapping's default schema. + *

+ * For convenience, this schema-specific factory should override any pre-existing setting + */ + private final void initDefaultSchema() { + org.jooq.conf.SettingsTools.getRenderMapping(getSettings()).setDefaultSchema(org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG.getName()); } } 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 a597f02a48..0333948e65 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,10 +8,70 @@ 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.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public final class Routines { + /** + * Call pg_catalog.count + * + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + public static java.lang.Long count2(org.jooq.Configuration configuration) { + 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(); + } + + /** + * Call pg_catalog.count + * + * @param __1 + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + public static java.lang.Long count1(org.jooq.Configuration configuration, 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(); + } + + /** + * Get pg_catalog.count as a field + * + * @param __1 + */ + public static org.jooq.Field 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); + + return f.asField(); + } + + /** + * Get pg_catalog.count as a field + * + * @param __1 + */ + 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.format_type * 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 d25f0e2d49..b86e35a600 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.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public final class Tables { 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 new file mode 100644 index 0000000000..cb15379f61 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java @@ -0,0 +1,55 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.postgres.pg_catalog.routines; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, + comments = "This class is generated by jOOQ") +public class Count1 extends org.jooq.impl.AbstractRoutine { + + private static final long serialVersionUID = -772102665; + + + /** + * An uncommented item + */ + public static final org.jooq.Parameter RETURN_VALUE = createParameter("RETURN_VALUE", org.jooq.impl.SQLDataType.BIGINT); + + /** + * An uncommented item + * + * The SQL type of this item ("any", any) could not be mapped.
+ * Deserialising this field might not work! + */ + public static final org.jooq.Parameter _1 = createParameter("_1", org.jooq.util.postgres.PostgresDataType.getDefaultDataType("\"any\"")); + + /** + * Create a new routine call instance + */ + public Count1() { + super("count", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, org.jooq.impl.SQLDataType.BIGINT); + + setReturnParameter(RETURN_VALUE); + addInParameter(_1); + setOverloaded(true); + } + + /** + * Set the _1 parameter to the routine + */ + public void set__1(java.lang.Object value) { + setValue(_1, value); + } + + /** + * Set the _1 parameter to the function + *

+ * Use this method only, if the function is called as a {@link org.jooq.Field} in a {@link org.jooq.Select} statement! + */ + public void set__1(org.jooq.Field field) { + setField(_1, field); + } +} 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 new file mode 100644 index 0000000000..fe332b82c9 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java @@ -0,0 +1,30 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.postgres.pg_catalog.routines; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, + comments = "This class is generated by jOOQ") +public class Count2 extends org.jooq.impl.AbstractRoutine { + + private static final long serialVersionUID = 1180633735; + + + /** + * An uncommented item + */ + public static final org.jooq.Parameter RETURN_VALUE = createParameter("RETURN_VALUE", org.jooq.impl.SQLDataType.BIGINT); + + /** + * Create a new routine call instance + */ + public Count2() { + super("count", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, org.jooq.impl.SQLDataType.BIGINT); + + setReturnParameter(RETURN_VALUE); + setOverloaded(true); + } +} 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 41c0bd46a9..01da6d8573 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.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public class FormatType extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = -1197259008; + private static final long serialVersionUID = -1785499997; /** 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 9e7a5bbd10..b988f0089c 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,28 +6,23 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public class PgAttribute extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 2062334520; + private static final long serialVersionUID = -519027695; /** * The singleton instance of pg_catalog.pg_attribute */ public static final org.jooq.util.postgres.pg_catalog.tables.PgAttribute PG_ATTRIBUTE = new org.jooq.util.postgres.pg_catalog.tables.PgAttribute(); - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.Record.class; - /** * The class holding records for this type */ @Override public java.lang.Class getRecordType() { - return __RECORD_TYPE; + return org.jooq.Record.class; } /** @@ -125,17 +120,11 @@ public class PgAttribute extends org.jooq.impl.TableImpl { */ public final org.jooq.TableField ATTOPTIONS = createField("attoptions", org.jooq.impl.SQLDataType.CLOB.getArrayDataType(), this); - /** - * No further instances allowed - */ - private PgAttribute() { + public PgAttribute() { super("pg_attribute", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG); } - /** - * No further instances allowed - */ - private PgAttribute(java.lang.String alias) { + public PgAttribute(java.lang.String alias) { super(alias, org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, org.jooq.util.postgres.pg_catalog.tables.PgAttribute.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 c8167d9f2e..679ad5f868 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,28 +6,23 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public class PgClass extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 497846309; + private static final long serialVersionUID = -1753706892; /** * The singleton instance of pg_catalog.pg_class */ public static final org.jooq.util.postgres.pg_catalog.tables.PgClass PG_CLASS = new org.jooq.util.postgres.pg_catalog.tables.PgClass(); - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.Record.class; - /** * The class holding records for this type */ @Override public java.lang.Class getRecordType() { - return __RECORD_TYPE; + return org.jooq.Record.class; } /** @@ -165,17 +160,11 @@ public class PgClass extends org.jooq.impl.TableImpl { */ public final org.jooq.TableField RELOPTIONS = createField("reloptions", org.jooq.impl.SQLDataType.CLOB.getArrayDataType(), this); - /** - * No further instances allowed - */ - private PgClass() { + public PgClass() { super("pg_class", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG); } - /** - * No further instances allowed - */ - private PgClass(java.lang.String alias) { + public PgClass(java.lang.String alias) { super(alias, org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, org.jooq.util.postgres.pg_catalog.tables.PgClass.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 4481799e0b..1b84b74c5c 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,28 +6,23 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public class PgEnum extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1198881091; + private static final long serialVersionUID = 800254732; /** * The singleton instance of pg_catalog.pg_enum */ public static final org.jooq.util.postgres.pg_catalog.tables.PgEnum PG_ENUM = new org.jooq.util.postgres.pg_catalog.tables.PgEnum(); - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.Record.class; - /** * The class holding records for this type */ @Override public java.lang.Class getRecordType() { - return __RECORD_TYPE; + return org.jooq.Record.class; } /** @@ -40,17 +35,11 @@ public class PgEnum extends org.jooq.impl.TableImpl { */ public final org.jooq.TableField ENUMLABEL = createField("enumlabel", org.jooq.impl.SQLDataType.VARCHAR, this); - /** - * No further instances allowed - */ - private PgEnum() { + public PgEnum() { super("pg_enum", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG); } - /** - * No further instances allowed - */ - private PgEnum(java.lang.String alias) { + public PgEnum(java.lang.String alias) { super(alias, org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, org.jooq.util.postgres.pg_catalog.tables.PgEnum.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 index 62ea7dea18..d90e9e5e90 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,28 +6,23 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public class PgNamespace extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -1774545004; + private static final long serialVersionUID = -1769943747; /** * The singleton instance of pg_catalog.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.Record.class; - /** * The class holding records for this type */ @Override public java.lang.Class getRecordType() { - return __RECORD_TYPE; + return org.jooq.Record.class; } /** @@ -45,17 +40,11 @@ public class PgNamespace extends org.jooq.impl.TableImpl { */ public final org.jooq.TableField NSPACL = createField("nspacl", org.jooq.impl.SQLDataType.VARCHAR.getArrayDataType(), this); - /** - * No further instances allowed - */ - private PgNamespace() { + public PgNamespace() { super("pg_namespace", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG); } - /** - * No further instances allowed - */ - private PgNamespace(java.lang.String alias) { + public 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); } 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 b84a6728e5..362e8fb7f0 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,28 +6,23 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public class PgProc extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1574331687; + private static final long serialVersionUID = 26734556; /** * The singleton instance of pg_catalog.pg_proc */ public static final org.jooq.util.postgres.pg_catalog.tables.PgProc PG_PROC = new org.jooq.util.postgres.pg_catalog.tables.PgProc(); - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.Record.class; - /** * The class holding records for this type */ @Override public java.lang.Class getRecordType() { - return __RECORD_TYPE; + return org.jooq.Record.class; } /** @@ -155,17 +150,11 @@ public class PgProc extends org.jooq.impl.TableImpl { */ public final org.jooq.TableField PROACL = createField("proacl", org.jooq.impl.SQLDataType.VARCHAR.getArrayDataType(), this); - /** - * No further instances allowed - */ - private PgProc() { + public PgProc() { super("pg_proc", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG); } - /** - * No further instances allowed - */ - private PgProc(java.lang.String alias) { + public PgProc(java.lang.String alias) { super(alias, org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, org.jooq.util.postgres.pg_catalog.tables.PgProc.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 e164cc2b67..093d728caf 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,28 +6,23 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.6"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, comments = "This class is generated by jOOQ") public class PgType extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 867629277; + private static final long serialVersionUID = 1130750896; /** * The singleton instance of pg_catalog.pg_type */ public static final org.jooq.util.postgres.pg_catalog.tables.PgType PG_TYPE = new org.jooq.util.postgres.pg_catalog.tables.PgType(); - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.Record.class; - /** * The class holding records for this type */ @Override public java.lang.Class getRecordType() { - return __RECORD_TYPE; + return org.jooq.Record.class; } /** @@ -170,17 +165,11 @@ public class PgType extends org.jooq.impl.TableImpl { */ public final org.jooq.TableField TYPDEFAULT = createField("typdefault", org.jooq.impl.SQLDataType.CLOB, this); - /** - * No further instances allowed - */ - private PgType() { + public PgType() { super("pg_type", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG); } - /** - * No further instances allowed - */ - private PgType(java.lang.String alias) { + public PgType(java.lang.String alias) { super(alias, org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG, org.jooq.util.postgres.pg_catalog.tables.PgType.PG_TYPE); } diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/pg_catalog.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/pg_catalog.properties index fc2412ba05..f4ebfc7b95 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/pg_catalog.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/pg_catalog.properties @@ -7,7 +7,7 @@ jdbc.Password=test generator=org.jooq.util.DefaultGenerator generator.database=org.jooq.util.postgres.PostgresDatabase -generator.database.includes=pg_namespace,pg_enum,pg_type,pg_class,pg_attribute,pg_proc,format_type +generator.database.includes=pg_namespace,pg_enum,pg_type,pg_class,pg_attribute,pg_proc,format_type,count generator.database.excludes= generator.generate.deprecated=false generator.generate.instance-fields=true