From 6eb56640dfa6a9917ce147fdeb7dd71d10d278dd Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 11 May 2012 11:15:28 +0200 Subject: [PATCH] [#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");