From aeb8765d1e085786e275753231b8d61fe3810ce6 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 9 May 2012 22:45:54 +0200 Subject: [PATCH 01/10] Release 2.3.1-SNAPSHOT --- jOOQ-codegen-maven-example/pom.xml | 6 +++--- jOOQ-codegen-maven/pom.xml | 4 ++-- jOOQ-codegen/pom.xml | 6 +++--- jOOQ-console/pom.xml | 4 ++-- jOOQ-meta/pom.xml | 4 ++-- jOOQ/pom.xml | 2 +- jOOQ/src/main/java/org/jooq/Constants.java | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jOOQ-codegen-maven-example/pom.xml b/jOOQ-codegen-maven-example/pom.xml index e876428bbc..e0931e4f97 100644 --- a/jOOQ-codegen-maven-example/pom.xml +++ b/jOOQ-codegen-maven-example/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-codegen-maven-example - 2.3.0 + 2.3.1-SNAPSHOT jar jOOQ Codegen Maven @@ -51,7 +51,7 @@ org.jooq jooq - 2.3.0 + 2.3.1-SNAPSHOT jar compile @@ -106,7 +106,7 @@ org.jooq jooq-codegen-maven - 2.3.0 + 2.3.1-SNAPSHOT exec1 diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml index 55b100a06a..831d815807 100644 --- a/jOOQ-codegen-maven/pom.xml +++ b/jOOQ-codegen-maven/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-codegen-maven - 2.3.0 + 2.3.1-SNAPSHOT maven-plugin jOOQ Codegen Maven @@ -160,7 +160,7 @@ org.jooq jooq-codegen - 2.3.0 + 2.3.1-SNAPSHOT jar diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml index e37b793b8c..617ae04bb6 100644 --- a/jOOQ-codegen/pom.xml +++ b/jOOQ-codegen/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq-codegen - 2.3.0 + 2.3.1-SNAPSHOT jar jOOQ Codegen @@ -150,14 +150,14 @@ org.jooq jooq - 2.3.0 + 2.3.1-SNAPSHOT jar compile org.jooq jooq-meta - 2.3.0 + 2.3.1-SNAPSHOT jar compile diff --git a/jOOQ-console/pom.xml b/jOOQ-console/pom.xml index a5bc670e77..8a9174a651 100644 --- a/jOOQ-console/pom.xml +++ b/jOOQ-console/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq-console - 2.3.0 + 2.3.1-SNAPSHOT jar jOOQ @@ -201,7 +201,7 @@ org.jooq jooq - 2.3.0 + 2.3.1-SNAPSHOT jar compile diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index 348f64f3e3..e7007492ae 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-meta - 2.3.0 + 2.3.1-SNAPSHOT jar jOOQ Meta @@ -198,7 +198,7 @@ org.jooq jooq - 2.3.0 + 2.3.1-SNAPSHOT jar compile diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index f0120a22cd..63f3673e6c 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq - 2.3.0 + 2.3.1-SNAPSHOT jar jOOQ diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index d254ecbd5c..070a518bbc 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -45,7 +45,7 @@ public final class Constants { /** * The latest jOOQ version */ - public static final String VERSION = "2.3.0"; + public static final String VERSION = "2.3.1-SNAPSHOT"; /** * No further instances From 74205afc532320ee9ef2de36d980305659e88e27 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 10 May 2012 18:46:20 +0200 Subject: [PATCH 02/10] [#1407] Compilation errors in generated source code when Postgres data-type is "any" (with quotes!) --- .../java/org/jooq/util/DefaultGenerator.java | 8 +-- .../util/postgres/pg_catalog/PgCatalog.java | 4 +- .../postgres/pg_catalog/PgCatalogFactory.java | 17 ++++- .../util/postgres/pg_catalog/Routines.java | 62 ++++++++++++++++++- .../jooq/util/postgres/pg_catalog/Tables.java | 2 +- .../postgres/pg_catalog/routines/Count1.java | 55 ++++++++++++++++ .../postgres/pg_catalog/routines/Count2.java | 30 +++++++++ .../pg_catalog/routines/FormatType.java | 4 +- .../pg_catalog/tables/PgAttribute.java | 21 ++----- .../postgres/pg_catalog/tables/PgClass.java | 21 ++----- .../postgres/pg_catalog/tables/PgEnum.java | 21 ++----- .../pg_catalog/tables/PgNamespace.java | 21 ++----- .../postgres/pg_catalog/tables/PgProc.java | 21 ++----- .../postgres/pg_catalog/tables/PgType.java | 21 ++----- .../lukas/postgres/pg_catalog.properties | 2 +- 15 files changed, 201 insertions(+), 109 deletions(-) create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java 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 From 7d7aa5049d3c15b12527c1fcdf364f837943d56a Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 10 May 2012 18:54:22 +0200 Subject: [PATCH 03/10] [#1406] Compilation errors in generated source code when Postgres stored procedure parameter is called "NAME" --- .../jooq/util/GeneratorStrategyWrapper.java | 6 ++ .../util/postgres/pg_catalog/Routines.java | 18 ++++ .../pg_catalog/routines/PgCursor.java | 83 +++++++++++++++++++ .../lukas/postgres/pg_catalog.properties | 2 +- 4 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/PgCursor.java diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java index e325caa232..b54e4cb890 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java @@ -46,6 +46,7 @@ import java.util.Map; import java.util.Set; import org.jooq.Record; +import org.jooq.impl.AbstractRoutine; import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UDTRecordImpl; import org.jooq.impl.UpdatableRecordImpl; @@ -157,6 +158,11 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy { } } + // [#1406] Disambiguate also procedure parameters + else if (definition instanceof ParameterDefinition) { + reserved = reservedColumns(AbstractRoutine.class); + } + if (reserved != null) { if (reserved.contains(method)) { return method + "_"; 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 0333948e65..46a32e6dbb 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 @@ -116,6 +116,24 @@ public final class Routines { return f.asField(); } + /** + * Call pg_catalog.pg_cursor + * + * @param name OUT parameter + * @param statement OUT parameter + * @param isHoldable OUT parameter + * @param isBinary OUT parameter + * @param isScrollable OUT parameter + * @param creationTime OUT parameter + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + 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; + } + /** * No instances */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/PgCursor.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/PgCursor.java new file mode 100644 index 0000000000..070a7982be --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/PgCursor.java @@ -0,0 +1,83 @@ +/** + * 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 PgCursor extends org.jooq.impl.AbstractRoutine { + + private static final long serialVersionUID = -747987068; + + + /** + * An uncommented item + */ + public static final org.jooq.Parameter NAME = createParameter("name", org.jooq.impl.SQLDataType.CLOB); + + /** + * An uncommented item + */ + public static final org.jooq.Parameter STATEMENT = createParameter("statement", org.jooq.impl.SQLDataType.CLOB); + + /** + * An uncommented item + */ + public static final org.jooq.Parameter IS_HOLDABLE = createParameter("is_holdable", org.jooq.impl.SQLDataType.BOOLEAN); + + /** + * An uncommented item + */ + public static final org.jooq.Parameter IS_BINARY = createParameter("is_binary", org.jooq.impl.SQLDataType.BOOLEAN); + + /** + * An uncommented item + */ + public static final org.jooq.Parameter IS_SCROLLABLE = createParameter("is_scrollable", org.jooq.impl.SQLDataType.BOOLEAN); + + /** + * An uncommented item + */ + public static final org.jooq.Parameter CREATION_TIME = createParameter("creation_time", org.jooq.impl.SQLDataType.TIMESTAMP); + + /** + * Create a new routine call instance + */ + public PgCursor() { + super("pg_cursor", org.jooq.util.postgres.pg_catalog.PgCatalog.PG_CATALOG); + + addOutParameter(NAME); + addOutParameter(STATEMENT); + addOutParameter(IS_HOLDABLE); + addOutParameter(IS_BINARY); + addOutParameter(IS_SCROLLABLE); + addOutParameter(CREATION_TIME); + } + + public java.lang.String getName_() { + return getValue(NAME); + } + + public java.lang.String getStatement() { + return getValue(STATEMENT); + } + + public java.lang.Boolean getIsHoldable() { + return getValue(IS_HOLDABLE); + } + + public java.lang.Boolean getIsBinary() { + return getValue(IS_BINARY); + } + + public java.lang.Boolean getIsScrollable() { + return getValue(IS_SCROLLABLE); + } + + public java.sql.Timestamp getCreationTime() { + return getValue(CREATION_TIME); + } +} 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 f4ebfc7b95..09918fc39d 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,count +generator.database.includes=pg_namespace,pg_enum,pg_type,pg_class,pg_attribute,pg_proc,format_type,count,pg_cursor generator.database.excludes= generator.generate.deprecated=false generator.generate.instance-fields=true From e53a757cb4dd18f6576b54a0f507b5e9ff859b08 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 10 May 2012 22:12:35 +0200 Subject: [PATCH 04/10] [#1403] Documentation bug: ctx.statement() can be replaced in executeStart(). This is not documented --- .../main/java/org/jooq/ExecuteListener.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/jOOQ/src/main/java/org/jooq/ExecuteListener.java b/jOOQ/src/main/java/org/jooq/ExecuteListener.java index d4a0099482..ee0ad5a49d 100644 --- a/jOOQ/src/main/java/org/jooq/ExecuteListener.java +++ b/jOOQ/src/main/java/org/jooq/ExecuteListener.java @@ -460,6 +460,15 @@ public interface ExecuteListener { * * *

+ * Overridable attributes in ExecuteContext: + *

    + *
  • {@link ExecuteContext#statement(PreparedStatement)}: The + * Statement, PreparedStatement, or + * CallableStatement that is about to be executed. You can + * modify this statement freely, or wrap {@link ExecuteContext#statement()} + * with your enriched statement wrapper
    • + *
+ *

* Note that this method is not called when executing queries of type * {@link StatementType#STATIC_STATEMENT} */ @@ -497,6 +506,15 @@ public interface ExecuteListener { * * * + *

+ * Overridable attributes in ExecuteContext: + *

    + *
  • {@link ExecuteContext#statement(PreparedStatement)}: The + * Statement, PreparedStatement, or + * CallableStatement that is about to be executed. You can + * modify this statement freely, or wrap {@link ExecuteContext#statement()} + * with your enriched statement wrapper
    • + *
*/ void executeStart(ExecuteContext ctx); From c1ae59160b35a7b1d4a6c60fd7a59dff3033201f Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 11 May 2012 09:51:19 +0200 Subject: [PATCH 05/10] [#1334] Fix inaccurate simulation of TRUNC(number, decimals) for Derby --- .../jooq/test/_/testcases/FunctionTests.java | 24 ++++++++++++++++++- jOOQ/src/main/java/org/jooq/impl/Trunc.java | 17 ++++++++++--- jOOQ/src/main/java/org/jooq/impl/Util.java | 19 +++++++++++++++ 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java index f235f1eb37..1b6ddab0fe 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java @@ -603,6 +603,15 @@ extends BaseTest f3d = floor(-2.0); Field f4d = ceil(-2.0); + Field f1e = round(0.0f); + Field f2e = round(0.0f, 2); + Field f3e = floor(0.0f); + Field f4e = ceil(0.0f); + Field f1f = round(0.0f); + Field f2f = round(0.0f, 2); + Field f3f = floor(0.0f); + Field f4f = ceil(0.0f); + // Some arbitrary checks on having multiple select clauses Record record = create().select(f1a) @@ -611,7 +620,10 @@ extends BaseTest extends AbstractFunction { private final Field getNumericFunction(Configuration configuration) { switch (configuration.getDialect()) { case ASE: - - // This calculation is inaccurate for Derby case DERBY: { - Field power = Factory.power(inline(new BigDecimal("10.0")), decimals); + Field power; + + // [#1334] if possible, calculate the power in Java to prevent + // inaccurate arithmetics in the Derby database + Integer decimalsVal = extractVal(decimals); + if (decimalsVal != null) { + power = inline(TEN.pow(decimalsVal, MathContext.DECIMAL128)); + } + else { + power = Factory.power(inline(TEN), decimals); + } return Factory.decode() .when(field.sign().greaterOrEqual(zero()), diff --git a/jOOQ/src/main/java/org/jooq/impl/Util.java b/jOOQ/src/main/java/org/jooq/impl/Util.java index 745d2763d3..d8bec3cda1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Util.java +++ b/jOOQ/src/main/java/org/jooq/impl/Util.java @@ -1028,4 +1028,23 @@ final class Util { return field.cast(String.class); } } + + /** + * Utility method to check whether a field is a {@link Param} + */ + static final boolean isVal(Field field) { + return field instanceof Param; + } + + /** + * Utility method to extract a value from a field + */ + static final T extractVal(Field field) { + if (isVal(field)) { + return ((Param) field).getValue(); + } + else { + return null; + } + } } \ No newline at end of file From 6d35c6b5f6c81b57911f0473498f5d5f02dde7e7 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 11 May 2012 09:55:28 +0200 Subject: [PATCH 06/10] Release 2.3.1 --- jOOQ-codegen-maven-example/pom.xml | 6 +++--- jOOQ-codegen-maven/pom.xml | 4 ++-- jOOQ-codegen/pom.xml | 6 +++--- jOOQ-console/pom.xml | 4 ++-- jOOQ-meta/pom.xml | 4 ++-- jOOQ-release/build.xml | 2 +- jOOQ/pom.xml | 2 +- jOOQ/src/main/java/org/jooq/Constants.java | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jOOQ-codegen-maven-example/pom.xml b/jOOQ-codegen-maven-example/pom.xml index e0931e4f97..731b2af04f 100644 --- a/jOOQ-codegen-maven-example/pom.xml +++ b/jOOQ-codegen-maven-example/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-codegen-maven-example - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ Codegen Maven @@ -51,7 +51,7 @@ org.jooq jooq - 2.3.1-SNAPSHOT + 2.3.1 jar compile @@ -106,7 +106,7 @@ org.jooq jooq-codegen-maven - 2.3.1-SNAPSHOT + 2.3.1 exec1 diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml index 831d815807..2eb18e0196 100644 --- a/jOOQ-codegen-maven/pom.xml +++ b/jOOQ-codegen-maven/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-codegen-maven - 2.3.1-SNAPSHOT + 2.3.1 maven-plugin jOOQ Codegen Maven @@ -160,7 +160,7 @@ org.jooq jooq-codegen - 2.3.1-SNAPSHOT + 2.3.1 jar diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml index 617ae04bb6..81499bd1f7 100644 --- a/jOOQ-codegen/pom.xml +++ b/jOOQ-codegen/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq-codegen - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ Codegen @@ -150,14 +150,14 @@ org.jooq jooq - 2.3.1-SNAPSHOT + 2.3.1 jar compile org.jooq jooq-meta - 2.3.1-SNAPSHOT + 2.3.1 jar compile diff --git a/jOOQ-console/pom.xml b/jOOQ-console/pom.xml index 8a9174a651..09cc54448e 100644 --- a/jOOQ-console/pom.xml +++ b/jOOQ-console/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq-console - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ @@ -201,7 +201,7 @@ org.jooq jooq - 2.3.1-SNAPSHOT + 2.3.1 jar compile diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index e7007492ae..d4ddace240 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-meta - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ Meta @@ -198,7 +198,7 @@ org.jooq jooq - 2.3.1-SNAPSHOT + 2.3.1 jar compile diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml index da9b7409d9..2bc6d36cbd 100644 --- a/jOOQ-release/build.xml +++ b/jOOQ-release/build.xml @@ -3,7 +3,7 @@ - + diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index 63f3673e6c..bcf3cc20b8 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index 070a518bbc..9050f816f7 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -45,7 +45,7 @@ public final class Constants { /** * The latest jOOQ version */ - public static final String VERSION = "2.3.1-SNAPSHOT"; + public static final String VERSION = "2.3.1"; /** * No further instances From 843b82cccf45b4b9d40b79dd672395948321b49f Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 11 May 2012 10:04:13 +0200 Subject: [PATCH 07/10] Release 2.3.1 --- jOOQ-codegen-maven-example/pom.xml | 6 +- jOOQ-codegen-maven/pom.xml | 346 +++++++++--------- jOOQ-codegen/pom.xml | 12 +- jOOQ-console/pom.xml | 4 +- jOOQ-meta/pom.xml | 4 +- jOOQ-release/build.xml | 156 ++++---- .../release/template/RELEASENOTES.txt | 20 + jOOQ-website/frame.php | 2 +- jOOQ-website/inc/RELEASENOTES-2.3.txt | 20 + jOOQ-website/inc/RELEASENOTES.txt | 20 + jOOQ/pom.xml | 2 +- jOOQ/src/main/java/org/jooq/Constants.java | 2 +- 12 files changed, 327 insertions(+), 267 deletions(-) diff --git a/jOOQ-codegen-maven-example/pom.xml b/jOOQ-codegen-maven-example/pom.xml index e0931e4f97..731b2af04f 100644 --- a/jOOQ-codegen-maven-example/pom.xml +++ b/jOOQ-codegen-maven-example/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-codegen-maven-example - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ Codegen Maven @@ -51,7 +51,7 @@ org.jooq jooq - 2.3.1-SNAPSHOT + 2.3.1 jar compile @@ -106,7 +106,7 @@ org.jooq jooq-codegen-maven - 2.3.1-SNAPSHOT + 2.3.1 exec1 diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml index 831d815807..5ba9cd6a52 100644 --- a/jOOQ-codegen-maven/pom.xml +++ b/jOOQ-codegen-maven/pom.xml @@ -1,173 +1,173 @@ - - - oss-parent - org.sonatype.oss - 7 - - 4.0.0 - - org.jooq - jooq-codegen-maven - 2.3.1-SNAPSHOT - maven-plugin - - jOOQ Codegen Maven - jOOQ effectively combines complex SQL, typesafety, source code generation, active records, stored procedures, advanced data types, and Java in a fluent, intuitive DSL. - http://www.jooq.org - - - - - Apache License, Version 2.0 - http://www.jooq.org/inc/LICENSE.txt - repo - - - - - scm:svn:https://jooq.svn.sourceforge.net/svnroot/jooq - https://jooq.svn.sourceforge.net/svnroot/jooq - scm:svn:https://jooq.svn.sourceforge.net/svnroot/jooq - - - - Trac - https://sourceforge.net/apps/trac/jooq/report/6 - - - - - Lukas Eder - lukas.eder@gmail.com - - - Sander Plas - sander.plas@gmail.com - - - - - deploy - ${project.artifactId}-${project.version} - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.1 - - - sign-artifacts - verify - - sign - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - true - 512m - 256m - UTF-8 - 1.6 - 1.6 - true - lines,vars,source - - - - - true - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - - jar - - - - - - true - true - - - - - true - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - bundle-sources - package - - jar - - - - - 512 - UTF-8 - protected - true - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - UTF-8 - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - true - - - - - - - - junit - junit - 3.8.1 - test - - - org.apache.maven - maven-plugin-api - 2.2.1 - - - org.jooq - jooq-codegen - 2.3.1-SNAPSHOT - jar - - - org.apache.maven - maven-project - 2.2.1 - jar - - - + + + oss-parent + org.sonatype.oss + 7 + + 4.0.0 + + org.jooq + jooq-codegen-maven + 2.3.1 + maven-plugin + + jOOQ Codegen Maven + jOOQ effectively combines complex SQL, typesafety, source code generation, active records, stored procedures, advanced data types, and Java in a fluent, intuitive DSL. + http://www.jooq.org + + + + + Apache License, Version 2.0 + http://www.jooq.org/inc/LICENSE.txt + repo + + + + + scm:svn:https://jooq.svn.sourceforge.net/svnroot/jooq + https://jooq.svn.sourceforge.net/svnroot/jooq + scm:svn:https://jooq.svn.sourceforge.net/svnroot/jooq + + + + Trac + https://sourceforge.net/apps/trac/jooq/report/6 + + + + + Lukas Eder + lukas.eder@gmail.com + + + Sander Plas + sander.plas@gmail.com + + + + + deploy + ${project.artifactId}-${project.version} + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + true + 512m + 256m + UTF-8 + 1.6 + 1.6 + true + lines,vars,source + + + + + true + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + + jar + + + + + + true + true + + + + + true + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + bundle-sources + package + + jar + + + + + 512 + UTF-8 + protected + true + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + UTF-8 + + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.8 + + true + + + + + + + + junit + junit + 3.8.1 + test + + + org.apache.maven + maven-plugin-api + 2.2.1 + + + org.jooq + jooq-codegen + 2.3.1 + jar + + + org.apache.maven + maven-project + 2.2.1 + jar + + + diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml index 617ae04bb6..19a7289d9a 100644 --- a/jOOQ-codegen/pom.xml +++ b/jOOQ-codegen/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq-codegen - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ Codegen @@ -147,17 +147,17 @@ - - org.jooq - jooq - 2.3.1-SNAPSHOT + + org.jooq + jooq + 2.3.1 jar compile org.jooq jooq-meta - 2.3.1-SNAPSHOT + 2.3.1 jar compile diff --git a/jOOQ-console/pom.xml b/jOOQ-console/pom.xml index 8a9174a651..09cc54448e 100644 --- a/jOOQ-console/pom.xml +++ b/jOOQ-console/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq-console - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ @@ -201,7 +201,7 @@ org.jooq jooq - 2.3.1-SNAPSHOT + 2.3.1 jar compile diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index e7007492ae..d4ddace240 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-meta - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ Meta @@ -198,7 +198,7 @@ org.jooq jooq - 2.3.1-SNAPSHOT + 2.3.1 jar compile diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml index da9b7409d9..cb501c6f24 100644 --- a/jOOQ-release/build.xml +++ b/jOOQ-release/build.xml @@ -1,79 +1,79 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jOOQ-release/release/template/RELEASENOTES.txt b/jOOQ-release/release/template/RELEASENOTES.txt index 94ae18ae0a..0ae18a0785 100644 --- a/jOOQ-release/release/template/RELEASENOTES.txt +++ b/jOOQ-release/release/template/RELEASENOTES.txt @@ -10,6 +10,26 @@ http://www.jooq.org/notes.php For a text version, see http://www.jooq.org/inc/RELEASENOTES.txt +Version 2.3.1 - May 11, 2012 +================================================================= +This is an important patch release fixing some regressions in the +code generator for the Postgres dialect. With 2.3.0, it was no +longer possible to generate schemata of which the database user +was not the owner. + +Bug fixes +--------- +#1334 - Fix inaccurate simulation of TRUNC(number, decimals) for + Derby +#1403 - Documentation bug: ctx.statement() can be replaced in + executeStart(). This is not documented +#1406 - Compilation errors in generated source code when Postgres + stored procedure parameter is called "NAME" +#1407 - Compilation errors in generated source code when Postgres + data-type is "any" (with quotes!) +#1409 - Postgres code generation broken when not connecting with + the owner of a schema + Version 2.3.0 - May 6, 2012 ================================================================= diff --git a/jOOQ-website/frame.php b/jOOQ-website/frame.php index fb7862adcd..30dcb1a648 100644 --- a/jOOQ-website/frame.php +++ b/jOOQ-website/frame.php @@ -1,6 +1,6 @@ diff --git a/jOOQ-website/inc/RELEASENOTES-2.3.txt b/jOOQ-website/inc/RELEASENOTES-2.3.txt index 94ae18ae0a..0ae18a0785 100644 --- a/jOOQ-website/inc/RELEASENOTES-2.3.txt +++ b/jOOQ-website/inc/RELEASENOTES-2.3.txt @@ -10,6 +10,26 @@ http://www.jooq.org/notes.php For a text version, see http://www.jooq.org/inc/RELEASENOTES.txt +Version 2.3.1 - May 11, 2012 +================================================================= +This is an important patch release fixing some regressions in the +code generator for the Postgres dialect. With 2.3.0, it was no +longer possible to generate schemata of which the database user +was not the owner. + +Bug fixes +--------- +#1334 - Fix inaccurate simulation of TRUNC(number, decimals) for + Derby +#1403 - Documentation bug: ctx.statement() can be replaced in + executeStart(). This is not documented +#1406 - Compilation errors in generated source code when Postgres + stored procedure parameter is called "NAME" +#1407 - Compilation errors in generated source code when Postgres + data-type is "any" (with quotes!) +#1409 - Postgres code generation broken when not connecting with + the owner of a schema + Version 2.3.0 - May 6, 2012 ================================================================= diff --git a/jOOQ-website/inc/RELEASENOTES.txt b/jOOQ-website/inc/RELEASENOTES.txt index 94ae18ae0a..0ae18a0785 100644 --- a/jOOQ-website/inc/RELEASENOTES.txt +++ b/jOOQ-website/inc/RELEASENOTES.txt @@ -10,6 +10,26 @@ http://www.jooq.org/notes.php For a text version, see http://www.jooq.org/inc/RELEASENOTES.txt +Version 2.3.1 - May 11, 2012 +================================================================= +This is an important patch release fixing some regressions in the +code generator for the Postgres dialect. With 2.3.0, it was no +longer possible to generate schemata of which the database user +was not the owner. + +Bug fixes +--------- +#1334 - Fix inaccurate simulation of TRUNC(number, decimals) for + Derby +#1403 - Documentation bug: ctx.statement() can be replaced in + executeStart(). This is not documented +#1406 - Compilation errors in generated source code when Postgres + stored procedure parameter is called "NAME" +#1407 - Compilation errors in generated source code when Postgres + data-type is "any" (with quotes!) +#1409 - Postgres code generation broken when not connecting with + the owner of a schema + Version 2.3.0 - May 6, 2012 ================================================================= diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index 63f3673e6c..bcf3cc20b8 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq - 2.3.1-SNAPSHOT + 2.3.1 jar jOOQ diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index 070a518bbc..9050f816f7 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -45,7 +45,7 @@ public final class Constants { /** * The latest jOOQ version */ - public static final String VERSION = "2.3.1-SNAPSHOT"; + public static final String VERSION = "2.3.1"; /** * No further instances From 767574f4c2a0151247bbaab6f09333b1e29272f0 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 11 May 2012 11:07:25 +0200 Subject: [PATCH 08/10] Release 2.4.0-SNAPSHOT --- jOOQ-codegen-maven-example/pom.xml | 6 +++--- jOOQ-codegen-maven/pom.xml | 4 ++-- jOOQ-codegen/pom.xml | 6 +++--- jOOQ-console/pom.xml | 4 ++-- jOOQ-meta/pom.xml | 4 ++-- jOOQ/pom.xml | 2 +- jOOQ/src/main/java/org/jooq/Constants.java | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jOOQ-codegen-maven-example/pom.xml b/jOOQ-codegen-maven-example/pom.xml index 731b2af04f..c39bef60c5 100644 --- a/jOOQ-codegen-maven-example/pom.xml +++ b/jOOQ-codegen-maven-example/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-codegen-maven-example - 2.3.1 + 2.4.0-SNAPSHOT jar jOOQ Codegen Maven @@ -51,7 +51,7 @@ org.jooq jooq - 2.3.1 + 2.4.0-SNAPSHOT jar compile @@ -106,7 +106,7 @@ org.jooq jooq-codegen-maven - 2.3.1 + 2.4.0-SNAPSHOT exec1 diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml index 200a8d503c..293702dcfb 100644 --- a/jOOQ-codegen-maven/pom.xml +++ b/jOOQ-codegen-maven/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-codegen-maven - 2.3.1 + 2.4.0-SNAPSHOT maven-plugin jOOQ Codegen Maven @@ -160,7 +160,7 @@ org.jooq jooq-codegen - 2.3.1 + 2.4.0-SNAPSHOT jar diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml index 31b2e95d2c..de33274439 100644 --- a/jOOQ-codegen/pom.xml +++ b/jOOQ-codegen/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq-codegen - 2.3.1 + 2.4.0-SNAPSHOT jar jOOQ Codegen @@ -150,14 +150,14 @@ org.jooq jooq - 2.3.1 + 2.4.0-SNAPSHOT jar compile org.jooq jooq-meta - 2.3.1 + 2.4.0-SNAPSHOT jar compile diff --git a/jOOQ-console/pom.xml b/jOOQ-console/pom.xml index 09cc54448e..29eaf7490a 100644 --- a/jOOQ-console/pom.xml +++ b/jOOQ-console/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq-console - 2.3.1 + 2.4.0-SNAPSHOT jar jOOQ @@ -201,7 +201,7 @@ org.jooq jooq - 2.3.1 + 2.4.0-SNAPSHOT jar compile diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index d4ddace240..0dd6556472 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -9,7 +9,7 @@ org.jooq jooq-meta - 2.3.1 + 2.4.0-SNAPSHOT jar jOOQ Meta @@ -198,7 +198,7 @@ org.jooq jooq - 2.3.1 + 2.4.0-SNAPSHOT jar compile diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index bcf3cc20b8..f3b237c712 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -10,7 +10,7 @@ org.jooq jooq - 2.3.1 + 2.4.0-SNAPSHOT jar jOOQ diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index 9050f816f7..c878740e77 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -45,7 +45,7 @@ public final class Constants { /** * The latest jOOQ version */ - public static final String VERSION = "2.3.1"; + public static final String VERSION = "2.4.0"; /** * No further instances From 1fac2d30ec60af24b059d9f3e55c2eca7b12e5b7 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 11 May 2012 11:09:15 +0200 Subject: [PATCH 09/10] [#1408] Relax bounds of in Factory.truncate() to Record, instead of TableRecord --- jOOQ/src/main/java/org/jooq/FactoryOperations.java | 2 +- jOOQ/src/main/java/org/jooq/Truncate.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Factory.java | 2 +- jOOQ/src/main/java/org/jooq/impl/FactoryProxy.java | 2 +- jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/FactoryOperations.java b/jOOQ/src/main/java/org/jooq/FactoryOperations.java index 157647545c..60f5ddf47b 100644 --- a/jOOQ/src/main/java/org/jooq/FactoryOperations.java +++ b/jOOQ/src/main/java/org/jooq/FactoryOperations.java @@ -688,7 +688,7 @@ public interface FactoryOperations extends Configuration { * is omitted for future extensibility of this command. */ @Support - > Truncate truncate(Table table); + Truncate truncate(Table table); // ------------------------------------------------------------------------- // XXX Other queries for identities and sequences diff --git a/jOOQ/src/main/java/org/jooq/Truncate.java b/jOOQ/src/main/java/org/jooq/Truncate.java index ab8c7bc228..458e178786 100644 --- a/jOOQ/src/main/java/org/jooq/Truncate.java +++ b/jOOQ/src/main/java/org/jooq/Truncate.java @@ -40,6 +40,6 @@ package org.jooq; * * @author Lukas Eder */ -public interface Truncate> extends Query { +public interface Truncate extends Query { } diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/Factory.java index b5781b42e1..1d01d3168d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Factory.java +++ b/jOOQ/src/main/java/org/jooq/impl/Factory.java @@ -1489,7 +1489,7 @@ public class Factory implements FactoryOperations { * {@inheritDoc} */ @Override - public final > Truncate truncate(Table table) { + public final Truncate truncate(Table table) { return new TruncateImpl(this, table); } diff --git a/jOOQ/src/main/java/org/jooq/impl/FactoryProxy.java b/jOOQ/src/main/java/org/jooq/impl/FactoryProxy.java index 7e8ecb1a72..27947c024b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FactoryProxy.java +++ b/jOOQ/src/main/java/org/jooq/impl/FactoryProxy.java @@ -344,7 +344,7 @@ public final class FactoryProxy implements FactoryOperations { } @Override - public final > Truncate truncate(Table table) { + public final Truncate truncate(Table table) { return getDelegate().truncate(table); } diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java index a4c881247e..fd1c283653 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java @@ -40,16 +40,16 @@ import java.util.List; import org.jooq.Attachable; import org.jooq.BindContext; import org.jooq.Configuration; +import org.jooq.Record; import org.jooq.RenderContext; import org.jooq.SQLDialect; import org.jooq.Table; -import org.jooq.TableRecord; import org.jooq.Truncate; /** * @author Lukas Eder */ -class TruncateImpl> extends AbstractQuery implements Truncate { +class TruncateImpl extends AbstractQuery implements Truncate { /** * Generated UID From 6eb56640dfa6a9917ce147fdeb7dd71d10d278dd Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 11 May 2012 11:15:28 +0200 Subject: [PATCH 10/10] [#1411] Add support for Postgres "any" data type (with quotes!). This seems to map well to java.lang.Object --- .../java/org/jooq/util/postgres/pg_catalog/PgCatalog.java | 4 ++-- .../org/jooq/util/postgres/pg_catalog/PgCatalogFactory.java | 4 ++-- .../java/org/jooq/util/postgres/pg_catalog/Routines.java | 2 +- .../main/java/org/jooq/util/postgres/pg_catalog/Tables.java | 2 +- .../org/jooq/util/postgres/pg_catalog/routines/Count1.java | 6 +++--- .../org/jooq/util/postgres/pg_catalog/routines/Count2.java | 4 ++-- .../jooq/util/postgres/pg_catalog/routines/FormatType.java | 4 ++-- .../jooq/util/postgres/pg_catalog/routines/PgCursor.java | 4 ++-- .../jooq/util/postgres/pg_catalog/tables/PgAttribute.java | 4 ++-- .../org/jooq/util/postgres/pg_catalog/tables/PgClass.java | 4 ++-- .../org/jooq/util/postgres/pg_catalog/tables/PgEnum.java | 4 ++-- .../jooq/util/postgres/pg_catalog/tables/PgNamespace.java | 4 ++-- .../org/jooq/util/postgres/pg_catalog/tables/PgProc.java | 4 ++-- .../org/jooq/util/postgres/pg_catalog/tables/PgType.java | 4 ++-- .../main/java/org/jooq/util/postgres/PostgresDataType.java | 1 + 15 files changed, 28 insertions(+), 27 deletions(-) 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 ab067c29cf..45bb9ba81c 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.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class PgCatalog extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -371905234; + private static final long serialVersionUID = 1109544775; /** * 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 3092452956..2c7876ce2b 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.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class PgCatalogFactory extends org.jooq.util.postgres.PostgresFactory { - private static final long serialVersionUID = 1626557035; + private static final long serialVersionUID = 1813233842; /** * Create a factory with a connection diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java index 46a32e6dbb..ea86211096 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java @@ -8,7 +8,7 @@ package org.jooq.util.postgres.pg_catalog; * * Convenience access to all stored procedures and functions in pg_catalog */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public final class Routines { diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java index b86e35a600..e0ae576105 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.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, 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 index cb15379f61..f490a9fdd1 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,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.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class Count1 extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = -772102665; + private static final long serialVersionUID = 1018949472; /** @@ -24,7 +24,7 @@ public class Count1 extends org.jooq.impl.AbstractRoutine { * 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\"")); + public static final org.jooq.Parameter _1 = createParameter("_1", org.jooq.impl.SQLDataType.OTHER); /** * Create a new routine call instance 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 fe332b82c9..065f648dd3 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,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.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class Count2 extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = 1180633735; + private static final long serialVersionUID = -101223220; /** 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 01da6d8573..0946dc3c74 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.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class FormatType extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = -1785499997; + private static final long serialVersionUID = 428047358; /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/PgCursor.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/PgCursor.java index 070a7982be..568f3059a6 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/PgCursor.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/PgCursor.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.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class PgCursor extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = -747987068; + private static final long serialVersionUID = 1046377097; /** 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 b988f0089c..80c18eb208 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class PgAttribute extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -519027695; + private static final long serialVersionUID = 1961406872; /** * 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 679ad5f868..c3a9d66b62 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class PgClass extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -1753706892; + private static final long serialVersionUID = -2038078835; /** * The singleton instance of pg_catalog.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 1b84b74c5c..3ca36a196f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class PgEnum extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 800254732; + private static final long serialVersionUID = -741676635; /** * The singleton instance of pg_catalog.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 d90e9e5e90..e7f3be7b66 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,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class PgNamespace extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -1769943747; + private static final long serialVersionUID = 2129977430; /** * 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 362e8fb7f0..1189871cf1 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class PgProc extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 26734556; + private static final long serialVersionUID = 1760477283; /** * 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 093d728caf..eaef6873b1 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java @@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.1-SNAPSHOT"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.4.0"}, comments = "This class is generated by jOOQ") public class PgType extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1130750896; + private static final long serialVersionUID = -1252060599; /** * The singleton instance of pg_catalog.pg_type diff --git a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java index c9b8bb5b4b..5cfbc1cc05 100644 --- a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java @@ -136,6 +136,7 @@ public class PostgresDataType extends AbstractDataType { public static final PostgresDataType TIMESTAMPWITHTIMEZONE = new PostgresDataType(SQLDataType.TIMESTAMP, "timestamp with time zone"); public static final PostgresDataType TIMESTAMPTZ = new PostgresDataType(SQLDataType.TIMESTAMP, "timestamptz"); public static final PostgresDataType> REFCURSOR = new PostgresDataType>(SQLDataType.RESULT, "refcursor"); + public static final PostgresDataType ANY = new PostgresDataType(SQLDataType.OTHER, "any"); // Meta-table types public static final PostgresDataType OID = new PostgresDataType(SQLDataType.BIGINT, "oid");