From e18deadb7c5d358f2d5a9d49b23e93b6d29f2f83 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 7 Jan 2012 13:38:46 +0000 Subject: [PATCH] [#1046] Generate Ingres table and column comments in generated source code --- .../org/jooq/util/ingres/IngresDatabase.java | 15 ++- .../util/ingres/IngresTableDefinition.java | 17 ++- .../org/jooq/util/ingres/ingres/$ingres.java | 4 +- .../org/jooq/util/ingres/ingres/Tables.java | 10 ++ .../ingres/ingres/tables/IidbComments.java | 69 ++++++++++ .../ingres/ingres/tables/IidbSubcomments.java | 74 +++++++++++ .../tables/records/IidbCommentsRecord.java | 105 ++++++++++++++++ .../tables/records/IidbSubcommentsRecord.java | 119 ++++++++++++++++++ .../lukas/ingres/$ingres.properties | 2 +- jOOQ-test/src/org/jooq/test/ingres/create.sql | 79 ++++++++---- .../test/ingres/generatedclasses/Tables.java | 10 +- .../generatedclasses/enums/TLanguage.java | 8 +- .../generatedclasses/tables/TAuthor.java | 16 +-- .../ingres/generatedclasses/tables/TBook.java | 18 +-- .../generatedclasses/tables/TBookStore.java | 6 +- .../tables/TBookToBookStore.java | 10 +- .../generatedclasses/tables/XUnused.java | 4 +- .../tables/records/TAuthorRecord.java | 32 ++--- .../tables/records/TBookRecord.java | 36 +++--- .../tables/records/TBookStoreRecord.java | 10 +- .../records/TBookToBookStoreRecord.java | 20 +-- .../tables/records/XUnusedRecord.java | 4 +- 22 files changed, 560 insertions(+), 108 deletions(-) create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbComments.java create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbSubcomments.java create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbCommentsRecord.java create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbSubcommentsRecord.java diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java index bef7706d66..3349d93b2a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java @@ -38,6 +38,7 @@ package org.jooq.util.ingres; import static org.jooq.impl.Factory.trim; import static org.jooq.util.ingres.ingres.tables.IiconstraintIndexes.IICONSTRAINT_INDEXES; import static org.jooq.util.ingres.ingres.tables.Iiconstraints.IICONSTRAINTS; +import static org.jooq.util.ingres.ingres.tables.IidbComments.IIDB_COMMENTS; import static org.jooq.util.ingres.ingres.tables.IiindexColumns.IIINDEX_COLUMNS; import static org.jooq.util.ingres.ingres.tables.Iiindexes.IIINDEXES; import static org.jooq.util.ingres.ingres.tables.IirefConstraints.IIREF_CONSTRAINTS; @@ -67,6 +68,7 @@ import org.jooq.util.UDTDefinition; import org.jooq.util.ingres.ingres.$ingresFactory; import org.jooq.util.ingres.ingres.tables.IiconstraintIndexes; import org.jooq.util.ingres.ingres.tables.Iiconstraints; +import org.jooq.util.ingres.ingres.tables.IidbComments; import org.jooq.util.ingres.ingres.tables.IiindexColumns; import org.jooq.util.ingres.ingres.tables.Iiindexes; import org.jooq.util.ingres.ingres.tables.IirefConstraints; @@ -205,13 +207,22 @@ public class IngresDatabase extends AbstractDatabase { protected List getTables0() throws SQLException { List result = new ArrayList(); - for (Record record : create().select(trim(Iitables.TABLE_NAME)) + for (Record record : create().select( + trim(Iitables.TABLE_NAME), + trim(IidbComments.LONG_REMARK)) .from(IITABLES) + .leftOuterJoin(IIDB_COMMENTS) + .on(Iitables.TABLE_NAME.equal(IidbComments.OBJECT_NAME)) + .and(Iitables.TABLE_OWNER.equal(IidbComments.OBJECT_OWNER)) + .and(IidbComments.OBJECT_TYPE.equal("T")) + .and(IidbComments.TEXT_SEQUENCE.equal(1L)) .where(Iitables.TABLE_OWNER.equal(getInputSchema())) .orderBy(trim(Iitables.TABLE_NAME)) .fetch()) { - result.add(new IngresTableDefinition(this, record.getValue(trim(Iitables.TABLE_NAME)))); + result.add(new IngresTableDefinition(this, + record.getValue(trim(Iitables.TABLE_NAME)), + record.getValue(trim(IidbComments.LONG_REMARK)))); } return result; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresTableDefinition.java index d8428e2025..6a93973e61 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresTableDefinition.java @@ -37,6 +37,7 @@ package org.jooq.util.ingres; import static org.jooq.impl.Factory.trim; import static org.jooq.util.ingres.ingres.tables.Iicolumns.IICOLUMNS; +import static org.jooq.util.ingres.ingres.tables.IidbSubcomments.IIDB_SUBCOMMENTS; import java.sql.SQLException; import java.util.ArrayList; @@ -50,14 +51,15 @@ import org.jooq.util.Database; import org.jooq.util.DefaultColumnDefinition; import org.jooq.util.DefaultDataTypeDefinition; import org.jooq.util.ingres.ingres.tables.Iicolumns; +import org.jooq.util.ingres.ingres.tables.IidbSubcomments; /** * @author Lukas Eder */ public class IngresTableDefinition extends AbstractTableDefinition { - public IngresTableDefinition(Database database, String name) { - super(database, name, null); + public IngresTableDefinition(Database database, String name, String comment) { + super(database, name, comment); } @Override @@ -71,8 +73,15 @@ public class IngresTableDefinition extends AbstractTableDefinition { Iicolumns.COLUMN_LENGTH, Iicolumns.COLUMN_SCALE, Iicolumns.COLUMN_ALWAYS_IDENT, - Iicolumns.COLUMN_BYDEFAULT_IDENT) + Iicolumns.COLUMN_BYDEFAULT_IDENT, + trim(IidbSubcomments.LONG_REMARK)) .from(IICOLUMNS) + .leftOuterJoin(IIDB_SUBCOMMENTS) + .on(IidbSubcomments.OBJECT_NAME.equal(Iicolumns.TABLE_NAME)) + .and(IidbSubcomments.OBJECT_OWNER.equal(Iicolumns.TABLE_OWNER)) + .and(IidbSubcomments.SUBOBJECT_NAME.equal(Iicolumns.COLUMN_NAME)) + .and(IidbSubcomments.SUBOBJECT_TYPE.equal("C")) + .and(IidbSubcomments.TEXT_SEQUENCE.equal(1L)) .where(Iicolumns.TABLE_OWNER.equal(getSchemaName())) .and(trim(Iicolumns.TABLE_NAME).equal(getName())) .orderBy(Iicolumns.COLUMN_SEQUENCE) @@ -120,7 +129,7 @@ public class IngresTableDefinition extends AbstractTableDefinition { type, record.getValueAsBoolean(Iicolumns.COLUMN_ALWAYS_IDENT, false) || record.getValueAsBoolean(Iicolumns.COLUMN_BYDEFAULT_IDENT, false), - null); + record.getValue(trim(IidbSubcomments.LONG_REMARK))); result.add(column); } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingres.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingres.java index 8fead80445..e92f532a07 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingres.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingres.java @@ -10,7 +10,7 @@ package org.jooq.util.ingres.ingres; comments = "This class is generated by jOOQ") public class $ingres extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 1445048247; + private static final long serialVersionUID = -1852298891; /** * The singleton instance of $ingres @@ -30,6 +30,8 @@ public class $ingres extends org.jooq.impl.SchemaImpl { org.jooq.util.ingres.ingres.tables.Iicolumns.IICOLUMNS, org.jooq.util.ingres.ingres.tables.IiconstraintIndexes.IICONSTRAINT_INDEXES, org.jooq.util.ingres.ingres.tables.Iiconstraints.IICONSTRAINTS, + org.jooq.util.ingres.ingres.tables.IidbComments.IIDB_COMMENTS, + org.jooq.util.ingres.ingres.tables.IidbSubcomments.IIDB_SUBCOMMENTS, org.jooq.util.ingres.ingres.tables.IiindexColumns.IIINDEX_COLUMNS, org.jooq.util.ingres.ingres.tables.Iiindexes.IIINDEXES, org.jooq.util.ingres.ingres.tables.IirefConstraints.IIREF_CONSTRAINTS, diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/Tables.java index fee013ffc7..10ec1de057 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/Tables.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/Tables.java @@ -27,6 +27,16 @@ public final class Tables { */ public static org.jooq.util.ingres.ingres.tables.Iiconstraints IICONSTRAINTS = org.jooq.util.ingres.ingres.tables.Iiconstraints.IICONSTRAINTS; + /** + * The table $ingres.iidb_comments + */ + public static org.jooq.util.ingres.ingres.tables.IidbComments IIDB_COMMENTS = org.jooq.util.ingres.ingres.tables.IidbComments.IIDB_COMMENTS; + + /** + * The table $ingres.iidb_subcomments + */ + public static org.jooq.util.ingres.ingres.tables.IidbSubcomments IIDB_SUBCOMMENTS = org.jooq.util.ingres.ingres.tables.IidbSubcomments.IIDB_SUBCOMMENTS; + /** * The table $ingres.iiindex_columns */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbComments.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbComments.java new file mode 100644 index 0000000000..6b06a11a0b --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbComments.java @@ -0,0 +1,69 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.ingres.ingres.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, + comments = "This class is generated by jOOQ") +public class IidbComments extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = 611369250; + + /** + * The singleton instance of iidb_comments + */ + public static final org.jooq.util.ingres.ingres.tables.IidbComments IIDB_COMMENTS = new org.jooq.util.ingres.ingres.tables.IidbComments(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.util.ingres.ingres.tables.records.IidbCommentsRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + */ + public static final org.jooq.TableField OBJECT_NAME = createField("object_name", org.jooq.impl.SQLDataType.CHAR, IIDB_COMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField OBJECT_OWNER = createField("object_owner", org.jooq.impl.SQLDataType.CHAR, IIDB_COMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField OBJECT_TYPE = createField("object_type", org.jooq.impl.SQLDataType.CHAR, IIDB_COMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField SHORT_REMARK = createField("short_remark", org.jooq.impl.SQLDataType.CHAR, IIDB_COMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField TEXT_SEQUENCE = createField("text_sequence", org.jooq.impl.SQLDataType.BIGINT, IIDB_COMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField LONG_REMARK = createField("long_remark", org.jooq.impl.SQLDataType.VARCHAR, IIDB_COMMENTS); + + /** + * No further instances allowed + */ + private IidbComments() { + super("iidb_comments", org.jooq.util.ingres.ingres.$ingres.$INGRES); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbSubcomments.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbSubcomments.java new file mode 100644 index 0000000000..637d1908f7 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbSubcomments.java @@ -0,0 +1,74 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.ingres.ingres.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, + comments = "This class is generated by jOOQ") +public class IidbSubcomments extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = 1161418926; + + /** + * The singleton instance of iidb_subcomments + */ + public static final org.jooq.util.ingres.ingres.tables.IidbSubcomments IIDB_SUBCOMMENTS = new org.jooq.util.ingres.ingres.tables.IidbSubcomments(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.util.ingres.ingres.tables.records.IidbSubcommentsRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + */ + public static final org.jooq.TableField OBJECT_NAME = createField("object_name", org.jooq.impl.SQLDataType.CHAR, IIDB_SUBCOMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField OBJECT_OWNER = createField("object_owner", org.jooq.impl.SQLDataType.CHAR, IIDB_SUBCOMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField SUBOBJECT_NAME = createField("subobject_name", org.jooq.impl.SQLDataType.CHAR, IIDB_SUBCOMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField SUBOBJECT_TYPE = createField("subobject_type", org.jooq.impl.SQLDataType.CHAR, IIDB_SUBCOMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField SHORT_REMARK = createField("short_remark", org.jooq.impl.SQLDataType.CHAR, IIDB_SUBCOMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField TEXT_SEQUENCE = createField("text_sequence", org.jooq.impl.SQLDataType.BIGINT, IIDB_SUBCOMMENTS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField LONG_REMARK = createField("long_remark", org.jooq.impl.SQLDataType.VARCHAR, IIDB_SUBCOMMENTS); + + /** + * No further instances allowed + */ + private IidbSubcomments() { + super("iidb_subcomments", org.jooq.util.ingres.ingres.$ingres.$INGRES); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbCommentsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbCommentsRecord.java new file mode 100644 index 0000000000..b067a5e0dc --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbCommentsRecord.java @@ -0,0 +1,105 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.ingres.ingres.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, + comments = "This class is generated by jOOQ") +public class IidbCommentsRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = -1137487826; + + /** + * An uncommented item + */ + public void setObjectName(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbComments.OBJECT_NAME, value); + } + + /** + * An uncommented item + */ + public java.lang.String getObjectName() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbComments.OBJECT_NAME); + } + + /** + * An uncommented item + */ + public void setObjectOwner(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbComments.OBJECT_OWNER, value); + } + + /** + * An uncommented item + */ + public java.lang.String getObjectOwner() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbComments.OBJECT_OWNER); + } + + /** + * An uncommented item + */ + public void setObjectType(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbComments.OBJECT_TYPE, value); + } + + /** + * An uncommented item + */ + public java.lang.String getObjectType() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbComments.OBJECT_TYPE); + } + + /** + * An uncommented item + */ + public void setShortRemark(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbComments.SHORT_REMARK, value); + } + + /** + * An uncommented item + */ + public java.lang.String getShortRemark() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbComments.SHORT_REMARK); + } + + /** + * An uncommented item + */ + public void setTextSequence(java.lang.Long value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbComments.TEXT_SEQUENCE, value); + } + + /** + * An uncommented item + */ + public java.lang.Long getTextSequence() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbComments.TEXT_SEQUENCE); + } + + /** + * An uncommented item + */ + public void setLongRemark(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbComments.LONG_REMARK, value); + } + + /** + * An uncommented item + */ + public java.lang.String getLongRemark() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbComments.LONG_REMARK); + } + + /** + * Create a detached IidbCommentsRecord + */ + public IidbCommentsRecord() { + super(org.jooq.util.ingres.ingres.tables.IidbComments.IIDB_COMMENTS); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbSubcommentsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbSubcommentsRecord.java new file mode 100644 index 0000000000..85226634e1 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbSubcommentsRecord.java @@ -0,0 +1,119 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.ingres.ingres.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.2"}, + comments = "This class is generated by jOOQ") +public class IidbSubcommentsRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = -144436970; + + /** + * An uncommented item + */ + public void setObjectName(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.OBJECT_NAME, value); + } + + /** + * An uncommented item + */ + public java.lang.String getObjectName() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.OBJECT_NAME); + } + + /** + * An uncommented item + */ + public void setObjectOwner(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.OBJECT_OWNER, value); + } + + /** + * An uncommented item + */ + public java.lang.String getObjectOwner() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.OBJECT_OWNER); + } + + /** + * An uncommented item + */ + public void setSubobjectName(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.SUBOBJECT_NAME, value); + } + + /** + * An uncommented item + */ + public java.lang.String getSubobjectName() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.SUBOBJECT_NAME); + } + + /** + * An uncommented item + */ + public void setSubobjectType(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.SUBOBJECT_TYPE, value); + } + + /** + * An uncommented item + */ + public java.lang.String getSubobjectType() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.SUBOBJECT_TYPE); + } + + /** + * An uncommented item + */ + public void setShortRemark(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.SHORT_REMARK, value); + } + + /** + * An uncommented item + */ + public java.lang.String getShortRemark() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.SHORT_REMARK); + } + + /** + * An uncommented item + */ + public void setTextSequence(java.lang.Long value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.TEXT_SEQUENCE, value); + } + + /** + * An uncommented item + */ + public java.lang.Long getTextSequence() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.TEXT_SEQUENCE); + } + + /** + * An uncommented item + */ + public void setLongRemark(java.lang.String value) { + setValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.LONG_REMARK, value); + } + + /** + * An uncommented item + */ + public java.lang.String getLongRemark() { + return getValue(org.jooq.util.ingres.ingres.tables.IidbSubcomments.LONG_REMARK); + } + + /** + * Create a detached IidbSubcommentsRecord + */ + public IidbSubcommentsRecord() { + super(org.jooq.util.ingres.ingres.tables.IidbSubcomments.IIDB_SUBCOMMENTS); + } +} diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/$ingres.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/$ingres.properties index 807703e79d..b6abe27b0d 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/$ingres.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/$ingres.properties @@ -7,7 +7,7 @@ jdbc.Password= generator=org.jooq.util.DefaultGenerator generator.database=org.jooq.util.ingres.IngresDatabase -generator.database.includes=iitables,iicolumns,iiconstraints,iiconstraint_indexes,iiindexes,iiindex_columns,iiref_constraints,iisequences +generator.database.includes=iitables,iicolumns,iiconstraints,iiconstraint_indexes,iiindexes,iiindex_columns,iiref_constraints,iisequences,iidb_comments,iidb_subcomments generator.database.excludes= generator.generate.records=false generator.generate.deprecated=false diff --git a/jOOQ-test/src/org/jooq/test/ingres/create.sql b/jOOQ-test/src/org/jooq/test/ingres/create.sql index 8488842b62..d47d262dc2 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/create.sql +++ b/jOOQ-test/src/org/jooq/test/ingres/create.sql @@ -34,7 +34,7 @@ DROP TABLE IF EXISTS t_identity_pk/ CREATE TABLE t_identity_pk ( id INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, val int, - + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) ) / @@ -57,7 +57,7 @@ CREATE TABLE t_booleans ( vc_boolean varchar(1), c_boolean char(1), n_boolean int, - + CONSTRAINT pk_t_booleans PRIMARY KEY (id) ) / @@ -66,7 +66,7 @@ CREATE TABLE t_triggers ( id_generated INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, id int, counter int, - + CONSTRAINT pk_t_triggers PRIMARY KEY (id_generated) ) / @@ -89,28 +89,32 @@ CREATE TABLE t_language ( description VARCHAR(50), description_english VARCHAR(50), id INTEGER NOT NULL, - + CONSTRAINT pk_t_language PRIMARY KEY (ID) ) / +COMMENT ON TABLE t_language IS 'An entity holding language master data'/ +COMMENT ON COLUMN t_language.id IS 'The language ID'/ +COMMENT ON COLUMN t_language.cd IS 'The language ISO code'/ +COMMENT ON COLUMN t_language.description IS 'The language description'/ CREATE TABLE t_658_11 ( id CHAR(3) NOT NULL, - + CONSTRAINT pk_t_658_11 PRIMARY KEY (id) ) / CREATE TABLE t_658_21 ( id INT NOT NULL, - + CONSTRAINT pk_t_658_21 PRIMARY KEY (id) ) / CREATE TABLE t_658_31 ( id bigint NOT NULL, - + CONSTRAINT pk_t_658_31 PRIMARY KEY (id) ) / @@ -118,7 +122,7 @@ CREATE TABLE t_658_31 ( CREATE TABLE t_658_12 ( id CHAR(3) NOT NULL, cd CHAR(3) NOT NULL, - + CONSTRAINT pk_t_658_12 PRIMARY KEY (id) ) / @@ -126,7 +130,7 @@ CREATE TABLE t_658_12 ( CREATE TABLE t_658_22 ( id INT NOT NULL, cd INT NOT NULL, - + CONSTRAINT pk_t_658_22 PRIMARY KEY (id) ) / @@ -134,7 +138,7 @@ CREATE TABLE t_658_22 ( CREATE TABLE t_658_32 ( id bigint NOT NULL, cd bigint NOT NULL, - + CONSTRAINT pk_t_658_32 PRIMARY KEY (id) ) / @@ -159,7 +163,7 @@ CREATE TABLE t_658_ref ( CREATE TABLE t_725_lob_test ( ID int NOT NULL, LOB BLOB NULL, - + CONSTRAINT pk_t_725_lob_test PRIMARY KEY (id) ) / @@ -178,17 +182,26 @@ CREATE TABLE t_author ( DATE_OF_BIRTH DATE, YEAR_OF_BIRTH INT, ADDRESS VARCHAR(50), - + CONSTRAINT pk_t_author PRIMARY KEY (ID) ) / +COMMENT ON TABLE t_author IS 'An entity holding authors of books'/ +COMMENT ON COLUMN t_author.id IS 'The author ID'/ +COMMENT ON COLUMN t_author.first_name IS 'The author''s first name'/ +COMMENT ON COLUMN t_author.last_name IS 'The author''s last name'/ +COMMENT ON COLUMN t_author.date_of_birth IS 'The author''s date of birth'/ +COMMENT ON COLUMN t_author.year_of_birth IS 'The author''s year of birth'/ +COMMENT ON COLUMN t_author.address IS 'The author''s address'/ CREATE TABLE t_book_details ( ID INT NOT NULL, - + CONSTRAINT pk_t_book_details PRIMARY KEY (ID) ) / +COMMENT ON TABLE t_book_details IS 'An unused details table' +/ CREATE TABLE t_book ( ID INT NOT NULL, @@ -200,29 +213,41 @@ CREATE TABLE t_book ( LANGUAGE_ID INT NOT NULL, CONTENT_TEXT CLOB, CONTENT_PDF BLOB, - + CONSTRAINT pk_t_book PRIMARY KEY (ID), CONSTRAINT fk_t_book_author_id FOREIGN KEY (AUTHOR_ID) REFERENCES T_AUTHOR(ID), CONSTRAINT fk_t_book_co_author_id FOREIGN KEY (CO_AUTHOR_ID) REFERENCES T_AUTHOR(ID), - CONSTRAINT fk_t_book_details_id FOREIGN KEY (DETAILS_ID) REFERENCES T_BOOK_DETAILS(ID), + CONSTRAINT fk_t_book_details_id FOREIGN KEY (DETAILS_ID) REFERENCES T_BOOK_DETAILS(ID), CONSTRAINT fk_t_book_language_id FOREIGN KEY (LANGUAGE_ID) REFERENCES T_LANGUAGE(ID) ) / +COMMENT ON TABLE t_book IS 'An entity holding books'/ +COMMENT ON COLUMN t_book.id IS 'The book ID'/ +COMMENT ON COLUMN t_book.author_id IS 'The author ID in entity ''author'''/ +COMMENT ON COLUMN t_book.title IS 'The book''s title'/ +COMMENT ON COLUMN t_book.published_in IS 'The year the book was published in'/ +COMMENT ON COLUMN t_book.language_id IS 'The language of the book'/ +COMMENT ON COLUMN t_book.content_text IS 'Some textual content of the book'/ +COMMENT ON COLUMN t_book.content_pdf IS 'Some binary content of the book'/ CREATE TABLE t_book_store ( name VARCHAR(400) NOT NULL, - + CONSTRAINT uk_t_book_store_name UNIQUE(name) ) / +COMMENT ON TABLE t_book_store IS 'A book store' +/ +COMMENT ON COLUMN t_book_store.name IS 'The books store name' +/ CREATE TABLE t_book_to_book_store ( book_store_name VARCHAR(400) NOT NULL, book_id INTEGER NOT NULL, stock INTEGER, - + CONSTRAINT pk_b2bs PRIMARY KEY(book_store_name, book_id), CONSTRAINT fk_b2bs_bs_name FOREIGN KEY (book_store_name) REFERENCES t_book_store (name) @@ -232,6 +257,10 @@ CREATE TABLE t_book_to_book_store ( ON DELETE CASCADE ) / +COMMENT ON TABLE t_book_to_book_store IS 'An m:n relation between books and book stores'/ +COMMENT ON COLUMN t_book_to_book_store.book_store_name IS 'The book store name'/ +COMMENT ON COLUMN t_book_to_book_store.book_id IS 'The book ID'/ +COMMENT ON COLUMN t_book_to_book_store.stock IS 'The number of books on stock'/ CREATE TABLE x_unused ( @@ -247,14 +276,16 @@ CREATE TABLE x_unused ( TYPE0 INT, PRIMARY_KEY INT, PRIMARYKEY INT, - NAME_REF VARCHAR(10), + NAME_REF VARCHAR(10), "FIELD 737" DECIMAL(25, 2), - + CONSTRAINT pk_x_unused PRIMARY KEY(ID, NAME), CONSTRAINT uk_x_unused_id UNIQUE(ID), CONSTRAINT fk_x_unused_self FOREIGN KEY(ID_REF, NAME_REF) REFERENCES X_UNUSED(ID, NAME) ) / +COMMENT ON TABLE x_unused IS 'An unused table in the same schema.' +/ CREATE TABLE t_639_numbers_table ( ID INT NOT NULL, @@ -270,7 +301,7 @@ CREATE TABLE t_639_numbers_table ( BIG_DECIMAL DECIMAL(22, 5), FLOAT REAL, DOUBLE FLOAT, - + CONSTRAINT pk_t_639_numbers_table PRIMARY KEY(ID) ) / @@ -278,7 +309,7 @@ CREATE TABLE t_639_numbers_table ( CREATE TABLE x_test_case_64_69 ( ID INT NOT NULL, UNUSED_ID INT, - + CONSTRAINT pk_x_test_case_64_69 PRIMARY KEY(ID), CONSTRAINT fk_x_test_case_64_69 FOREIGN KEY(UNUSED_ID) REFERENCES X_UNUSED(ID) ) @@ -287,7 +318,7 @@ CREATE TABLE x_test_case_64_69 ( CREATE TABLE x_test_case_71 ( ID INT NOT NULL, TEST_CASE_64_69_ID INT, - + CONSTRAINT pk_x_test_case_71 PRIMARY KEY(ID), CONSTRAINT fk_x_test_case_71 FOREIGN KEY(TEST_CASE_64_69_ID) REFERENCES X_TEST_CASE_64_69(ID) ) @@ -297,7 +328,7 @@ CREATE TABLE x_test_case_85 ( id int NOT NULL, x_unused_id int, x_unused_name VARCHAR(10), - + CONSTRAINT pk_x_test_case_85 PRIMARY KEY(ID), CONSTRAINT fk_x_test_case_85 FOREIGN KEY(x_unused_id, x_unused_name) REFERENCES X_UNUSED(id, name) ) @@ -307,7 +338,7 @@ CREATE VIEW V_LIBRARY (AUTHOR, TITLE) AS SELECT T_AUTHOR.FIRST_NAME || ' ' || T_AUTHOR.LAST_NAME, T_BOOK.TITLE FROM T_AUTHOR JOIN T_BOOK ON T_BOOK.AUTHOR_ID = T_AUTHOR.ID / - + CREATE VIEW v_author AS SELECT * FROM t_author / diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Tables.java index 45ed8c125d..82ce01b338 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Tables.java @@ -31,22 +31,22 @@ public final class Tables { public static org.jooq.test.ingres.generatedclasses.tables.T_785 T_785 = org.jooq.test.ingres.generatedclasses.tables.T_785.T_785; /** - * The table test.t_author + * An entity holding authors of books */ public static org.jooq.test.ingres.generatedclasses.tables.TAuthor T_AUTHOR = org.jooq.test.ingres.generatedclasses.tables.TAuthor.T_AUTHOR; /** - * The table test.t_book + * An entity holding books */ public static org.jooq.test.ingres.generatedclasses.tables.TBook T_BOOK = org.jooq.test.ingres.generatedclasses.tables.TBook.T_BOOK; /** - * The table test.t_book_store + * A book store */ public static org.jooq.test.ingres.generatedclasses.tables.TBookStore T_BOOK_STORE = org.jooq.test.ingres.generatedclasses.tables.TBookStore.T_BOOK_STORE; /** - * The table test.t_book_to_book_store + * An m:n relation between books and book stores */ public static org.jooq.test.ingres.generatedclasses.tables.TBookToBookStore T_BOOK_TO_BOOK_STORE = org.jooq.test.ingres.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE; @@ -101,7 +101,7 @@ public final class Tables { public static org.jooq.test.ingres.generatedclasses.tables.XTestCase_85 X_TEST_CASE_85 = org.jooq.test.ingres.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85; /** - * The table test.x_unused + * An unused table in the same schema. */ public static org.jooq.test.ingres.generatedclasses.tables.XUnused X_UNUSED = org.jooq.test.ingres.generatedclasses.tables.XUnused.X_UNUSED; diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/TLanguage.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/TLanguage.java index b088c449d0..80e18657dd 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/TLanguage.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/TLanguage.java @@ -5,6 +5,8 @@ package org.jooq.test.ingres.generatedclasses.enums; /** * This class is generated by jOOQ. + * + * An entity holding language master data */ public enum TLanguage implements org.jooq.MasterDataType { @@ -41,7 +43,7 @@ public enum TLanguage implements org.jooq.MasterDataType { } /** - * An uncommented item + * The language ID * * PRIMARY KEY */ @@ -50,14 +52,14 @@ public enum TLanguage implements org.jooq.MasterDataType { } /** - * An uncommented item + * The language ISO code */ public final java.lang.String getCd() { return cd; } /** - * An uncommented item + * The language description */ public final java.lang.String getDescription() { return description; diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TAuthor.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TAuthor.java index d0962eba83..9179444121 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TAuthor.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TAuthor.java @@ -5,10 +5,12 @@ package org.jooq.test.ingres.generatedclasses.tables; /** * This class is generated by jOOQ. + * + * An entity holding authors of books */ public class TAuthor extends org.jooq.impl.UpdatableTableImpl { - private static final long serialVersionUID = 178570455; + private static final long serialVersionUID = 993654145; /** * The singleton instance of t_author @@ -29,34 +31,34 @@ public class TAuthor extends org.jooq.impl.UpdatableTableImpl ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, T_AUTHOR); /** - * An uncommented item + * The author's first name */ public static final org.jooq.TableField FIRST_NAME = createField("first_name", org.jooq.impl.SQLDataType.VARCHAR, T_AUTHOR); /** - * An uncommented item + * The author's last name */ public static final org.jooq.TableField LAST_NAME = createField("last_name", org.jooq.impl.SQLDataType.VARCHAR, T_AUTHOR); /** - * An uncommented item + * The author's date of birth */ public static final org.jooq.TableField DATE_OF_BIRTH = createField("date_of_birth", org.jooq.impl.SQLDataType.DATE, T_AUTHOR); /** - * An uncommented item + * The author's year of birth */ public static final org.jooq.TableField YEAR_OF_BIRTH = createField("year_of_birth", org.jooq.impl.SQLDataType.INTEGER, T_AUTHOR); /** - * An uncommented item + * The author's address */ public static final org.jooq.TableField ADDRESS = createField("address", org.jooq.impl.SQLDataType.VARCHAR, T_AUTHOR); diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TBook.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TBook.java index 08b9fcfa13..c43e0e52a4 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TBook.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TBook.java @@ -5,10 +5,12 @@ package org.jooq.test.ingres.generatedclasses.tables; /** * This class is generated by jOOQ. + * + * An entity holding books */ public class TBook extends org.jooq.impl.UpdatableTableImpl { - private static final long serialVersionUID = -1544401516; + private static final long serialVersionUID = 315843719; /** * The singleton instance of t_book @@ -29,14 +31,14 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, T_BOOK); /** - * An uncommented item + * The author ID in entity 'author' *

*

 	 * FOREIGN KEY [test.t_book.author_id]
@@ -61,17 +63,17 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl DETAILS_ID = createField("details_id", org.jooq.impl.SQLDataType.INTEGER, T_BOOK);
 
 	/**
-	 * An uncommented item
+	 * The book's title
 	 */
 	public static final org.jooq.TableField TITLE = createField("title", org.jooq.impl.SQLDataType.VARCHAR, T_BOOK);
 
 	/**
-	 * An uncommented item
+	 * The year the book was published in
 	 */
 	public static final org.jooq.TableField PUBLISHED_IN = createField("published_in", org.jooq.impl.SQLDataType.INTEGER, T_BOOK);
 
 	/**
-	 * An uncommented item
+	 * The language of the book
 	 * 

*

 	 * FOREIGN KEY [test.t_book.language_id]
@@ -81,12 +83,12 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl LANGUAGE_ID = createField("language_id", org.jooq.impl.SQLDataType.INTEGER.asMasterDataType(org.jooq.test.ingres.generatedclasses.enums.TLanguage.class), T_BOOK);
 
 	/**
-	 * An uncommented item
+	 * Some textual content of the book
 	 */
 	public static final org.jooq.TableField CONTENT_TEXT = createField("content_text", org.jooq.impl.SQLDataType.LONGVARCHAR, T_BOOK);
 
 	/**
-	 * An uncommented item
+	 * Some binary content of the book
 	 */
 	public static final org.jooq.TableField CONTENT_PDF = createField("content_pdf", org.jooq.impl.SQLDataType.LONGVARBINARY, T_BOOK);
 
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TBookStore.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TBookStore.java
index d7ee656151..129d37bd1b 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TBookStore.java
@@ -5,10 +5,12 @@ package org.jooq.test.ingres.generatedclasses.tables;
 
 /**
  * This class is generated by jOOQ.
+ *
+ * A book store
  */
 public class TBookStore extends org.jooq.impl.UpdatableTableImpl {
 
-	private static final long serialVersionUID = 104941227;
+	private static final long serialVersionUID = -1324599972;
 
 	/**
 	 * The singleton instance of t_book_store
@@ -29,7 +31,7 @@ public class TBookStore extends org.jooq.impl.UpdatableTableImpl {
 
-	private static final long serialVersionUID = -1205400678;
+	private static final long serialVersionUID = 1141755432;
 
 	/**
 	 * The singleton instance of t_book_to_book_store
@@ -29,7 +31,7 @@ public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl
@@ -41,7 +43,7 @@ public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl BOOK_STORE_NAME = createField("book_store_name", org.jooq.impl.SQLDataType.VARCHAR, T_BOOK_TO_BOOK_STORE);
 
 	/**
-	 * An uncommented item
+	 * The book ID
 	 * 
 	 * PRIMARY KEY
 	 * 

@@ -53,7 +55,7 @@ public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl BOOK_ID = createField("book_id", org.jooq.impl.SQLDataType.INTEGER, T_BOOK_TO_BOOK_STORE); /** - * An uncommented item + * The number of books on stock */ public static final org.jooq.TableField STOCK = createField("stock", org.jooq.impl.SQLDataType.INTEGER, T_BOOK_TO_BOOK_STORE); diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/XUnused.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/XUnused.java index 82de89c4be..6bc39689fe 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/XUnused.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/XUnused.java @@ -5,10 +5,12 @@ package org.jooq.test.ingres.generatedclasses.tables; /** * This class is generated by jOOQ. + * + * An unused table in the same schema. */ public class XUnused extends org.jooq.impl.UpdatableTableImpl { - private static final long serialVersionUID = -877122010; + private static final long serialVersionUID = 1601151442; /** * The singleton instance of x_unused diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TAuthorRecord.java index cc1477c84f..6d44143ff2 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TAuthorRecord.java @@ -5,13 +5,15 @@ package org.jooq.test.ingres.generatedclasses.tables.records; /** * This class is generated by jOOQ. + * + * An entity holding authors of books */ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 1079998939; + private static final long serialVersionUID = 561009337; /** - * An uncommented item + * The author ID * * PRIMARY KEY */ @@ -20,7 +22,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 1592085077; + private static final long serialVersionUID = 1207455111; /** - * An uncommented item + * The book ID * * PRIMARY KEY */ @@ -20,7 +22,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl *

 	 * FOREIGN KEY [test.t_book.author_id]
@@ -53,7 +55,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl
 	 * 
 	 * FOREIGN KEY [test.t_book.author_id]
@@ -65,7 +67,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl
 	 * 
 	 * FOREIGN KEY [test.t_book.author_id]
@@ -133,35 +135,35 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl
 	 * 
 	 * FOREIGN KEY [test.t_book.language_id]
@@ -173,7 +175,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl
 	 * 
 	 * FOREIGN KEY [test.t_book.language_id]
@@ -185,28 +187,28 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl {
 
-	private static final long serialVersionUID = -1202743867;
+	private static final long serialVersionUID = 1871368730;
 
 	/**
-	 * An uncommented item
+	 * The books store name
 	 * 
 	 * PRIMARY KEY
 	 */
@@ -20,7 +22,7 @@ public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl {
 
-	private static final long serialVersionUID = -625579407;
+	private static final long serialVersionUID = 1108273408;
 
 	/**
-	 * An uncommented item
+	 * The book store name
 	 * 
 	 * PRIMARY KEY
 	 * 

@@ -25,7 +27,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl @@ -39,7 +41,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl @@ -56,7 +58,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl @@ -70,7 +72,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl @@ -84,7 +86,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl @@ -101,14 +103,14 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 212268384; + private static final long serialVersionUID = -1529556172; /** * An uncommented item