From 660c68675a401f7d2b68ca79462c8db7426df423 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 13 Jul 2012 18:17:44 +0200 Subject: [PATCH] [#1563] Add support for Oracle SYNONYMs in source code generation - Regenerated Oracle SYS schema, adding ALL_SYNONYMS --- .../java/org/jooq/util/oracle/sys/Sys.java | 5 +- .../org/jooq/util/oracle/sys/SysFactory.java | 25 ++++++- .../java/org/jooq/util/oracle/sys/Tables.java | 33 +++++---- .../util/oracle/sys/tables/AllArguments.java | 11 +-- .../oracle/sys/tables/AllColComments.java | 11 +-- .../util/oracle/sys/tables/AllCollTypes.java | 11 +-- .../oracle/sys/tables/AllConsColumns.java | 11 +-- .../oracle/sys/tables/AllConstraints.java | 15 ++--- .../util/oracle/sys/tables/AllObjects.java | 11 +-- .../util/oracle/sys/tables/AllProcedures.java | 19 ++---- .../util/oracle/sys/tables/AllSequences.java | 11 +-- .../util/oracle/sys/tables/AllSynonyms.java | 67 +++++++++++++++++++ .../util/oracle/sys/tables/AllTabCols.java | 15 ++--- .../oracle/sys/tables/AllTabComments.java | 11 +-- .../util/oracle/sys/tables/AllTypeAttrs.java | 11 +-- .../jooq/util/oracle/sys/tables/AllTypes.java | 11 +-- .../jooq/util/oracle/sys/tables/AllUsers.java | 11 +-- .../udt/records/OraMiningNumberNtRecord.java | 4 +- .../records/OraMiningVarchar2NtRecord.java | 4 +- .../configuration/lukas/oracle/sys.properties | 2 +- 20 files changed, 164 insertions(+), 135 deletions(-) create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSynonyms.java diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Sys.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Sys.java index 5844cf922a..988d284388 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Sys.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Sys.java @@ -6,11 +6,11 @@ package org.jooq.util.oracle.sys; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class Sys extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 1503809982; + private static final long serialVersionUID = 1034882639; /** * The singleton instance of SYS @@ -35,6 +35,7 @@ public class Sys extends org.jooq.impl.SchemaImpl { org.jooq.util.oracle.sys.tables.AllObjects.ALL_OBJECTS, org.jooq.util.oracle.sys.tables.AllProcedures.ALL_PROCEDURES, org.jooq.util.oracle.sys.tables.AllSequences.ALL_SEQUENCES, + org.jooq.util.oracle.sys.tables.AllSynonyms.ALL_SYNONYMS, org.jooq.util.oracle.sys.tables.AllTabCols.ALL_TAB_COLS, org.jooq.util.oracle.sys.tables.AllTabComments.ALL_TAB_COMMENTS, org.jooq.util.oracle.sys.tables.AllTypeAttrs.ALL_TYPE_ATTRS, diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/SysFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/SysFactory.java index 381dbdd662..803eb073b0 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/SysFactory.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/SysFactory.java @@ -5,12 +5,20 @@ package org.jooq.util.oracle.sys; /** * This class is generated by jOOQ. + * + * A Factory for specific use with the SYS schema. + *

+ * This Factory will not render the SYS schema's schema name + * in rendered SQL (assuming that you use it as the default schema on your + * connection!). Use the more generic {@link org.jooq.util.oracle.OracleFactory} + * or the {@link org.jooq.impl.Factory} instead, if you want to fully qualify + * tables, routines, etc. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class SysFactory extends org.jooq.util.oracle.OracleFactory { - private static final long serialVersionUID = -1512813004; + private static final long serialVersionUID = 44512269; /** * Create a factory with a connection @@ -19,6 +27,8 @@ public class SysFactory extends org.jooq.util.oracle.OracleFactory { */ public SysFactory(java.sql.Connection connection) { super(connection); + + initDefaultSchema(); } /** @@ -29,5 +39,16 @@ public class SysFactory extends org.jooq.util.oracle.OracleFactory { */ public SysFactory(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.oracle.sys.Sys.SYS.getName()); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Tables.java index 9769a80039..8e62190a88 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Tables.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Tables.java @@ -8,74 +8,79 @@ package org.jooq.util.oracle.sys; * * Convenience access to all tables in SYS */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public final class Tables { /** * Arguments in object accessible to the user */ - public static org.jooq.util.oracle.sys.tables.AllArguments ALL_ARGUMENTS = org.jooq.util.oracle.sys.tables.AllArguments.ALL_ARGUMENTS; + public static final org.jooq.util.oracle.sys.tables.AllArguments ALL_ARGUMENTS = org.jooq.util.oracle.sys.tables.AllArguments.ALL_ARGUMENTS; /** * Comments on columns of accessible tables and views */ - public static org.jooq.util.oracle.sys.tables.AllColComments ALL_COL_COMMENTS = org.jooq.util.oracle.sys.tables.AllColComments.ALL_COL_COMMENTS; + public static final org.jooq.util.oracle.sys.tables.AllColComments ALL_COL_COMMENTS = org.jooq.util.oracle.sys.tables.AllColComments.ALL_COL_COMMENTS; /** * Description of named collection types accessible to the user */ - public static org.jooq.util.oracle.sys.tables.AllCollTypes ALL_COLL_TYPES = org.jooq.util.oracle.sys.tables.AllCollTypes.ALL_COLL_TYPES; + public static final org.jooq.util.oracle.sys.tables.AllCollTypes ALL_COLL_TYPES = org.jooq.util.oracle.sys.tables.AllCollTypes.ALL_COLL_TYPES; /** * Information about accessible columns in constraint definitions */ - public static org.jooq.util.oracle.sys.tables.AllConsColumns ALL_CONS_COLUMNS = org.jooq.util.oracle.sys.tables.AllConsColumns.ALL_CONS_COLUMNS; + public static final org.jooq.util.oracle.sys.tables.AllConsColumns ALL_CONS_COLUMNS = org.jooq.util.oracle.sys.tables.AllConsColumns.ALL_CONS_COLUMNS; /** * Constraint definitions on accessible tables */ - public static org.jooq.util.oracle.sys.tables.AllConstraints ALL_CONSTRAINTS = org.jooq.util.oracle.sys.tables.AllConstraints.ALL_CONSTRAINTS; + public static final org.jooq.util.oracle.sys.tables.AllConstraints ALL_CONSTRAINTS = org.jooq.util.oracle.sys.tables.AllConstraints.ALL_CONSTRAINTS; /** * Objects accessible to the user */ - public static org.jooq.util.oracle.sys.tables.AllObjects ALL_OBJECTS = org.jooq.util.oracle.sys.tables.AllObjects.ALL_OBJECTS; + public static final org.jooq.util.oracle.sys.tables.AllObjects ALL_OBJECTS = org.jooq.util.oracle.sys.tables.AllObjects.ALL_OBJECTS; /** * Functions/procedures/packages/types/triggers available to the user */ - public static org.jooq.util.oracle.sys.tables.AllProcedures ALL_PROCEDURES = org.jooq.util.oracle.sys.tables.AllProcedures.ALL_PROCEDURES; + public static final org.jooq.util.oracle.sys.tables.AllProcedures ALL_PROCEDURES = org.jooq.util.oracle.sys.tables.AllProcedures.ALL_PROCEDURES; /** * Description of SEQUENCEs accessible to the user */ - public static org.jooq.util.oracle.sys.tables.AllSequences ALL_SEQUENCES = org.jooq.util.oracle.sys.tables.AllSequences.ALL_SEQUENCES; + public static final org.jooq.util.oracle.sys.tables.AllSequences ALL_SEQUENCES = org.jooq.util.oracle.sys.tables.AllSequences.ALL_SEQUENCES; + + /** + * All synonyms for base objects accessible to the user and session + */ + public static final org.jooq.util.oracle.sys.tables.AllSynonyms ALL_SYNONYMS = org.jooq.util.oracle.sys.tables.AllSynonyms.ALL_SYNONYMS; /** * Columns of user's tables, views and clusters */ - public static org.jooq.util.oracle.sys.tables.AllTabCols ALL_TAB_COLS = org.jooq.util.oracle.sys.tables.AllTabCols.ALL_TAB_COLS; + public static final org.jooq.util.oracle.sys.tables.AllTabCols ALL_TAB_COLS = org.jooq.util.oracle.sys.tables.AllTabCols.ALL_TAB_COLS; /** * Comments on tables and views accessible to the user */ - public static org.jooq.util.oracle.sys.tables.AllTabComments ALL_TAB_COMMENTS = org.jooq.util.oracle.sys.tables.AllTabComments.ALL_TAB_COMMENTS; + public static final org.jooq.util.oracle.sys.tables.AllTabComments ALL_TAB_COMMENTS = org.jooq.util.oracle.sys.tables.AllTabComments.ALL_TAB_COMMENTS; /** * Description of attributes of types accessible to the user */ - public static org.jooq.util.oracle.sys.tables.AllTypeAttrs ALL_TYPE_ATTRS = org.jooq.util.oracle.sys.tables.AllTypeAttrs.ALL_TYPE_ATTRS; + public static final org.jooq.util.oracle.sys.tables.AllTypeAttrs ALL_TYPE_ATTRS = org.jooq.util.oracle.sys.tables.AllTypeAttrs.ALL_TYPE_ATTRS; /** * Description of types accessible to the user */ - public static org.jooq.util.oracle.sys.tables.AllTypes ALL_TYPES = org.jooq.util.oracle.sys.tables.AllTypes.ALL_TYPES; + public static final org.jooq.util.oracle.sys.tables.AllTypes ALL_TYPES = org.jooq.util.oracle.sys.tables.AllTypes.ALL_TYPES; /** * Information about all users of the database */ - public static org.jooq.util.oracle.sys.tables.AllUsers ALL_USERS = org.jooq.util.oracle.sys.tables.AllUsers.ALL_USERS; + public static final org.jooq.util.oracle.sys.tables.AllUsers ALL_USERS = org.jooq.util.oracle.sys.tables.AllUsers.ALL_USERS; /** * No instances diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllArguments.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllArguments.java index e24ea25cf1..87a62a14eb 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllArguments.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllArguments.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Arguments in object accessible to the user */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllArguments extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -593371790; + private static final long serialVersionUID = 764265368; /** * The singleton instance of SYS.ALL_ARGUMENTS */ public static final org.jooq.util.oracle.sys.tables.AllArguments ALL_ARGUMENTS = new org.jooq.util.oracle.sys.tables.AllArguments(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllColComments.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllColComments.java index 45ae8c4a3f..b9712bfbce 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllColComments.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllColComments.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Comments on columns of accessible tables and views */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllColComments extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -731363694; + private static final long serialVersionUID = 980924268; /** * The singleton instance of SYS.ALL_COL_COMMENTS */ public static final org.jooq.util.oracle.sys.tables.AllColComments ALL_COL_COMMENTS = new org.jooq.util.oracle.sys.tables.AllColComments(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllCollTypes.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllCollTypes.java index 3dd57ce86d..6992a5a57a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllCollTypes.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllCollTypes.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Description of named collection types accessible to the user */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllCollTypes extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -2014095779; + private static final long serialVersionUID = 295646347; /** * The singleton instance of SYS.ALL_COLL_TYPES */ public static final org.jooq.util.oracle.sys.tables.AllCollTypes ALL_COLL_TYPES = new org.jooq.util.oracle.sys.tables.AllCollTypes(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConsColumns.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConsColumns.java index fca2e4718a..583845cacc 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConsColumns.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConsColumns.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Information about accessible columns in constraint definitions */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllConsColumns extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1678303875; + private static final long serialVersionUID = -235970741; /** * The singleton instance of SYS.ALL_CONS_COLUMNS */ public static final org.jooq.util.oracle.sys.tables.AllConsColumns ALL_CONS_COLUMNS = new org.jooq.util.oracle.sys.tables.AllConsColumns(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConstraints.java index 961ac047e6..45a63cfb7e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConstraints.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConstraints.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Constraint definitions on accessible tables */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllConstraints extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 446957732; + private static final long serialVersionUID = -1286861428; /** * The singleton instance of SYS.ALL_CONSTRAINTS */ public static final org.jooq.util.oracle.sys.tables.AllConstraints ALL_CONSTRAINTS = new org.jooq.util.oracle.sys.tables.AllConstraints(); - /** - * 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; } /** @@ -123,12 +118,12 @@ public class AllConstraints extends org.jooq.impl.TableImpl { public final org.jooq.TableField INDEX_NAME = createField("INDEX_NAME", org.jooq.impl.SQLDataType.VARCHAR, this); /** - * An uncommented item + * The table column SYS.ALL_CONSTRAINTS.INVALID */ public final org.jooq.TableField INVALID = createField("INVALID", org.jooq.impl.SQLDataType.VARCHAR, this); /** - * An uncommented item + * The table column SYS.ALL_CONSTRAINTS.VIEW_RELATED */ public final org.jooq.TableField VIEW_RELATED = createField("VIEW_RELATED", org.jooq.impl.SQLDataType.VARCHAR, this); diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllObjects.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllObjects.java index c2105225ff..d833f581a9 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllObjects.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllObjects.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Objects accessible to the user */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllObjects extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -1937295293; + private static final long serialVersionUID = 1730149793; /** * The singleton instance of SYS.ALL_OBJECTS */ public static final org.jooq.util.oracle.sys.tables.AllObjects ALL_OBJECTS = new org.jooq.util.oracle.sys.tables.AllObjects(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllProcedures.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllProcedures.java index 0b7f4f7584..a448e9279d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllProcedures.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllProcedures.java @@ -8,32 +8,27 @@ package org.jooq.util.oracle.sys.tables; * * Functions/procedures/packages/types/triggers available to the user */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllProcedures extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 50718836; + private static final long serialVersionUID = -814913983; /** * The singleton instance of SYS.ALL_PROCEDURES */ public static final org.jooq.util.oracle.sys.tables.AllProcedures ALL_PROCEDURES = new org.jooq.util.oracle.sys.tables.AllProcedures(); - /** - * 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; } /** - * An uncommented item + * The table column SYS.ALL_PROCEDURES.OWNER */ public final org.jooq.TableField OWNER = createField("OWNER", org.jooq.impl.SQLDataType.VARCHAR, this); @@ -93,17 +88,17 @@ public class AllProcedures extends org.jooq.impl.TableImpl { public final org.jooq.TableField PARALLEL = createField("PARALLEL", org.jooq.impl.SQLDataType.VARCHAR, this); /** - * An uncommented item + * The table column SYS.ALL_PROCEDURES.INTERFACE */ public final org.jooq.TableField INTERFACE = createField("INTERFACE", org.jooq.impl.SQLDataType.VARCHAR, this); /** - * An uncommented item + * The table column SYS.ALL_PROCEDURES.DETERMINISTIC */ public final org.jooq.TableField DETERMINISTIC = createField("DETERMINISTIC", org.jooq.impl.SQLDataType.VARCHAR, this); /** - * An uncommented item + * The table column SYS.ALL_PROCEDURES.AUTHID */ public final org.jooq.TableField AUTHID = createField("AUTHID", org.jooq.impl.SQLDataType.VARCHAR, this); diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSequences.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSequences.java index cf7126fd43..7a6fecd6cd 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSequences.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSequences.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Description of SEQUENCEs accessible to the user */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllSequences extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 218635558; + private static final long serialVersionUID = -1173564530; /** * The singleton instance of SYS.ALL_SEQUENCES */ public static final org.jooq.util.oracle.sys.tables.AllSequences ALL_SEQUENCES = new org.jooq.util.oracle.sys.tables.AllSequences(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSynonyms.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSynonyms.java new file mode 100644 index 0000000000..e7c2ffe4f8 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSynonyms.java @@ -0,0 +1,67 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.oracle.sys.tables; + +/** + * This class is generated by jOOQ. + * + * All synonyms for base objects accessible to the user and session + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, + comments = "This class is generated by jOOQ") +public class AllSynonyms extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = 774001568; + + /** + * The singleton instance of SYS.ALL_SYNONYMS + */ + public static final org.jooq.util.oracle.sys.tables.AllSynonyms ALL_SYNONYMS = new org.jooq.util.oracle.sys.tables.AllSynonyms(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return org.jooq.Record.class; + } + + /** + * Owner of the synonym + */ + public final org.jooq.TableField OWNER = createField("OWNER", org.jooq.impl.SQLDataType.VARCHAR, this); + + /** + * Name of the synonym + */ + public final org.jooq.TableField SYNONYM_NAME = createField("SYNONYM_NAME", org.jooq.impl.SQLDataType.VARCHAR, this); + + /** + * Owner of the object referenced by the synonym + */ + public final org.jooq.TableField TABLE_OWNER = createField("TABLE_OWNER", org.jooq.impl.SQLDataType.VARCHAR, this); + + /** + * Name of the object referenced by the synonym + */ + public final org.jooq.TableField TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR, this); + + /** + * Name of the database link referenced in a remote synonym + */ + public final org.jooq.TableField DB_LINK = createField("DB_LINK", org.jooq.impl.SQLDataType.VARCHAR, this); + + public AllSynonyms() { + super("ALL_SYNONYMS", org.jooq.util.oracle.sys.Sys.SYS); + } + + public AllSynonyms(java.lang.String alias) { + super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllSynonyms.ALL_SYNONYMS); + } + + @Override + public org.jooq.util.oracle.sys.tables.AllSynonyms as(java.lang.String alias) { + return new org.jooq.util.oracle.sys.tables.AllSynonyms(alias); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabCols.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabCols.java index 40604c53b2..55646ffd08 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabCols.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabCols.java @@ -8,32 +8,27 @@ package org.jooq.util.oracle.sys.tables; * * Columns of user's tables, views and clusters */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllTabCols extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 831744570; + private static final long serialVersionUID = 1567775547; /** * The singleton instance of SYS.ALL_TAB_COLS */ public static final org.jooq.util.oracle.sys.tables.AllTabCols ALL_TAB_COLS = new org.jooq.util.oracle.sys.tables.AllTabCols(); - /** - * 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; } /** - * An uncommented item + * The table column SYS.ALL_TAB_COLS.OWNER */ public final org.jooq.TableField OWNER = createField("OWNER", org.jooq.impl.SQLDataType.VARCHAR, this); @@ -203,7 +198,7 @@ public class AllTabCols extends org.jooq.impl.TableImpl { public final org.jooq.TableField INTERNAL_COLUMN_ID = createField("INTERNAL_COLUMN_ID", org.jooq.impl.SQLDataType.NUMERIC, this); /** - * An uncommented item + * The table column SYS.ALL_TAB_COLS.HISTOGRAM */ public final org.jooq.TableField HISTOGRAM = createField("HISTOGRAM", org.jooq.impl.SQLDataType.VARCHAR, this); diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabComments.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabComments.java index 42b1515402..b627476143 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabComments.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabComments.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Comments on tables and views accessible to the user */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllTabComments extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -2132342956; + private static final long serialVersionUID = -2057912058; /** * The singleton instance of SYS.ALL_TAB_COMMENTS */ public static final org.jooq.util.oracle.sys.tables.AllTabComments ALL_TAB_COMMENTS = new org.jooq.util.oracle.sys.tables.AllTabComments(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypeAttrs.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypeAttrs.java index 86336a6a31..b7dc79f7a8 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypeAttrs.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypeAttrs.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Description of attributes of types accessible to the user */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllTypeAttrs extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1814817559; + private static final long serialVersionUID = -269821555; /** * The singleton instance of SYS.ALL_TYPE_ATTRS */ public static final org.jooq.util.oracle.sys.tables.AllTypeAttrs ALL_TYPE_ATTRS = new org.jooq.util.oracle.sys.tables.AllTypeAttrs(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypes.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypes.java index b8626fe7cc..0db01707f7 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypes.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypes.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Description of types accessible to the user */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllTypes extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -499083732; + private static final long serialVersionUID = 1725656432; /** * The singleton instance of SYS.ALL_TYPES */ public static final org.jooq.util.oracle.sys.tables.AllTypes ALL_TYPES = new org.jooq.util.oracle.sys.tables.AllTypes(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllUsers.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllUsers.java index d7ae909045..046d0050ff 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllUsers.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllUsers.java @@ -8,28 +8,23 @@ package org.jooq.util.oracle.sys.tables; * * Information about all users of the database */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class AllUsers extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -896221969; + private static final long serialVersionUID = -752288951; /** * The singleton instance of SYS.ALL_USERS */ public static final org.jooq.util.oracle.sys.tables.AllUsers ALL_USERS = new org.jooq.util.oracle.sys.tables.AllUsers(); - /** - * 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; } /** diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningNumberNtRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningNumberNtRecord.java index c46825f0f6..0988208d70 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningNumberNtRecord.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningNumberNtRecord.java @@ -6,11 +6,11 @@ package org.jooq.util.oracle.sys.udt.records; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class OraMiningNumberNtRecord extends org.jooq.impl.ArrayRecordImpl { - private static final long serialVersionUID = -1708656270; + private static final long serialVersionUID = 1946791028; public OraMiningNumberNtRecord(org.jooq.Configuration configuration) { super(org.jooq.util.oracle.sys.Sys.SYS, "ORA_MINING_NUMBER_NT", org.jooq.impl.SQLDataType.NUMERIC, configuration); diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningVarchar2NtRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningVarchar2NtRecord.java index 830a96f6b9..4c24c13197 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningVarchar2NtRecord.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningVarchar2NtRecord.java @@ -6,11 +6,11 @@ package org.jooq.util.oracle.sys.udt.records; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "2.3.0"}, +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.5.0"}, comments = "This class is generated by jOOQ") public class OraMiningVarchar2NtRecord extends org.jooq.impl.ArrayRecordImpl { - private static final long serialVersionUID = 860071740; + private static final long serialVersionUID = 144323262; public OraMiningVarchar2NtRecord(org.jooq.Configuration configuration) { super(org.jooq.util.oracle.sys.Sys.SYS, "ORA_MINING_VARCHAR2_NT", org.jooq.impl.SQLDataType.VARCHAR, configuration); diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/sys.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/sys.properties index 6cabb8aa75..e7353134c6 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/sys.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/sys.properties @@ -7,7 +7,7 @@ jdbc.Password=TEST generator=org.jooq.util.DefaultGenerator generator.database=org.jooq.util.oracle.OracleDatabase -generator.database.includes=ALL_USERS,ALL_TAB_COMMENTS,ALL_TAB_COLS,ALL_COL_COMMENTS,ALL_CONSTRAINTS,ALL_CONS_COLUMNS,ALL_PROCEDURES,ALL_ARGUMENTS,ALL_OBJECTS,ALL_TYPES,ALL_TYPE_ATTRS,ALL_SEQUENCES,ALL_COLL_TYPES,ORA_MINING_NUMBER_NT,ORA_MINING_VARCHAR2_NT +generator.database.includes=ALL_USERS,ALL_TAB_COMMENTS,ALL_TAB_COLS,ALL_COL_COMMENTS,ALL_CONSTRAINTS,ALL_CONS_COLUMNS,ALL_PROCEDURES,ALL_ARGUMENTS,ALL_OBJECTS,ALL_TYPES,ALL_TYPE_ATTRS,ALL_SEQUENCES,ALL_COLL_TYPES,ORA_MINING_NUMBER_NT,ORA_MINING_VARCHAR2_NT,ALL_SYNONYMS generator.database.excludes= generator.generate.records=false generator.generate.deprecated=false