From 6ccc8218f91c6dbc16c33f75d672cc52b99c1ef6 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 4 Aug 2014 11:21:13 +0200 Subject: [PATCH] [#3488] Compilation error in generated code, when a similar tables T_A and TA exist - Regenerate Schema --- .../jooq/test/h2/generatedclasses/Keys.java | 2 + .../jooq/test/h2/generatedclasses/Public.java | 3 +- .../jooq/test/h2/generatedclasses/Tables.java | 5 + .../tables/T_3488AbcXyzEee.java | 84 +++++++++++ .../tables/daos/T_3488AbcXyzEeeDao.java | 47 ++++++ .../tables/interfaces/IT_3488AbcXyzEee.java | 35 +++++ .../tables/pojos/T_3488AbcXyzEee.java | 57 ++++++++ .../tables/records/T_3488AbcXyzEeeRecord.java | 136 ++++++++++++++++++ 8 files changed, 368 insertions(+), 1 deletion(-) create mode 100644 jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/T_3488AbcXyzEee.java create mode 100644 jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/daos/T_3488AbcXyzEeeDao.java create mode 100644 jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/interfaces/IT_3488AbcXyzEee.java create mode 100644 jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/pojos/T_3488AbcXyzEee.java create mode 100644 jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/records/T_3488AbcXyzEeeRecord.java diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Keys.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Keys.java index c8185cae0f..55501588df 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Keys.java +++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Keys.java @@ -34,6 +34,7 @@ public class Keys { public static final org.jooq.UniqueKey PK_T_725_LOB_TEST = UniqueKeys0.PK_T_725_LOB_TEST; public static final org.jooq.UniqueKey PK_T_2698 = UniqueKeys0.PK_T_2698; public static final org.jooq.UniqueKey PK_T_2718 = UniqueKeys0.PK_T_2718; + public static final org.jooq.UniqueKey PK_T_3488_1 = UniqueKeys0.PK_T_3488_1; public static final org.jooq.UniqueKey PK_T_AUTHOR = UniqueKeys0.PK_T_AUTHOR; public static final org.jooq.UniqueKey PK_T_BOOK = UniqueKeys0.PK_T_BOOK; public static final org.jooq.UniqueKey UK_T_BOOK_STORE_NAME = UniqueKeys0.UK_T_BOOK_STORE_NAME; @@ -88,6 +89,7 @@ public class Keys { public static final org.jooq.UniqueKey PK_T_725_LOB_TEST = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST, org.jooq.test.h2.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST.ID); public static final org.jooq.UniqueKey PK_T_2698 = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.T_2698.T_2698, org.jooq.test.h2.generatedclasses.tables.T_2698.T_2698.ID); public static final org.jooq.UniqueKey PK_T_2718 = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.T_2718.T_2718, org.jooq.test.h2.generatedclasses.tables.T_2718.T_2718.EXCLUDE_ME); + public static final org.jooq.UniqueKey PK_T_3488_1 = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE, org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE.ID); public static final org.jooq.UniqueKey PK_T_AUTHOR = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.TAuthor.T_AUTHOR, org.jooq.test.h2.generatedclasses.tables.TAuthor.T_AUTHOR.ID); public static final org.jooq.UniqueKey PK_T_BOOK = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.h2.generatedclasses.tables.TBook.T_BOOK.ID); public static final org.jooq.UniqueKey UK_T_BOOK_STORE_NAME = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.h2.generatedclasses.tables.TBookStore.T_BOOK_STORE.NAME); diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Public.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Public.java index ea02102a3c..87478511f9 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Public.java +++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Public.java @@ -9,7 +9,7 @@ package org.jooq.test.h2.generatedclasses; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Public extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -616927962; + private static final long serialVersionUID = -599355265; /** * The singleton instance of PUBLIC @@ -59,6 +59,7 @@ public class Public extends org.jooq.impl.SchemaImpl { org.jooq.test.h2.generatedclasses.tables.T_2486.T_2486, org.jooq.test.h2.generatedclasses.tables.T_2698.T_2698, org.jooq.test.h2.generatedclasses.tables.T_2718.T_2718, + org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE, org.jooq.test.h2.generatedclasses.tables.TAuthor.T_AUTHOR, org.jooq.test.h2.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.h2.generatedclasses.tables.TBookStore.T_BOOK_STORE, diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Tables.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Tables.java index 2963bcffff..37a4c04df4 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Tables.java +++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Tables.java @@ -81,6 +81,11 @@ public class Tables { */ public static final org.jooq.test.h2.generatedclasses.tables.T_2718 T_2718 = org.jooq.test.h2.generatedclasses.tables.T_2718.T_2718; + /** + * The table PUBLIC.T_3488_ABC_XYZ_EEE + */ + public static final org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee T_3488_ABC_XYZ_EEE = org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE; + /** * An entity holding authors of books */ diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/T_3488AbcXyzEee.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/T_3488AbcXyzEee.java new file mode 100644 index 0000000000..ce600708ba --- /dev/null +++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/T_3488AbcXyzEee.java @@ -0,0 +1,84 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class T_3488AbcXyzEee extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = -585275313; + + /** + * The singleton instance of PUBLIC.T_3488_ABC_XYZ_EEE + */ + public static final org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee T_3488_ABC_XYZ_EEE = new org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return org.jooq.test.h2.generatedclasses.tables.records.T_3488AbcXyzEeeRecord.class; + } + + /** + * The column PUBLIC.T_3488_ABC_XYZ_EEE.ID. + */ + public final org.jooq.TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * Create a PUBLIC.T_3488_ABC_XYZ_EEE table reference + */ + public T_3488AbcXyzEee() { + this("T_3488_ABC_XYZ_EEE", null); + } + + /** + * Create an aliased PUBLIC.T_3488_ABC_XYZ_EEE table reference + */ + public T_3488AbcXyzEee(java.lang.String alias) { + this(alias, org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE); + } + + private T_3488AbcXyzEee(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private T_3488AbcXyzEee(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field[] parameters) { + super(alias, org.jooq.test.h2.generatedclasses.Public.PUBLIC, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.UniqueKey getPrimaryKey() { + return org.jooq.test.h2.generatedclasses.Keys.PK_T_3488_1; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.h2.generatedclasses.Keys.PK_T_3488_1); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee as(java.lang.String alias) { + return new org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee(alias, this); + } + + /** + * Rename this table + */ + public org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee rename(java.lang.String name) { + return new org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee(name, null); + } +} diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/daos/T_3488AbcXyzEeeDao.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/daos/T_3488AbcXyzEeeDao.java new file mode 100644 index 0000000000..90ea49e8fe --- /dev/null +++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/daos/T_3488AbcXyzEeeDao.java @@ -0,0 +1,47 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables.daos; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class T_3488AbcXyzEeeDao extends org.jooq.impl.DAOImpl { + + /** + * Create a new T_3488AbcXyzEeeDao without any configuration + */ + public T_3488AbcXyzEeeDao() { + super(org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE, org.jooq.test.h2.generatedclasses.tables.pojos.T_3488AbcXyzEee.class); + } + + /** + * Create a new T_3488AbcXyzEeeDao with an attached configuration + */ + public T_3488AbcXyzEeeDao(org.jooq.Configuration configuration) { + super(org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE, org.jooq.test.h2.generatedclasses.tables.pojos.T_3488AbcXyzEee.class, configuration); + } + + /** + * {@inheritDoc} + */ + @Override + protected java.lang.Integer getId(org.jooq.test.h2.generatedclasses.tables.pojos.T_3488AbcXyzEee object) { + return object.getId(); + } + + /** + * Fetch records that have ID IN (values) + */ + public java.util.List fetchById(java.lang.Integer... values) { + return fetch(org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE.ID, values); + } + + /** + * Fetch a unique record that has ID = value + */ + public org.jooq.test.h2.generatedclasses.tables.pojos.T_3488AbcXyzEee fetchOneById(java.lang.Integer value) { + return fetchOne(org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE.ID, value); + } +} diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/interfaces/IT_3488AbcXyzEee.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/interfaces/IT_3488AbcXyzEee.java new file mode 100644 index 0000000000..4b3706eb5b --- /dev/null +++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/interfaces/IT_3488AbcXyzEee.java @@ -0,0 +1,35 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables.interfaces; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public interface IT_3488AbcXyzEee extends java.io.Serializable { + + /** + * Setter for PUBLIC.T_3488_ABC_XYZ_EEE.ID. + */ + public IT_3488AbcXyzEee setId(java.lang.Integer value); + + /** + * Getter for PUBLIC.T_3488_ABC_XYZ_EEE.ID. + */ + public java.lang.Integer getId(); + + // ------------------------------------------------------------------------- + // FROM and INTO + // ------------------------------------------------------------------------- + + /** + * Load data from another generated Record/POJO implementing the common interface IT_3488AbcXyzEee + */ + public void from(org.jooq.test.h2.generatedclasses.tables.interfaces.IT_3488AbcXyzEee from); + + /** + * Copy data into another generated Record/POJO implementing the common interface IT_3488AbcXyzEee + */ + public E into(E into); +} diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/pojos/T_3488AbcXyzEee.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/pojos/T_3488AbcXyzEee.java new file mode 100644 index 0000000000..dc9d776fd1 --- /dev/null +++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/pojos/T_3488AbcXyzEee.java @@ -0,0 +1,57 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables.pojos; + +/** + * This is a POJO for table T_3488_ABC_XYZ_EEE. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class T_3488AbcXyzEee implements org.jooq.test.h2.generatedclasses.tables.interfaces.IT_3488AbcXyzEee { + + private static final long serialVersionUID = 790140509; + + private java.lang.Integer id; + + public T_3488AbcXyzEee() {} + + public T_3488AbcXyzEee( + java.lang.Integer id + ) { + this.id = id; + } + + @Override + public java.lang.Integer getId() { + return this.id; + } + + @Override + public T_3488AbcXyzEee setId(java.lang.Integer id) { + this.id = id; + return this; + } + + // ------------------------------------------------------------------------- + // FROM and INTO + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public void from(org.jooq.test.h2.generatedclasses.tables.interfaces.IT_3488AbcXyzEee from) { + setId(from.getId()); + } + + /** + * {@inheritDoc} + */ + @Override + public E into(E into) { + into.from(this); + return into; + } + + // Here, a toString() method could be generated +} diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/records/T_3488AbcXyzEeeRecord.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/records/T_3488AbcXyzEeeRecord.java new file mode 100644 index 0000000000..1872508276 --- /dev/null +++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/records/T_3488AbcXyzEeeRecord.java @@ -0,0 +1,136 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class T_3488AbcXyzEeeRecord extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record1, org.jooq.test.h2.generatedclasses.tables.interfaces.IT_3488AbcXyzEee { + + private static final long serialVersionUID = -1883920984; + + /** + * Setter for PUBLIC.T_3488_ABC_XYZ_EEE.ID. + */ + @Override + public T_3488AbcXyzEeeRecord setId(java.lang.Integer value) { + setValue(0, value); + return this; + } + + /** + * Getter for PUBLIC.T_3488_ABC_XYZ_EEE.ID. + */ + @Override + public java.lang.Integer getId() { + return (java.lang.Integer) getValue(0); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record1 key() { + return (org.jooq.Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record1 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row1 fieldsRow() { + return (org.jooq.Row1) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row1 valuesRow() { + return (org.jooq.Row1) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE.ID; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getId(); + } + + /** + * {@inheritDoc} + */ + @Override + public T_3488AbcXyzEeeRecord value1(java.lang.Integer value) { + setId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public T_3488AbcXyzEeeRecord values(java.lang.Integer value1) { + return this; + } + + // ------------------------------------------------------------------------- + // FROM and INTO + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public void from(org.jooq.test.h2.generatedclasses.tables.interfaces.IT_3488AbcXyzEee from) { + setId(from.getId()); + } + + /** + * {@inheritDoc} + */ + @Override + public E into(E into) { + into.from(this); + return into; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached T_3488AbcXyzEeeRecord + */ + public T_3488AbcXyzEeeRecord() { + super(org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE); + } + + /** + * Create a detached, initialised T_3488AbcXyzEeeRecord + */ + public T_3488AbcXyzEeeRecord(java.lang.Integer id) { + super(org.jooq.test.h2.generatedclasses.tables.T_3488AbcXyzEee.T_3488_ABC_XYZ_EEE); + + setValue(0, id); + } +}