diff --git a/jOOQ-test/src/org/jooq/test/ase/create.sql b/jOOQ-test/src/org/jooq/test/ase/create.sql index dbdf3e6c57..2a1002e063 100644 --- a/jOOQ-test/src/org/jooq/test/ase/create.sql +++ b/jOOQ-test/src/org/jooq/test/ase/create.sql @@ -2,6 +2,16 @@ DROP VIEW v_library/ DROP VIEW v_author/ DROP VIEW v_book/ +DROP PROCEDURE p_unused/ +DROP PROCEDURE p_author_exists/ +DROP PROCEDURE p_create_author/ +DROP PROCEDURE p_create_author_by_name/ +DROP PROCEDURE p391/ +DROP FUNCTION f_author_exists/ +DROP FUNCTION f_one/ +DROP FUNCTION f_number/ +DROP FUNCTION f317/ + DROP TRIGGER t_triggers_trigger/ DROP TABLE t_triggers/ @@ -28,16 +38,22 @@ DROP TABLE t_658_32/ DROP TABLE t_725_lob_test/ DROP TABLE t_785/ DROP TABLE t_booleans/ +DROP TABLE t_identity/ +DROP TABLE t_identity_pk/ -DROP PROCEDURE p_unused/ -DROP PROCEDURE p_author_exists/ -DROP PROCEDURE p_create_author/ -DROP PROCEDURE p_create_author_by_name/ -DROP PROCEDURE p391/ -DROP FUNCTION f_author_exists/ -DROP FUNCTION f_one/ -DROP FUNCTION f_number/ -DROP FUNCTION f317/ +CREATE TABLE t_identity_pk ( + id INTEGER IDENTITY NOT NULL, + val int, + + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) +) +/ + +CREATE TABLE t_identity ( + id INTEGER IDENTITY NOT NULL, + val int +) +/ CREATE TABLE t_booleans ( id int, diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Dbo.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Dbo.java index d51bd9f5a5..98dc1af82b 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Dbo.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Dbo.java @@ -10,7 +10,7 @@ package org.jooq.test.ase.generatedclasses; comments = "This class is generated by jOOQ") public class Dbo extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 1569831581; + private static final long serialVersionUID = -1955652184; /** * The singleton instance of dbo @@ -41,6 +41,8 @@ public class Dbo extends org.jooq.impl.SchemaImpl { org.jooq.test.ase.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.ase.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.ase.generatedclasses.tables.TBooleans.T_BOOLEANS, + org.jooq.test.ase.generatedclasses.tables.TIdentity.T_IDENTITY, + org.jooq.test.ase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.ase.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.ase.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.ase.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Keys.java index e68cb65c83..fd0d6058c6 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Keys.java @@ -14,6 +14,8 @@ package org.jooq.test.ase.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_t_identity = createIdentity(org.jooq.test.ase.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.ase.generatedclasses.tables.TIdentity.ID); + public static final org.jooq.Identity IDENTITY_t_identity_pk = createIdentity(org.jooq.test.ase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.ase.generatedclasses.tables.TIdentityPk.ID); public static final org.jooq.Identity IDENTITY_t_triggers = createIdentity(org.jooq.test.ase.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.ase.generatedclasses.tables.TTriggers.ID_GENERATED); // UNIQUE and PRIMARY KEY definitions @@ -26,6 +28,7 @@ public class Keys extends org.jooq.impl.AbstractKeys { public static final org.jooq.UniqueKey t_book_store__uk_t_book_store_name = createUniqueKey(org.jooq.test.ase.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.ase.generatedclasses.tables.TBookStore.NAME); public static final org.jooq.UniqueKey t_book_to_book_store__pk_b2bs = createUniqueKey(org.jooq.test.ase.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.ase.generatedclasses.tables.TBookToBookStore.BOOK_STORE_NAME, org.jooq.test.ase.generatedclasses.tables.TBookToBookStore.BOOK_ID); public static final org.jooq.UniqueKey t_booleans__pk_t_booleans = createUniqueKey(org.jooq.test.ase.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.ase.generatedclasses.tables.TBooleans.ID); + public static final org.jooq.UniqueKey t_identity_pk__pk_t_identity_pk = createUniqueKey(org.jooq.test.ase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.ase.generatedclasses.tables.TIdentityPk.ID); public static final org.jooq.UniqueKey t_triggers__pk_t_triggers = createUniqueKey(org.jooq.test.ase.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.ase.generatedclasses.tables.TTriggers.ID_GENERATED); public static final org.jooq.UniqueKey x_test_case_64_69__pk_x_test_case_64_69 = createUniqueKey(org.jooq.test.ase.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.ase.generatedclasses.tables.XTestCase_64_69.ID); public static final org.jooq.UniqueKey x_test_case_71__pk_x_test_case_71 = createUniqueKey(org.jooq.test.ase.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.ase.generatedclasses.tables.XTestCase_71.ID); diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Tables.java index c42f842bd8..1d352689f7 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/Tables.java @@ -82,6 +82,16 @@ public final class Tables { */ public static org.jooq.test.ase.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.ase.generatedclasses.tables.TBooleans.T_BOOLEANS; + /** + * The table dbo.t_identity + */ + public static org.jooq.test.ase.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.ase.generatedclasses.tables.TIdentity.T_IDENTITY; + + /** + * The table dbo.t_identity_pk + */ + public static org.jooq.test.ase.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.ase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + /** * The table dbo.t_triggers */ diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TIdentity.java new file mode 100644 index 0000000000..6ddc0bffe3 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TIdentity.java @@ -0,0 +1,54 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.ase.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentity extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = -344225234; + + /** + * The singleton instance of t_identity + */ + public static final org.jooq.test.ase.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.ase.generatedclasses.tables.TIdentity(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.ase.generatedclasses.tables.records.TIdentityRecord.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 ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * No further instances allowed + */ + private TIdentity() { + super("t_identity", org.jooq.test.ase.generatedclasses.Dbo.DBO); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.ase.generatedclasses.Keys.IDENTITY_t_identity; + } +} diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..47bda9e7b9 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,67 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.ase.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = 647734356; + + /** + * The singleton instance of t_identity_pk + */ + public static final org.jooq.test.ase.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.ase.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.ase.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public static final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("t_identity_pk", org.jooq.test.ase.generatedclasses.Dbo.DBO); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.ase.generatedclasses.Keys.IDENTITY_t_identity_pk; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.ase.generatedclasses.Keys.t_identity_pk__pk_t_identity_pk; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.ase.generatedclasses.Keys.t_identity_pk__pk_t_identity_pk); + } +} diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..ff55bf5ef8 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.ase.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = 587502749; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.ase.generatedclasses.tables.TIdentityPk.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.ase.generatedclasses.tables.TIdentityPk.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.ase.generatedclasses.tables.TIdentityPk.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.ase.generatedclasses.tables.TIdentityPk.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.ase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityRecord.java new file mode 100644 index 0000000000..50d1dcfb99 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityRecord.java @@ -0,0 +1,49 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.ase.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = 386500234; + + /** + * An uncommented item + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.ase.generatedclasses.tables.TIdentity.ID, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.ase.generatedclasses.tables.TIdentity.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.ase.generatedclasses.tables.TIdentity.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.ase.generatedclasses.tables.TIdentity.VAL); + } + + /** + * Create a detached TIdentityRecord + */ + public TIdentityRecord() { + super(org.jooq.test.ase.generatedclasses.tables.TIdentity.T_IDENTITY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/ase/reset.sql b/jOOQ-test/src/org/jooq/test/ase/reset.sql index b8f50967fd..cbdd3aaec6 100644 --- a/jOOQ-test/src/org/jooq/test/ase/reset.sql +++ b/jOOQ-test/src/org/jooq/test/ase/reset.sql @@ -11,6 +11,8 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity/ +DELETE FROM t_identity_pk/ INSERT INTO t_language (id, cd, description, description_english) VALUES (1, 'en', 'English', 'English')/ INSERT INTO t_language (id, cd, description, description_english) VALUES (2, 'de', 'Deutsch', 'German')/ diff --git a/jOOQ-test/src/org/jooq/test/db2/create.sql b/jOOQ-test/src/org/jooq/test/db2/create.sql index 7be00e178a..e62d3b7084 100644 --- a/jOOQ-test/src/org/jooq/test/db2/create.sql +++ b/jOOQ-test/src/org/jooq/test/db2/create.sql @@ -39,6 +39,22 @@ DROP TABLE t_658_32/ DROP TABLE t_725_lob_test/ DROP TABLE t_785/ DROP TABLE t_booleans/ +DROP TABLE t_identity/ +DROP TABLE t_identity_pk/ + +CREATE TABLE t_identity_pk ( + id INTEGER GENERATED BY DEFAULT AS IDENTITY, + val int, + + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) +) +/ + +CREATE TABLE t_identity ( + id INTEGER GENERATED BY DEFAULT AS IDENTITY, + val int +) +/ CREATE TABLE t_booleans ( id int not null, diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Keys.java index a7eab63330..598824a1b3 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Keys.java @@ -14,6 +14,8 @@ package org.jooq.test.db2.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_T_IDENTITY = createIdentity(org.jooq.test.db2.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.db2.generatedclasses.tables.TIdentity.ID); + public static final org.jooq.Identity IDENTITY_T_IDENTITY_PK = createIdentity(org.jooq.test.db2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.db2.generatedclasses.tables.TIdentityPk.ID); // UNIQUE and PRIMARY KEY definitions public static final org.jooq.UniqueKey T_639_NUMBERS_TABLE__PK_T_639_NUMBERS_TABLE = createUniqueKey(org.jooq.test.db2.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.db2.generatedclasses.tables.T_639NumbersTable.ID); @@ -25,6 +27,7 @@ public class Keys extends org.jooq.impl.AbstractKeys { public static final org.jooq.UniqueKey T_BOOK_STORE__UK_T_BOOK_STORE_NAME = createUniqueKey(org.jooq.test.db2.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.db2.generatedclasses.tables.TBookStore.NAME); public static final org.jooq.UniqueKey T_BOOK_TO_BOOK_STORE__PK_B2BS = createUniqueKey(org.jooq.test.db2.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.db2.generatedclasses.tables.TBookToBookStore.BOOK_STORE_NAME, org.jooq.test.db2.generatedclasses.tables.TBookToBookStore.BOOK_ID); public static final org.jooq.UniqueKey T_BOOLEANS__PK_T_BOOLEANS = createUniqueKey(org.jooq.test.db2.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.db2.generatedclasses.tables.TBooleans.ID); + public static final org.jooq.UniqueKey T_IDENTITY_PK__PK_T_IDENTITY_PK = createUniqueKey(org.jooq.test.db2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.db2.generatedclasses.tables.TIdentityPk.ID); public static final org.jooq.UniqueKey T_TRIGGERS__PK_T_TRIGGERS = createUniqueKey(org.jooq.test.db2.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.db2.generatedclasses.tables.TTriggers.ID_GENERATED); public static final org.jooq.UniqueKey X_TEST_CASE_64_69__PK_X_TEST_CASE_64_69 = createUniqueKey(org.jooq.test.db2.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.db2.generatedclasses.tables.XTestCase_64_69.ID); public static final org.jooq.UniqueKey X_TEST_CASE_71__PK_X_TEST_CASE_71 = createUniqueKey(org.jooq.test.db2.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.db2.generatedclasses.tables.XTestCase_71.ID); diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Lukas.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Lukas.java index 575aa73c03..14e58d9329 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Lukas.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Lukas.java @@ -10,7 +10,7 @@ package org.jooq.test.db2.generatedclasses; comments = "This class is generated by jOOQ") public class Lukas extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 2053382866; + private static final long serialVersionUID = -1014432687; /** * The singleton instance of LUKAS @@ -45,6 +45,8 @@ public class Lukas extends org.jooq.impl.SchemaImpl { org.jooq.test.db2.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.db2.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.db2.generatedclasses.tables.TBooleans.T_BOOLEANS, + org.jooq.test.db2.generatedclasses.tables.TIdentity.T_IDENTITY, + org.jooq.test.db2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.db2.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.db2.generatedclasses.tables.VAuthor.V_AUTHOR, org.jooq.test.db2.generatedclasses.tables.VBook.V_BOOK, diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Tables.java index e0adb6e086..a4bbe13384 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/Tables.java @@ -67,6 +67,16 @@ public final class Tables { */ public static org.jooq.test.db2.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.db2.generatedclasses.tables.TBooleans.T_BOOLEANS; + /** + * The table LUKAS.T_IDENTITY + */ + public static org.jooq.test.db2.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.db2.generatedclasses.tables.TIdentity.T_IDENTITY; + + /** + * The table LUKAS.T_IDENTITY_PK + */ + public static org.jooq.test.db2.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.db2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + /** * The table LUKAS.T_TRIGGERS */ diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/TIdentity.java new file mode 100644 index 0000000000..e8aa1340de --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/TIdentity.java @@ -0,0 +1,54 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.db2.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentity extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = 2091357766; + + /** + * The singleton instance of T_IDENTITY + */ + public static final org.jooq.test.db2.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.db2.generatedclasses.tables.TIdentity(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.db2.generatedclasses.tables.records.TIdentityRecord.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 ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("VAL", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * No further instances allowed + */ + private TIdentity() { + super("T_IDENTITY", org.jooq.test.db2.generatedclasses.Lukas.LUKAS); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.db2.generatedclasses.Keys.IDENTITY_T_IDENTITY; + } +} diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..9ab4f556e5 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,67 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.db2.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = 184436337; + + /** + * The singleton instance of T_IDENTITY_PK + */ + public static final org.jooq.test.db2.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.db2.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.db2.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public static final org.jooq.TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("VAL", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("T_IDENTITY_PK", org.jooq.test.db2.generatedclasses.Lukas.LUKAS); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.db2.generatedclasses.Keys.IDENTITY_T_IDENTITY_PK; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.db2.generatedclasses.Keys.T_IDENTITY_PK__PK_T_IDENTITY_PK; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.db2.generatedclasses.Keys.T_IDENTITY_PK__PK_T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..2b2f336781 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.db2.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = 1079872062; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.db2.generatedclasses.tables.TIdentityPk.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.db2.generatedclasses.tables.TIdentityPk.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.db2.generatedclasses.tables.TIdentityPk.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.db2.generatedclasses.tables.TIdentityPk.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.db2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityRecord.java new file mode 100644 index 0000000000..278b6ebcae --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityRecord.java @@ -0,0 +1,49 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.db2.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = -659990037; + + /** + * An uncommented item + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.db2.generatedclasses.tables.TIdentity.ID, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.db2.generatedclasses.tables.TIdentity.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.db2.generatedclasses.tables.TIdentity.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.db2.generatedclasses.tables.TIdentity.VAL); + } + + /** + * Create a detached TIdentityRecord + */ + public TIdentityRecord() { + super(org.jooq.test.db2.generatedclasses.tables.TIdentity.T_IDENTITY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/db2/reset.sql b/jOOQ-test/src/org/jooq/test/db2/reset.sql index 82ad8796cd..20459e1044 100644 --- a/jOOQ-test/src/org/jooq/test/db2/reset.sql +++ b/jOOQ-test/src/org/jooq/test/db2/reset.sql @@ -12,6 +12,8 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity/ +DELETE FROM t_identity_pk/ DROP SEQUENCE s_author_id/ CREATE SEQUENCE s_author_id/ diff --git a/jOOQ-test/src/org/jooq/test/derby/create.sql b/jOOQ-test/src/org/jooq/test/derby/create.sql index 3d526f8f2a..47eeffa817 100644 --- a/jOOQ-test/src/org/jooq/test/derby/create.sql +++ b/jOOQ-test/src/org/jooq/test/derby/create.sql @@ -26,10 +26,26 @@ DROP TABLE t_658_32/ DROP TABLE t_725_lob_test/ DROP TABLE t_785/ DROP TABLE t_booleans/ +DROP TABLE t_identity/ +DROP TABLE t_identity_pk/ CREATE SCHEMA test AUTHORIZATION test / +CREATE TABLE t_identity_pk ( + id INTEGER GENERATED BY DEFAULT AS IDENTITY, + val int, + + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) +) +/ + +CREATE TABLE t_identity ( + id INTEGER GENERATED BY DEFAULT AS IDENTITY, + val int +) +/ + CREATE TABLE t_booleans ( id int, one_zero int, diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Keys.java index bb0b12fe88..5c99fdc9ef 100644 --- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Keys.java @@ -14,9 +14,12 @@ package org.jooq.test.derby.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_T_IDENTITY_PK = createIdentity(org.jooq.test.derby.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.derby.generatedclasses.tables.TIdentityPk.ID); + public static final org.jooq.Identity IDENTITY_T_IDENTITY = createIdentity(org.jooq.test.derby.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.derby.generatedclasses.tables.TIdentity.ID); public static final org.jooq.Identity IDENTITY_T_TRIGGERS = createIdentity(org.jooq.test.derby.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.derby.generatedclasses.tables.TTriggers.ID_GENERATED); // UNIQUE and PRIMARY KEY definitions + public static final org.jooq.UniqueKey PK_T_IDENTITY_PK = createUniqueKey(org.jooq.test.derby.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.derby.generatedclasses.tables.TIdentityPk.ID); public static final org.jooq.UniqueKey PK_T_BOOLEANS = createUniqueKey(org.jooq.test.derby.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.derby.generatedclasses.tables.TBooleans.ID); public static final org.jooq.UniqueKey PK_T_TRIGGERS = createUniqueKey(org.jooq.test.derby.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.derby.generatedclasses.tables.TTriggers.ID_GENERATED); public static final org.jooq.UniqueKey PK_T_725_LOB_TEST = createUniqueKey(org.jooq.test.derby.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST, org.jooq.test.derby.generatedclasses.tables.T_725LobTest.ID); diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Tables.java index 929332f807..ca79ca2bc3 100644 --- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Tables.java @@ -12,6 +12,16 @@ package org.jooq.test.derby.generatedclasses; comments = "This class is generated by jOOQ") public final class Tables { + /** + * The table TEST.T_IDENTITY_PK + */ + public static org.jooq.test.derby.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.derby.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + + /** + * The table TEST.T_IDENTITY + */ + public static org.jooq.test.derby.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.derby.generatedclasses.tables.TIdentity.T_IDENTITY; + /** * The table TEST.T_BOOLEANS */ diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Test.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Test.java index c02f0f59f4..d98a9ad8c8 100644 --- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Test.java +++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/Test.java @@ -10,7 +10,7 @@ package org.jooq.test.derby.generatedclasses; comments = "This class is generated by jOOQ") public class Test extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 1559624412; + private static final long serialVersionUID = 1254239091; /** * The singleton instance of TEST @@ -32,6 +32,8 @@ public class Test extends org.jooq.impl.SchemaImpl { @Override public final java.util.List> getTables() { return java.util.Arrays.>asList( + org.jooq.test.derby.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, + org.jooq.test.derby.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.derby.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.derby.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.derby.generatedclasses.tables.T_658Ref.T_658_REF, diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/TIdentity.java new file mode 100644 index 0000000000..a7a69475d2 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/TIdentity.java @@ -0,0 +1,54 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.derby.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentity extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = -1653979766; + + /** + * The singleton instance of T_IDENTITY + */ + public static final org.jooq.test.derby.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.derby.generatedclasses.tables.TIdentity(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.derby.generatedclasses.tables.records.TIdentityRecord.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 ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("VAL", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * No further instances allowed + */ + private TIdentity() { + super("T_IDENTITY", org.jooq.test.derby.generatedclasses.Test.TEST); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.derby.generatedclasses.Keys.IDENTITY_T_IDENTITY; + } +} diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..1644d9a5a3 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,67 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.derby.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = 222691457; + + /** + * The singleton instance of T_IDENTITY_PK + */ + public static final org.jooq.test.derby.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.derby.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.derby.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public static final org.jooq.TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("VAL", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("T_IDENTITY_PK", org.jooq.test.derby.generatedclasses.Test.TEST); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.derby.generatedclasses.Keys.IDENTITY_T_IDENTITY_PK; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.derby.generatedclasses.Keys.PK_T_IDENTITY_PK; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.derby.generatedclasses.Keys.PK_T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..e4251cfcb2 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.derby.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = -2015229326; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.derby.generatedclasses.tables.TIdentityPk.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.derby.generatedclasses.tables.TIdentityPk.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.derby.generatedclasses.tables.TIdentityPk.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.derby.generatedclasses.tables.TIdentityPk.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.derby.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TIdentityRecord.java new file mode 100644 index 0000000000..f6be2936e0 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TIdentityRecord.java @@ -0,0 +1,49 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.derby.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = -1901856225; + + /** + * An uncommented item + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.derby.generatedclasses.tables.TIdentity.ID, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.derby.generatedclasses.tables.TIdentity.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.derby.generatedclasses.tables.TIdentity.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.derby.generatedclasses.tables.TIdentity.VAL); + } + + /** + * Create a detached TIdentityRecord + */ + public TIdentityRecord() { + super(org.jooq.test.derby.generatedclasses.tables.TIdentity.T_IDENTITY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/derby/reset.sql b/jOOQ-test/src/org/jooq/test/derby/reset.sql index 43324cb8b7..bbf91e8879 100644 --- a/jOOQ-test/src/org/jooq/test/derby/reset.sql +++ b/jOOQ-test/src/org/jooq/test/derby/reset.sql @@ -12,6 +12,8 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity/ +DELETE FROM t_identity_pk/ DROP SEQUENCE s_author_id RESTRICT/ CREATE SEQUENCE s_author_id START WITH 1/ diff --git a/jOOQ-test/src/org/jooq/test/h2/create.sql b/jOOQ-test/src/org/jooq/test/h2/create.sql index 5da43bc9bf..8e794fea23 100644 --- a/jOOQ-test/src/org/jooq/test/h2/create.sql +++ b/jOOQ-test/src/org/jooq/test/h2/create.sql @@ -2,6 +2,17 @@ DROP VIEW IF EXISTS v_author/ DROP VIEW IF EXISTS v_book/ DROP VIEW IF EXISTS v_library/ +DROP ALIAS IF EXISTS f_arrays1/ +DROP ALIAS IF EXISTS f_arrays2/ +DROP ALIAS IF EXISTS f_arrays3/ +DROP ALIAS IF EXISTS f_author_exists/ +DROP ALIAS IF EXISTS f_one/ +DROP ALIAS IF EXISTS f_number/ +DROP ALIAS IF EXISTS f317/ +DROP ALIAS IF EXISTS p_create_author/ +DROP ALIAS IF EXISTS p_create_author_by_name/ +DROP ALIAS IF EXISTS f_get_one_cursor/ + DROP TRIGGER IF EXISTS t_triggers_trigger/ DROP SEQUENCE IF EXISTS s_triggers_sequence/ @@ -29,17 +40,22 @@ DROP TABLE IF EXISTS t_725_lob_test/ DROP TABLE IF EXISTS t_785/ DROP TABLE IF EXISTS t_877/ DROP TABLE IF EXISTS t_booleans/ +DROP TABLE IF EXISTS t_identity/ +DROP TABLE IF EXISTS t_identity_pk/ -DROP ALIAS IF EXISTS f_arrays1/ -DROP ALIAS IF EXISTS f_arrays2/ -DROP ALIAS IF EXISTS f_arrays3/ -DROP ALIAS IF EXISTS f_author_exists/ -DROP ALIAS IF EXISTS f_one/ -DROP ALIAS IF EXISTS f_number/ -DROP ALIAS IF EXISTS f317/ -DROP ALIAS IF EXISTS p_create_author/ -DROP ALIAS IF EXISTS p_create_author_by_name/ -DROP ALIAS IF EXISTS f_get_one_cursor/ +CREATE TABLE t_identity_pk ( + id INTEGER AUTO_INCREMENT, + val int, + + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) +) +/ + +CREATE TABLE t_identity ( + id INTEGER AUTO_INCREMENT, + val int +) +/ CREATE TABLE t_booleans ( id int, diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Keys.java index eb2e4f1e46..07f21790ed 100644 --- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Keys.java @@ -14,10 +14,13 @@ package org.jooq.test.h2.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_T_IDENTITY_PK = createIdentity(org.jooq.test.h2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.h2.generatedclasses.tables.TIdentityPk.ID); + public static final org.jooq.Identity IDENTITY_T_IDENTITY = createIdentity(org.jooq.test.h2.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.h2.generatedclasses.tables.TIdentity.ID); public static final org.jooq.Identity IDENTITY_T_TRIGGERS = createIdentity(org.jooq.test.h2.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.h2.generatedclasses.tables.TTriggers.ID_GENERATED); public static final org.jooq.Identity IDENTITY_T_877 = createIdentity(org.jooq.test.h2.generatedclasses.tables.T_877.T_877, org.jooq.test.h2.generatedclasses.tables.T_877.ID); // UNIQUE and PRIMARY KEY definitions + public static final org.jooq.UniqueKey PK_T_IDENTITY_PK = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.h2.generatedclasses.tables.TIdentityPk.ID); public static final org.jooq.UniqueKey PK_T_BOOLEANS = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.h2.generatedclasses.tables.TBooleans.ID); public static final org.jooq.UniqueKey PK_T_TRIGGERS = createUniqueKey(org.jooq.test.h2.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.h2.generatedclasses.tables.TTriggers.ID_GENERATED); 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.ID); diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Public.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Public.java index b216e71a04..3c7c5f04ce 100644 --- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Public.java +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Public.java @@ -10,7 +10,7 @@ package org.jooq.test.h2.generatedclasses; comments = "This class is generated by jOOQ") public class Public extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 581905723; + private static final long serialVersionUID = -1270814246; /** * The singleton instance of PUBLIC @@ -34,6 +34,8 @@ public class Public extends org.jooq.impl.SchemaImpl { @Override public final java.util.List> getTables() { return java.util.Arrays.>asList( + org.jooq.test.h2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, + org.jooq.test.h2.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.h2.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.h2.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.h2.generatedclasses.tables.T_658Ref.T_658_REF, diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Tables.java index 707c2ee417..2326501973 100644 --- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Tables.java @@ -12,6 +12,16 @@ package org.jooq.test.h2.generatedclasses; comments = "This class is generated by jOOQ") public final class Tables { + /** + * The table PUBLIC.T_IDENTITY_PK + */ + public static org.jooq.test.h2.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.h2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + + /** + * The table PUBLIC.T_IDENTITY + */ + public static org.jooq.test.h2.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.h2.generatedclasses.tables.TIdentity.T_IDENTITY; + /** * The table PUBLIC.T_BOOLEANS */ diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TIdentity.java new file mode 100644 index 0000000000..a11c017fce --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TIdentity.java @@ -0,0 +1,54 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentity extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = 1936907516; + + /** + * The singleton instance of T_IDENTITY + */ + public static final org.jooq.test.h2.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.h2.generatedclasses.tables.TIdentity(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.h2.generatedclasses.tables.records.TIdentityRecord.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 ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("VAL", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * No further instances allowed + */ + private TIdentity() { + super("T_IDENTITY", org.jooq.test.h2.generatedclasses.Public.PUBLIC); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.h2.generatedclasses.Keys.IDENTITY_T_IDENTITY; + } +} diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..c8d7534d25 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,67 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = -1150537133; + + /** + * The singleton instance of T_IDENTITY_PK + */ + public static final org.jooq.test.h2.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.h2.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.h2.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public static final org.jooq.TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("VAL", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("T_IDENTITY_PK", org.jooq.test.h2.generatedclasses.Public.PUBLIC); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.h2.generatedclasses.Keys.IDENTITY_T_IDENTITY_PK; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.h2.generatedclasses.Keys.PK_T_IDENTITY_PK; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.h2.generatedclasses.Keys.PK_T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..f21996a233 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = -421327184; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.h2.generatedclasses.tables.TIdentityPk.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.h2.generatedclasses.tables.TIdentityPk.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.h2.generatedclasses.tables.TIdentityPk.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.h2.generatedclasses.tables.TIdentityPk.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.h2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TIdentityRecord.java new file mode 100644 index 0000000000..b479129710 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TIdentityRecord.java @@ -0,0 +1,49 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = 1590478281; + + /** + * An uncommented item + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.h2.generatedclasses.tables.TIdentity.ID, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.h2.generatedclasses.tables.TIdentity.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.h2.generatedclasses.tables.TIdentity.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.h2.generatedclasses.tables.TIdentity.VAL); + } + + /** + * Create a detached TIdentityRecord + */ + public TIdentityRecord() { + super(org.jooq.test.h2.generatedclasses.tables.TIdentity.T_IDENTITY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/h2/reset.sql b/jOOQ-test/src/org/jooq/test/h2/reset.sql index f3613ec2b0..eecacbac1c 100644 --- a/jOOQ-test/src/org/jooq/test/h2/reset.sql +++ b/jOOQ-test/src/org/jooq/test/h2/reset.sql @@ -12,6 +12,8 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity/ +DELETE FROM t_identity_pk/ DROP SEQUENCE IF EXISTS s_author_id;/ CREATE SEQUENCE s_author_id START WITH 1;/ diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/create.sql b/jOOQ-test/src/org/jooq/test/hsqldb/create.sql index 8b1a20792b..cb0cd396f7 100644 --- a/jOOQ-test/src/org/jooq/test/hsqldb/create.sql +++ b/jOOQ-test/src/org/jooq/test/hsqldb/create.sql @@ -58,6 +58,22 @@ DROP TABLE IF EXISTS object/ DROP TABLE IF EXISTS string/ DROP TABLE IF EXISTS big_decimal/ DROP TABLE IF EXISTS t_booleans/ +DROP TABLE IF EXISTS t_identity/ +DROP TABLE IF EXISTS t_identity_pk/ + +CREATE TABLE t_identity_pk ( + id INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1), + val int, + + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) +) +/ + +CREATE TABLE t_identity ( + id INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1), + val int +) +/ CREATE TABLE t_booleans ( id int, diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java index bd7f2cd1a9..c881386b79 100644 --- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java @@ -14,6 +14,8 @@ package org.jooq.test.hsqldb.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_T_IDENTITY = createIdentity(org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY.ID); + public static final org.jooq.Identity IDENTITY_T_IDENTITY_PK = createIdentity(org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); // UNIQUE and PRIMARY KEY definitions public static final org.jooq.UniqueKey PK_T_639_NUMBERS_TABLE = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.hsqldb.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.ID); @@ -25,6 +27,7 @@ public class Keys extends org.jooq.impl.AbstractKeys { public static final org.jooq.UniqueKey UK_T_BOOK_STORE_NAME = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.hsqldb.generatedclasses.tables.TBookStore.T_BOOK_STORE.NAME); public static final org.jooq.UniqueKey PK_B2BS = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.hsqldb.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_STORE_NAME, org.jooq.test.hsqldb.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_ID); public static final org.jooq.UniqueKey PK_T_BOOLEANS = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.hsqldb.generatedclasses.tables.TBooleans.T_BOOLEANS.ID); + public static final org.jooq.UniqueKey PK_T_IDENTITY_PK = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); public static final org.jooq.UniqueKey PK_T_TRIGGERS = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.hsqldb.generatedclasses.tables.TTriggers.T_TRIGGERS.ID_GENERATED); public static final org.jooq.UniqueKey PK_X_TEST_CASE_64_69 = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.hsqldb.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69.ID); public static final org.jooq.UniqueKey PK_X_TEST_CASE_71 = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.hsqldb.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71.ID); diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java index ec46392d82..4e3c0be69d 100644 --- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java +++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java @@ -10,7 +10,7 @@ package org.jooq.test.hsqldb.generatedclasses; comments = "This class is generated by jOOQ") public class Public extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -740949651; + private static final long serialVersionUID = -895692796; /** * The singleton instance of PUBLIC @@ -50,6 +50,8 @@ public class Public extends org.jooq.impl.SchemaImpl { org.jooq.test.hsqldb.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.hsqldb.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.hsqldb.generatedclasses.tables.TBooleans.T_BOOLEANS, + org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY, + org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.hsqldb.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.hsqldb.generatedclasses.tables.VAuthor.V_AUTHOR, org.jooq.test.hsqldb.generatedclasses.tables.VBook.V_BOOK, diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java index 3da6380c08..5ed36caa94 100644 --- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java @@ -102,6 +102,16 @@ public final class Tables { */ public static org.jooq.test.hsqldb.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.hsqldb.generatedclasses.tables.TBooleans.T_BOOLEANS; + /** + * The table PUBLIC.T_IDENTITY + */ + public static org.jooq.test.hsqldb.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY; + + /** + * The table PUBLIC.T_IDENTITY_PK + */ + public static org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + /** * The table PUBLIC.T_TRIGGERS */ diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentity.java new file mode 100644 index 0000000000..e66c6dbfd9 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentity.java @@ -0,0 +1,66 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.hsqldb.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentity extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = -201482824; + + /** + * The singleton instance of T_IDENTITY + */ + public static final org.jooq.test.hsqldb.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.hsqldb.generatedclasses.tables.TIdentity(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + */ + public final org.jooq.TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField VAL = createField("VAL", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * No further instances allowed + */ + private TIdentity() { + super("T_IDENTITY", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC); + } + + /** + * No further instances allowed + */ + private TIdentity(java.lang.String alias) { + super(alias, org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.hsqldb.generatedclasses.Keys.IDENTITY_T_IDENTITY; + } + + @Override + public org.jooq.test.hsqldb.generatedclasses.tables.TIdentity as(java.lang.String alias) { + return new org.jooq.test.hsqldb.generatedclasses.tables.TIdentity(alias); + } +} diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..a240077b93 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,79 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.hsqldb.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = 988352647; + + /** + * The singleton instance of T_IDENTITY_PK + */ + public static final org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public final org.jooq.TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField VAL = createField("VAL", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("T_IDENTITY_PK", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC); + } + + /** + * No further instances allowed + */ + private TIdentityPk(java.lang.String alias) { + super(alias, org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.hsqldb.generatedclasses.Keys.IDENTITY_T_IDENTITY_PK; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.hsqldb.generatedclasses.Keys.PK_T_IDENTITY_PK; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.hsqldb.generatedclasses.Keys.PK_T_IDENTITY_PK); + } + + @Override + public org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk as(java.lang.String alias) { + return new org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk(alias); + } +} diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..b752f63581 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.hsqldb.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = 1210630244; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.hsqldb.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityRecord.java new file mode 100644 index 0000000000..4a78673227 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityRecord.java @@ -0,0 +1,49 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.hsqldb.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = 1532552055; + + /** + * An uncommented item + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY.ID, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY.VAL); + } + + /** + * Create a detached TIdentityRecord + */ + public TIdentityRecord() { + super(org.jooq.test.hsqldb.generatedclasses.tables.TIdentity.T_IDENTITY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/reset.sql b/jOOQ-test/src/org/jooq/test/hsqldb/reset.sql index fa50e2a5c4..1975e67ee7 100644 --- a/jOOQ-test/src/org/jooq/test/hsqldb/reset.sql +++ b/jOOQ-test/src/org/jooq/test/hsqldb/reset.sql @@ -12,6 +12,8 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity/ +DELETE FROM t_identity_pk/ DROP SEQUENCE IF EXISTS s_author_id;/ CREATE SEQUENCE s_author_id START WITH 1;/ diff --git a/jOOQ-test/src/org/jooq/test/ingres/create.sql b/jOOQ-test/src/org/jooq/test/ingres/create.sql index 6c995747b2..8488842b62 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/create.sql +++ b/jOOQ-test/src/org/jooq/test/ingres/create.sql @@ -28,6 +28,22 @@ DROP TABLE IF EXISTS t_658_32/ DROP TABLE IF EXISTS t_725_lob_test/ DROP TABLE IF EXISTS t_785/ DROP TABLE IF EXISTS t_booleans/ +DROP TABLE IF EXISTS t_identity/ +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) +) +/ + +CREATE TABLE t_identity ( + id INTEGER GENERATED BY DEFAULT AS IDENTITY, + val int +) +/ CREATE TABLE t_booleans ( id int not null, diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Keys.java index 15cd64a124..a5e56d4160 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Keys.java @@ -14,6 +14,8 @@ package org.jooq.test.ingres.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_t_identity = createIdentity(org.jooq.test.ingres.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.ingres.generatedclasses.tables.TIdentity.ID); + public static final org.jooq.Identity IDENTITY_t_identity_pk = createIdentity(org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.ID); public static final org.jooq.Identity IDENTITY_t_triggers = createIdentity(org.jooq.test.ingres.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.ingres.generatedclasses.tables.TTriggers.ID_GENERATED); // UNIQUE and PRIMARY KEY definitions @@ -24,6 +26,7 @@ public class Keys extends org.jooq.impl.AbstractKeys { public static final org.jooq.UniqueKey uk_t_book_store_name = createUniqueKey(org.jooq.test.ingres.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.ingres.generatedclasses.tables.TBookStore.NAME); public static final org.jooq.UniqueKey pk_b2bs = createUniqueKey(org.jooq.test.ingres.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.ingres.generatedclasses.tables.TBookToBookStore.BOOK_STORE_NAME, org.jooq.test.ingres.generatedclasses.tables.TBookToBookStore.BOOK_ID); public static final org.jooq.UniqueKey pk_t_booleans = createUniqueKey(org.jooq.test.ingres.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.ingres.generatedclasses.tables.TBooleans.ID); + public static final org.jooq.UniqueKey pk_t_identity_pk = createUniqueKey(org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.ID); public static final org.jooq.UniqueKey pk_t_triggers = createUniqueKey(org.jooq.test.ingres.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.ingres.generatedclasses.tables.TTriggers.ID_GENERATED); public static final org.jooq.UniqueKey pk_x_test_case_64_69 = createUniqueKey(org.jooq.test.ingres.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.ingres.generatedclasses.tables.XTestCase_64_69.ID); public static final org.jooq.UniqueKey pk_x_test_case_71 = createUniqueKey(org.jooq.test.ingres.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.ingres.generatedclasses.tables.XTestCase_71.ID); 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 cf7c3ab2ab..6e19365dc1 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Tables.java @@ -57,6 +57,16 @@ public final class Tables { */ public static org.jooq.test.ingres.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.ingres.generatedclasses.tables.TBooleans.T_BOOLEANS; + /** + * The table test.t_identity + */ + public static org.jooq.test.ingres.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.ingres.generatedclasses.tables.TIdentity.T_IDENTITY; + + /** + * The table test.t_identity_pk + */ + public static org.jooq.test.ingres.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + /** * The table test.t_triggers */ diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Test.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Test.java index c8bcaf16c5..aacee4b712 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Test.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/Test.java @@ -10,7 +10,7 @@ package org.jooq.test.ingres.generatedclasses; comments = "This class is generated by jOOQ") public class Test extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -902402002; + private static final long serialVersionUID = -2137035777; /** * The singleton instance of test @@ -41,6 +41,8 @@ public class Test extends org.jooq.impl.SchemaImpl { org.jooq.test.ingres.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.ingres.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.ingres.generatedclasses.tables.TBooleans.T_BOOLEANS, + org.jooq.test.ingres.generatedclasses.tables.TIdentity.T_IDENTITY, + org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.ingres.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.ingres.generatedclasses.tables.VAuthor.V_AUTHOR, org.jooq.test.ingres.generatedclasses.tables.VBook.V_BOOK, diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TIdentity.java new file mode 100644 index 0000000000..5cca9541a5 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TIdentity.java @@ -0,0 +1,54 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.ingres.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentity extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = -1013713164; + + /** + * The singleton instance of t_identity + */ + public static final org.jooq.test.ingres.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.ingres.generatedclasses.tables.TIdentity(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.ingres.generatedclasses.tables.records.TIdentityRecord.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 ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY); + + /** + * No further instances allowed + */ + private TIdentity() { + super("t_identity", org.jooq.test.ingres.generatedclasses.Test.TEST); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.ingres.generatedclasses.Keys.IDENTITY_t_identity; + } +} diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..3b31f5bb38 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,67 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.ingres.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = -1929431337; + + /** + * The singleton instance of t_identity_pk + */ + public static final org.jooq.test.ingres.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.ingres.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.ingres.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public static final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("t_identity_pk", org.jooq.test.ingres.generatedclasses.Test.TEST); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.ingres.generatedclasses.Keys.IDENTITY_t_identity_pk; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.ingres.generatedclasses.Keys.pk_t_identity_pk; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.ingres.generatedclasses.Keys.pk_t_identity_pk); + } +} diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..abb30a5b53 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.ingres.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = -1427546164; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.ingres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityRecord.java new file mode 100644 index 0000000000..cf109fa6d9 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityRecord.java @@ -0,0 +1,49 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.ingres.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = -248469739; + + /** + * An uncommented item + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.ingres.generatedclasses.tables.TIdentity.ID, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.ingres.generatedclasses.tables.TIdentity.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.ingres.generatedclasses.tables.TIdentity.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.ingres.generatedclasses.tables.TIdentity.VAL); + } + + /** + * Create a detached TIdentityRecord + */ + public TIdentityRecord() { + super(org.jooq.test.ingres.generatedclasses.tables.TIdentity.T_IDENTITY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/ingres/reset.sql b/jOOQ-test/src/org/jooq/test/ingres/reset.sql index e329e43718..1260c839c3 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/reset.sql +++ b/jOOQ-test/src/org/jooq/test/ingres/reset.sql @@ -11,6 +11,8 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity/ +DELETE FROM t_identity_pk/ DROP SEQUENCE s_author_id/ CREATE SEQUENCE s_author_id/ diff --git a/jOOQ-test/src/org/jooq/test/jOOQASETest.java b/jOOQ-test/src/org/jooq/test/jOOQASETest.java index 692d632915..2c5a0562eb 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQASETest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQASETest.java @@ -31,8 +31,10 @@ package org.jooq.test; -import static org.jooq.test.sybase.generatedclasses.Tables.V_AUTHOR; -import static org.jooq.test.sybase.generatedclasses.Tables.V_BOOK; +import static org.jooq.test.ase.generatedclasses.Tables.T_IDENTITY; +import static org.jooq.test.ase.generatedclasses.Tables.T_IDENTITY_PK; +import static org.jooq.test.ase.generatedclasses.Tables.V_AUTHOR; +import static org.jooq.test.ase.generatedclasses.Tables.V_BOOK; import java.math.BigDecimal; import java.math.BigInteger; @@ -53,6 +55,8 @@ import org.jooq.test.ase.generatedclasses.DboFactory; import org.jooq.test.ase.generatedclasses.tables.TAuthor; import org.jooq.test.ase.generatedclasses.tables.TBook; import org.jooq.test.ase.generatedclasses.tables.TBookStore; +import org.jooq.test.ase.generatedclasses.tables.TIdentity; +import org.jooq.test.ase.generatedclasses.tables.TIdentityPk; import org.jooq.test.ase.generatedclasses.tables.TTriggers; import org.jooq.test.ase.generatedclasses.tables.T_639NumbersTable; import org.jooq.test.ase.generatedclasses.tables.T_658Ref; @@ -62,6 +66,8 @@ import org.jooq.test.ase.generatedclasses.tables.VLibrary; import org.jooq.test.ase.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.ase.generatedclasses.tables.records.TBookRecord; import org.jooq.test.ase.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.ase.generatedclasses.tables.records.TIdentityPkRecord; +import org.jooq.test.ase.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.ase.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.ase.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.ase.generatedclasses.tables.records.T_658RefRecord; @@ -90,6 +96,8 @@ public class jOOQASETest extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + TIdentityRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -441,6 +449,36 @@ public class jOOQASETest extends jOOQAbstractTest< return TTriggers.COUNTER; } + @Override + protected Table TIdentity() { + return T_IDENTITY; + } + + @Override + protected TableField TIdentity_ID() { + return TIdentity.ID; + } + + @Override + protected TableField TIdentity_VAL() { + return TIdentity.VAL; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return TIdentityPk.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return TIdentityPk.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java index 0af118481c..9dd088b26b 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java @@ -44,8 +44,10 @@ import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; import static org.jooq.SQLDialect.ASE; import static org.jooq.SQLDialect.DB2; +import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; +import static org.jooq.SQLDialect.INGRES; import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.ORACLE; import static org.jooq.SQLDialect.POSTGRES; @@ -213,6 +215,12 @@ public abstract class jOOQAbstractTest< // T_UNSIGNED table U extends TableRecord, + // T_IDENTITY table + I extends TableRecord, + + // T_IDENTITY_PK table + IPK extends UpdatableRecord, + // Various tables related to trac ticket numbers T658 extends TableRecord, T725 extends UpdatableRecord, @@ -564,6 +572,13 @@ public abstract class jOOQAbstractTest< protected abstract TableField TTriggers_ID(); protected abstract TableField TTriggers_COUNTER(); + protected abstract Table TIdentity(); + protected abstract TableField TIdentity_ID(); + protected abstract TableField TIdentity_VAL(); + protected abstract UpdatableTable TIdentityPK(); + protected abstract TableField TIdentityPK_ID(); + protected abstract TableField TIdentityPK_VAL(); + protected abstract Field FAuthorExistsField(String authorName); protected abstract Field FOneField(); protected abstract Field FNumberField(Number n); @@ -648,60 +663,113 @@ public abstract class jOOQAbstractTest< @Test public void testInsertIdentity() throws Exception { - // TODO [#984] Restore this test - switch (getDialect()) { - case DB2: - case POSTGRES: - case ORACLE: - case SQLITE: - default: - log.info("SKIPPING", "IDENTITY tests"); - if (true) return; + // Oracle and SQLite don't support identity columns + if (TIdentity() == null && TIdentityPK() == null) { + log.info("SKIPPING", "IDENTITY tests"); + return; } reset = false; - create().insertInto(TBookStore(), TBookStore_NAME()) - .values("Rösslitor") - .execute(); - create().selectFrom(TBookStore()).fetch(); - assertEquals(new BigInteger("4"), create().lastID()); + // Identity tables with primary key + if (TIdentityPK() != null) { + testInsertIdentity0(TIdentityPK(), TIdentityPK_ID(), TIdentityPK_VAL()); + } - create().delete(TBookStore()) - .where(TBookStore_NAME().equal("Rösslitor")) - .execute(); + // Identity tables without primary key + if (TIdentity() != null) { - create().insertInto(TBookStore(), TBookStore_NAME()) - .values("Amazon") - .execute(); - assertEquals(5, create().lastID().intValue()); - assertEquals(5, create().lastID().intValue()); + // TODO [#1003] This doesn't work for Sybase, SQL Server, Ingres, H2, Derby, ASE + testInsertIdentity0(TIdentity(), TIdentity_ID(), TIdentity_VAL()); + } + } + /** + * Extracted method for very similar tests with T_IDENTITY, T_IDENTITY_PK + */ + @SuppressWarnings("unchecked") + private > void testInsertIdentity0(Table table, TableField id, TableField val) throws Exception { - // No new identity should be received. But unfortunately, dialects show - // no standard behaviour - create().insertInto(TAuthor(), TAuthor_ID(), TAuthor_LAST_NAME()) - .values(13, "Frisch") - .execute(); - switch (getDialect()) { - case SQLITE: - assertEquals(new BigInteger("3"), create().lastID()); - break; + // Plain insert + // ------------ + assertEquals(1, + create().insertInto(table, val) + .values(10) + .execute()); - case H2: - case SQLSERVER: - assertEquals(null, create().lastID()); - break; + if (getDialect() != POSTGRES && + getDialect() != DB2) { - case ASE: - case SYBASE: - assertEquals(BigInteger.ZERO, create().lastID()); - break; + assertEquals(new BigInteger("1"), create().lastID()); + } + + R r1 = create().selectFrom(table).fetchOne(); + + assertEquals(1, (int) r1.getValue(id)); + assertEquals(10, (int) r1.getValue(val)); + + // INSERT .. RETURNING + // ------------------- + R r2 = + create().insertInto(table, val) + .values(11) + .returning() + .fetchOne(); + + if (getDialect() != POSTGRES && + getDialect() != DB2) { + + assertEquals(new BigInteger("2"), create().lastID()); + assertEquals(new BigInteger("2"), create().lastID()); + } + + assertEquals(2, (int) r2.getValue(id)); + assertEquals(11, (int) r2.getValue(val)); + + // INSERT MULTIPLE .. RETURNING + // ---------------------------- + // TODO [#832] Make this work for Sybase also + // TODO [#1004] Make this work for SQL Server also + // TODO ... and then, think about Ingres, H2 and Derby as well + if (getDialect() == SYBASE || + getDialect() == SQLSERVER || + getDialect() == INGRES || + getDialect() == H2 || + getDialect() == DERBY || + getDialect() == ASE) { + + log.info("SKIPPING", "Multi-record INSERT .. RETURNING statement"); + } + else { + Result r3 = + create().insertInto(table, val) + .values(12) + .values(13) + .returning(id) + .fetch(); + + assertEquals(2, r3.size()); + assertNull(r3.getValue(0, val)); + assertNull(r3.getValue(1, val)); + assertEquals(3, (int) r3.getValue(0, id)); + assertEquals(4, (int) r3.getValue(1, id)); + + // Record.storeUsing() + R r4 = create().newRecord(table); + r4.setValue(val, 20); + assertEquals(1, r4.storeUsing(table.getIdentity().getField())); + + if (getDialect() != POSTGRES && + getDialect() != DB2) { - case MYSQL: - default: assertEquals(new BigInteger("5"), create().lastID()); - break; + assertEquals(new BigInteger("5"), create().lastID()); + } + + // TODO [#1002] Fix this + // R r5 = create().fetchOne(table, id.equal(5)); + // assertEquals(r5, r4); + } } @@ -1187,6 +1255,16 @@ public abstract class jOOQAbstractTest< tables++; } + // The additional T_IDENTITY table + if (TIdentity() != null) { + tables++; + } + + // The additional T_IDENTITY_PK table + if (TIdentityPK() != null) { + tables++; + } + // [#959] The T_959 table for enum collisions with Java keywords if (getDialect() == MYSQL || getDialect() == POSTGRES) { @@ -1236,20 +1314,26 @@ public abstract class jOOQAbstractTest< } } - // Test correct source code generation for relations - // TODO [#984] Restore this test - if (false && - getDialect() != ORACLE && - getDialect() != SQLITE) { + // Test correct source code generation for identity columns + assertNull(TAuthor().getIdentity()); + assertNull(TBook().getIdentity()); - assertNull(TAuthor().getIdentity()); - assertNull(TBook().getIdentity()); - assertEquals(TBookStore(), TBookStore().getIdentity().getTable()); + if (TIdentity() != null || TIdentityPK() != null) { + if (TIdentity() != null) { + assertEquals(TIdentity(), TIdentity().getIdentity().getTable()); + assertEquals(TIdentity_ID(), TIdentity().getIdentity().getField()); + } + + if (TIdentityPK() != null) { + assertEquals(TIdentityPK(), TIdentityPK().getIdentity().getTable()); + assertEquals(TIdentityPK_ID(), TIdentityPK().getIdentity().getField()); + } } else { log.info("SKIPPING", "Identity tests"); } + // Test correct source code generation for relations assertNotNull(TAuthor().getMainKey()); assertNotNull(TAuthor().getKeys()); assertTrue(TAuthor().getKeys().contains(TAuthor().getMainKey())); @@ -4746,19 +4830,6 @@ public abstract class jOOQAbstractTest< store.setValue(TBookStore_NAME(), "Rösslitor"); assertEquals(1, store.store()); - // If IDENTITY columns are supported, then they should be fetched after insert - Number identity1 = new Integer(0); - Number identity2 = new Integer(0); - - // TODO [#984] Move this test to a dedicated test method - if (false && TBookStore().getIdentity() != null) { - identity1 = store.getValue(TBookStore().getIdentity().getField()); - assertNotNull(identity1); - } - else { - log.info("SKIPPING", "Identity check"); - } - store = create().fetchOne(TBookStore(), TBookStore_NAME().equal("Rösslitor")); assertEquals("Rösslitor", store.getValue(TBookStore_NAME())); @@ -4766,16 +4837,6 @@ public abstract class jOOQAbstractTest< store.setValue(TBookStore_NAME(), "Amazon"); assertEquals(1, store.store()); - // TODO [#984] Move this test to a dedicated test method - if (false && TBookStore().getIdentity() != null) { - identity2 = store.getValue(TBookStore().getIdentity().getField()); - assertNotNull(identity2); - assertEquals(identity1.intValue(), identity2.intValue() - 1); - } - else { - log.info("SKIPPING", "Identity check"); - } - store = create().fetchOne(TBookStore(), TBookStore_NAME().equal("Amazon")); assertEquals("Amazon", store.getValue(TBookStore_NAME())); diff --git a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java index 0d97440f68..f05bebcbab 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java +++ b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java @@ -36,6 +36,8 @@ package org.jooq.test; +import static org.jooq.test.db2.generatedclasses.Tables.T_IDENTITY; +import static org.jooq.test.db2.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.db2.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.db2.generatedclasses.Tables.V_BOOK; @@ -60,6 +62,8 @@ import org.jooq.test.db2.generatedclasses.Sequences; import org.jooq.test.db2.generatedclasses.tables.TAuthor; import org.jooq.test.db2.generatedclasses.tables.TBook; import org.jooq.test.db2.generatedclasses.tables.TBookStore; +import org.jooq.test.db2.generatedclasses.tables.TIdentity; +import org.jooq.test.db2.generatedclasses.tables.TIdentityPk; import org.jooq.test.db2.generatedclasses.tables.TTriggers; import org.jooq.test.db2.generatedclasses.tables.T_639NumbersTable; import org.jooq.test.db2.generatedclasses.tables.T_658Ref; @@ -69,6 +73,8 @@ import org.jooq.test.db2.generatedclasses.tables.VLibrary; import org.jooq.test.db2.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.db2.generatedclasses.tables.records.TBookRecord; import org.jooq.test.db2.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.db2.generatedclasses.tables.records.TIdentityPkRecord; +import org.jooq.test.db2.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.db2.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.db2.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.db2.generatedclasses.tables.records.T_658RefRecord; @@ -97,6 +103,8 @@ public class jOOQDB2Test extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + TIdentityRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -457,6 +465,36 @@ public class jOOQDB2Test extends jOOQAbstractTest< return TTriggers.COUNTER; } + @Override + protected Table TIdentity() { + return T_IDENTITY; + } + + @Override + protected TableField TIdentity_ID() { + return TIdentity.ID; + } + + @Override + protected TableField TIdentity_VAL() { + return TIdentity.VAL; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return TIdentityPk.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return TIdentityPk.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java b/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java index a9bf9a2ec5..9147e4f252 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java @@ -36,6 +36,8 @@ package org.jooq.test; +import static org.jooq.test.derby.generatedclasses.Tables.T_IDENTITY; +import static org.jooq.test.derby.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.derby.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.derby.generatedclasses.Tables.V_BOOK; @@ -59,6 +61,8 @@ import org.jooq.test.derby.generatedclasses.TestFactory; import org.jooq.test.derby.generatedclasses.tables.TAuthor; import org.jooq.test.derby.generatedclasses.tables.TBook; import org.jooq.test.derby.generatedclasses.tables.TBookStore; +import org.jooq.test.derby.generatedclasses.tables.TIdentity; +import org.jooq.test.derby.generatedclasses.tables.TIdentityPk; import org.jooq.test.derby.generatedclasses.tables.TTriggers; import org.jooq.test.derby.generatedclasses.tables.T_639NumbersTable; import org.jooq.test.derby.generatedclasses.tables.T_658Ref; @@ -68,6 +72,8 @@ import org.jooq.test.derby.generatedclasses.tables.VLibrary; import org.jooq.test.derby.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.derby.generatedclasses.tables.records.TBookRecord; import org.jooq.test.derby.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.derby.generatedclasses.tables.records.TIdentityPkRecord; +import org.jooq.test.derby.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.derby.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.derby.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.derby.generatedclasses.tables.records.T_658RefRecord; @@ -93,6 +99,8 @@ public class jOOQDerbyTest extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + TIdentityRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -448,6 +456,36 @@ public class jOOQDerbyTest extends jOOQAbstractTest< return TTriggers.COUNTER; } + @Override + protected Table TIdentity() { + return T_IDENTITY; + } + + @Override + protected TableField TIdentity_ID() { + return TIdentity.ID; + } + + @Override + protected TableField TIdentity_VAL() { + return TIdentity.VAL; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return TIdentityPk.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return TIdentityPk.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java b/jOOQ-test/src/org/jooq/test/jOOQH2Test.java index 776c51de93..cf69b77df6 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java +++ b/jOOQ-test/src/org/jooq/test/jOOQH2Test.java @@ -36,6 +36,8 @@ package org.jooq.test; +import static org.jooq.test.h2.generatedclasses.Tables.T_IDENTITY; +import static org.jooq.test.h2.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.h2.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.h2.generatedclasses.Tables.V_BOOK; @@ -61,6 +63,8 @@ import org.jooq.test.h2.generatedclasses.tables.TArrays; import org.jooq.test.h2.generatedclasses.tables.TAuthor; import org.jooq.test.h2.generatedclasses.tables.TBook; import org.jooq.test.h2.generatedclasses.tables.TBookStore; +import org.jooq.test.h2.generatedclasses.tables.TIdentity; +import org.jooq.test.h2.generatedclasses.tables.TIdentityPk; import org.jooq.test.h2.generatedclasses.tables.TTriggers; import org.jooq.test.h2.generatedclasses.tables.T_639NumbersTable; import org.jooq.test.h2.generatedclasses.tables.T_658Ref; @@ -71,6 +75,8 @@ import org.jooq.test.h2.generatedclasses.tables.records.TArraysRecord; import org.jooq.test.h2.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.h2.generatedclasses.tables.records.TBookRecord; import org.jooq.test.h2.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.h2.generatedclasses.tables.records.TIdentityPkRecord; +import org.jooq.test.h2.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.h2.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.h2.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.h2.generatedclasses.tables.records.T_658RefRecord; @@ -98,6 +104,8 @@ public class jOOQH2Test extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + TIdentityRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -456,6 +464,36 @@ public class jOOQH2Test extends jOOQAbstractTest< return TTriggers.COUNTER; } + @Override + protected Table TIdentity() { + return T_IDENTITY; + } + + @Override + protected TableField TIdentity_ID() { + return TIdentity.ID; + } + + @Override + protected TableField TIdentity_VAL() { + return TIdentity.VAL; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return TIdentityPk.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return TIdentityPk.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java index e48b6205b0..5d35d6c2a0 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java @@ -44,6 +44,8 @@ import static org.jooq.test.hsqldb.generatedclasses.Tables.T_ARRAYS; import static org.jooq.test.hsqldb.generatedclasses.Tables.T_AUTHOR; import static org.jooq.test.hsqldb.generatedclasses.Tables.T_BOOK; import static org.jooq.test.hsqldb.generatedclasses.Tables.T_BOOK_STORE; +import static org.jooq.test.hsqldb.generatedclasses.Tables.T_IDENTITY; +import static org.jooq.test.hsqldb.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.hsqldb.generatedclasses.Tables.T_TRIGGERS; import static org.jooq.test.hsqldb.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.hsqldb.generatedclasses.Tables.V_BOOK; @@ -71,6 +73,8 @@ import org.jooq.test.hsqldb.generatedclasses.tables.records.TArraysRecord; import org.jooq.test.hsqldb.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.hsqldb.generatedclasses.tables.records.TBookRecord; import org.jooq.test.hsqldb.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityPkRecord; +import org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.hsqldb.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.hsqldb.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.hsqldb.generatedclasses.tables.records.T_658RefRecord; @@ -96,6 +100,8 @@ public class jOOQHSQLDBTest extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + TIdentityRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -451,6 +457,36 @@ public class jOOQHSQLDBTest extends jOOQAbstractTest< return T_TRIGGERS.COUNTER; } + @Override + protected Table TIdentity() { + return T_IDENTITY; + } + + @Override + protected TableField TIdentity_ID() { + return T_IDENTITY.ID; + } + + @Override + protected TableField TIdentity_VAL() { + return T_IDENTITY.VAL; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return T_IDENTITY_PK.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return T_IDENTITY_PK.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java index 4cc8a38e74..f369b81cf3 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java +++ b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java @@ -97,6 +97,8 @@ public class jOOQHSQLDBTest2 extends jOOQAbstractTest< TDirectoryRecord, TTriggersRecord, XUnusedRecord, + XUnusedRecord, + XUnusedRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -454,6 +456,36 @@ public class jOOQHSQLDBTest2 extends jOOQAbstractTest< return T_TRIGGERS.COUNTER; } + @Override + protected Table TIdentity() { + return null; + } + + @Override + protected TableField TIdentity_ID() { + return null; + } + + @Override + protected TableField TIdentity_VAL() { + return null; + } + + @Override + protected UpdatableTable TIdentityPK() { + return null; + } + + @Override + protected TableField TIdentityPK_ID() { + return null; + } + + @Override + protected TableField TIdentityPK_VAL() { + return null; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java b/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java index 3e5a829527..93c54db046 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java @@ -36,6 +36,8 @@ package org.jooq.test; +import static org.jooq.test.ingres.generatedclasses.Tables.T_IDENTITY; +import static org.jooq.test.ingres.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.ingres.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.ingres.generatedclasses.Tables.V_BOOK; @@ -59,6 +61,8 @@ import org.jooq.test.ingres.generatedclasses.TestFactory; import org.jooq.test.ingres.generatedclasses.tables.TAuthor; import org.jooq.test.ingres.generatedclasses.tables.TBook; import org.jooq.test.ingres.generatedclasses.tables.TBookStore; +import org.jooq.test.ingres.generatedclasses.tables.TIdentity; +import org.jooq.test.ingres.generatedclasses.tables.TIdentityPk; import org.jooq.test.ingres.generatedclasses.tables.TTriggers; import org.jooq.test.ingres.generatedclasses.tables.T_639NumbersTable; import org.jooq.test.ingres.generatedclasses.tables.T_658Ref; @@ -68,6 +72,8 @@ import org.jooq.test.ingres.generatedclasses.tables.VLibrary; import org.jooq.test.ingres.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.ingres.generatedclasses.tables.records.TBookRecord; import org.jooq.test.ingres.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.ingres.generatedclasses.tables.records.TIdentityPkRecord; +import org.jooq.test.ingres.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.ingres.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.ingres.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.ingres.generatedclasses.tables.records.T_658RefRecord; @@ -94,6 +100,8 @@ public class jOOQIngresTest extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + TIdentityRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -449,6 +457,36 @@ public class jOOQIngresTest extends jOOQAbstractTest< return TTriggers.COUNTER; } + @Override + protected Table TIdentity() { + return T_IDENTITY; + } + + @Override + protected TableField TIdentity_ID() { + return TIdentity.ID; + } + + @Override + protected TableField TIdentity_VAL() { + return TIdentity.VAL; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return TIdentityPk.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return TIdentityPk.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java b/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java index 9240aff5f5..3c681dae78 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java @@ -37,6 +37,7 @@ package org.jooq.test; import static org.jooq.impl.Factory.val; +import static org.jooq.test.mysql.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.mysql.generatedclasses.Tables.T_UNSIGNED; import static org.jooq.test.mysql.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.mysql.generatedclasses.Tables.V_BOOK; @@ -77,6 +78,7 @@ import org.jooq.test.mysql.generatedclasses.enums.T_959JavaKeywords; import org.jooq.test.mysql.generatedclasses.tables.TAuthor; import org.jooq.test.mysql.generatedclasses.tables.TBook; import org.jooq.test.mysql.generatedclasses.tables.TBookStore; +import org.jooq.test.mysql.generatedclasses.tables.TIdentityPk; import org.jooq.test.mysql.generatedclasses.tables.TTriggers; import org.jooq.test.mysql.generatedclasses.tables.TUnsigned; import org.jooq.test.mysql.generatedclasses.tables.T_639NumbersTable; @@ -88,6 +90,7 @@ import org.jooq.test.mysql.generatedclasses.tables.VLibrary; import org.jooq.test.mysql.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.mysql.generatedclasses.tables.records.TBookRecord; import org.jooq.test.mysql.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.mysql.generatedclasses.tables.records.TIdentityPkRecord; import org.jooq.test.mysql.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.mysql.generatedclasses.tables.records.TUnsignedRecord; import org.jooq.test.mysql.generatedclasses.tables.records.T_639NumbersTableRecord; @@ -118,6 +121,8 @@ public class jOOQMySQLTest extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, TUnsignedRecord, + XUnusedRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -473,6 +478,36 @@ public class jOOQMySQLTest extends jOOQAbstractTest< return TTriggers.COUNTER; } + @Override + protected Table TIdentity() { + return null; + } + + @Override + protected TableField TIdentity_ID() { + return null; + } + + @Override + protected TableField TIdentity_VAL() { + return null; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return TIdentityPk.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return TIdentityPk.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java index ef70f2bba3..7b4f351d11 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java +++ b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java @@ -42,6 +42,7 @@ import static org.jooq.test.mysql2.generatedclasses.Tables.T_785; import static org.jooq.test.mysql2.generatedclasses.Tables.T_AUTHOR; import static org.jooq.test.mysql2.generatedclasses.Tables.T_BOOK; import static org.jooq.test.mysql2.generatedclasses.Tables.T_BOOK_STORE; +import static org.jooq.test.mysql2.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.mysql2.generatedclasses.Tables.T_TRIGGERS; import static org.jooq.test.mysql2.generatedclasses.Tables.T_UNSIGNED; import static org.jooq.test.mysql2.generatedclasses.Tables.V_AUTHOR; @@ -68,6 +69,7 @@ import org.jooq.test.mysql2.generatedclasses.tables.T_658Ref; import org.jooq.test.mysql2.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.mysql2.generatedclasses.tables.records.TBookRecord; import org.jooq.test.mysql2.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.mysql2.generatedclasses.tables.records.TIdentityPkRecord; import org.jooq.test.mysql2.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.mysql2.generatedclasses.tables.records.TUnsignedRecord; import org.jooq.test.mysql2.generatedclasses.tables.records.T_639NumbersTableRecord; @@ -95,6 +97,8 @@ public class jOOQMySQLTestSchemaRewrite extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, TUnsignedRecord, + XUnusedRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -455,6 +459,36 @@ public class jOOQMySQLTestSchemaRewrite extends jOOQAbstractTest< return T_TRIGGERS.COUNTER; } + @Override + protected Table TIdentity() { + return null; + } + + @Override + protected TableField TIdentity_ID() { + return null; + } + + @Override + protected TableField TIdentity_VAL() { + return null; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return T_IDENTITY_PK.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return T_IDENTITY_PK.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java index 50189e4d54..346da0937a 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java @@ -137,6 +137,8 @@ public class jOOQOracleTest extends jOOQAbstractTest< TDirectoryRecord, TTriggersRecord, XUnusedRecord, + XUnusedRecord, + XUnusedRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -513,6 +515,36 @@ public class jOOQOracleTest extends jOOQAbstractTest< return T_TRIGGERS.COUNTER; } + @Override + protected Table TIdentity() { + return null; + } + + @Override + protected TableField TIdentity_ID() { + return null; + } + + @Override + protected TableField TIdentity_VAL() { + return null; + } + + @Override + protected UpdatableTable TIdentityPK() { + return null; + } + + @Override + protected TableField TIdentityPK_ID() { + return null; + } + + @Override + protected TableField TIdentityPK_VAL() { + return null; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java b/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java index 6a88e291ca..43c71e48c1 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java @@ -45,6 +45,8 @@ import static org.jooq.test.postgres.generatedclasses.Tables.T_ARRAYS; import static org.jooq.test.postgres.generatedclasses.Tables.T_AUTHOR; import static org.jooq.test.postgres.generatedclasses.Tables.T_BOOK; import static org.jooq.test.postgres.generatedclasses.Tables.T_BOOK_STORE; +import static org.jooq.test.postgres.generatedclasses.Tables.T_IDENTITY; +import static org.jooq.test.postgres.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.postgres.generatedclasses.Tables.T_TRIGGERS; import static org.jooq.test.postgres.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.postgres.generatedclasses.Tables.V_BOOK; @@ -75,6 +77,8 @@ import org.jooq.test.postgres.generatedclasses.tables.records.TArraysRecord; import org.jooq.test.postgres.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.postgres.generatedclasses.tables.records.TBookRecord; import org.jooq.test.postgres.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.postgres.generatedclasses.tables.records.TIdentityPkRecord; +import org.jooq.test.postgres.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.postgres.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.postgres.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.postgres.generatedclasses.tables.records.T_658RefRecord; @@ -105,6 +109,8 @@ public class jOOQPostgresTest extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + TIdentityRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -460,6 +466,36 @@ public class jOOQPostgresTest extends jOOQAbstractTest< return T_TRIGGERS.COUNTER; } + @Override + protected Table TIdentity() { + return T_IDENTITY; + } + + @Override + protected TableField TIdentity_ID() { + return T_IDENTITY.ID; + } + + @Override + protected TableField TIdentity_VAL() { + return T_IDENTITY.VAL; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return T_IDENTITY_PK.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return T_IDENTITY_PK.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java b/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java index f19554706d..c20e9cddc8 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java @@ -42,6 +42,8 @@ import static org.jooq.test.sqlserver.generatedclasses.Tables.T_785; import static org.jooq.test.sqlserver.generatedclasses.Tables.T_AUTHOR; import static org.jooq.test.sqlserver.generatedclasses.Tables.T_BOOK; import static org.jooq.test.sqlserver.generatedclasses.Tables.T_BOOK_STORE; +import static org.jooq.test.sqlserver.generatedclasses.Tables.T_IDENTITY; +import static org.jooq.test.sqlserver.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.sqlserver.generatedclasses.Tables.T_TRIGGERS; import static org.jooq.test.sqlserver.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.sqlserver.generatedclasses.Tables.V_BOOK; @@ -68,6 +70,8 @@ import org.jooq.test.sqlserver.generatedclasses.tables.T_658Ref; import org.jooq.test.sqlserver.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.sqlserver.generatedclasses.tables.records.TBookRecord; import org.jooq.test.sqlserver.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.sqlserver.generatedclasses.tables.records.TIdentityPkRecord; +import org.jooq.test.sqlserver.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.sqlserver.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.sqlserver.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.sqlserver.generatedclasses.tables.records.T_658RefRecord; @@ -93,6 +97,8 @@ public class jOOQSQLServerTest extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + TIdentityRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -448,6 +454,36 @@ public class jOOQSQLServerTest extends jOOQAbstractTest< return T_TRIGGERS.COUNTER; } + @Override + protected Table TIdentity() { + return T_IDENTITY; + } + + @Override + protected TableField TIdentity_ID() { + return T_IDENTITY.ID; + } + + @Override + protected TableField TIdentity_VAL() { + return T_IDENTITY.VAL; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return T_IDENTITY_PK.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return T_IDENTITY_PK.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java b/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java index ccb442170d..b46ae404e1 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java @@ -94,6 +94,8 @@ public class jOOQSQLiteTest extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + XUnusedRecord, + XUnusedRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -449,6 +451,36 @@ public class jOOQSQLiteTest extends jOOQAbstractTest< return TTriggers.COUNTER; } + @Override + protected Table TIdentity() { + return null; + } + + @Override + protected TableField TIdentity_ID() { + return null; + } + + @Override + protected TableField TIdentity_VAL() { + return null; + } + + @Override + protected UpdatableTable TIdentityPK() { + return null; + } + + @Override + protected TableField TIdentityPK_ID() { + return null; + } + + @Override + protected TableField TIdentityPK_VAL() { + return null; + } + @Override protected Field FAuthorExistsField(String authorName) { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java b/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java index 6f2a68e969..906e0b0ee4 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java @@ -38,6 +38,8 @@ import static org.jooq.test.sybase.generatedclasses.Tables.T_785; import static org.jooq.test.sybase.generatedclasses.Tables.T_AUTHOR; import static org.jooq.test.sybase.generatedclasses.Tables.T_BOOK; import static org.jooq.test.sybase.generatedclasses.Tables.T_BOOK_STORE; +import static org.jooq.test.sybase.generatedclasses.Tables.T_IDENTITY; +import static org.jooq.test.sybase.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.sybase.generatedclasses.Tables.T_TRIGGERS; import static org.jooq.test.sybase.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.sybase.generatedclasses.Tables.V_BOOK; @@ -64,6 +66,8 @@ import org.jooq.test.sybase.generatedclasses.Sequences; import org.jooq.test.sybase.generatedclasses.tables.records.TAuthorRecord; import org.jooq.test.sybase.generatedclasses.tables.records.TBookRecord; import org.jooq.test.sybase.generatedclasses.tables.records.TBookStoreRecord; +import org.jooq.test.sybase.generatedclasses.tables.records.TIdentityPkRecord; +import org.jooq.test.sybase.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.sybase.generatedclasses.tables.records.TTriggersRecord; import org.jooq.test.sybase.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord; @@ -92,6 +96,8 @@ public class jOOQSybaseTest extends jOOQAbstractTest< XUnusedRecord, TTriggersRecord, XUnusedRecord, + TIdentityRecord, + TIdentityPkRecord, T_658RefRecord, T_725LobTestRecord, T_639NumbersTableRecord, @@ -443,6 +449,36 @@ public class jOOQSybaseTest extends jOOQAbstractTest< return T_TRIGGERS.COUNTER; } + @Override + protected Table TIdentity() { + return T_IDENTITY; + } + + @Override + protected TableField TIdentity_ID() { + return T_IDENTITY.ID; + } + + @Override + protected TableField TIdentity_VAL() { + return T_IDENTITY.VAL; + } + + @Override + protected UpdatableTable TIdentityPK() { + return T_IDENTITY_PK; + } + + @Override + protected TableField TIdentityPK_ID() { + return T_IDENTITY_PK.ID; + } + + @Override + protected TableField TIdentityPK_VAL() { + return T_IDENTITY_PK.VAL; + } + @Override protected Field FAuthorExistsField(String authorName) { return Routines.fAuthorExists(authorName); diff --git a/jOOQ-test/src/org/jooq/test/mysql/create.sql b/jOOQ-test/src/org/jooq/test/mysql/create.sql index 8cbc1daeda..cfa59f8cc8 100644 --- a/jOOQ-test/src/org/jooq/test/mysql/create.sql +++ b/jOOQ-test/src/org/jooq/test/mysql/create.sql @@ -2,6 +2,16 @@ DROP VIEW IF EXISTS v_library/ DROP VIEW IF EXISTS v_author/ DROP VIEW IF EXISTS v_book/ +DROP PROCEDURE IF EXISTS p_unused/ +DROP PROCEDURE IF EXISTS p_author_exists/ +DROP PROCEDURE IF EXISTS p_create_author/ +DROP PROCEDURE IF EXISTS p_create_author_by_name/ +DROP PROCEDURE IF EXISTS p391/ +DROP FUNCTION IF EXISTS f_author_exists/ +DROP FUNCTION IF EXISTS f_one/ +DROP FUNCTION IF EXISTS f_number/ +DROP FUNCTION IF EXISTS f317/ + DROP TRIGGER IF EXISTS t_triggers_trigger/ DROP TABLE IF EXISTS t_triggers/ @@ -28,16 +38,15 @@ DROP TABLE IF EXISTS t_785/ DROP TABLE IF EXISTS t_unsigned/ DROP TABLE IF EXISTS t_959/ DROP TABLE IF EXISTS t_booleans/ +DROP TABLE IF EXISTS t_identity_pk/ -DROP PROCEDURE IF EXISTS p_unused/ -DROP PROCEDURE IF EXISTS p_author_exists/ -DROP PROCEDURE IF EXISTS p_create_author/ -DROP PROCEDURE IF EXISTS p_create_author_by_name/ -DROP PROCEDURE IF EXISTS p391/ -DROP FUNCTION IF EXISTS f_author_exists/ -DROP FUNCTION IF EXISTS f_one/ -DROP FUNCTION IF EXISTS f_number/ -DROP FUNCTION IF EXISTS f317/ +CREATE TABLE t_identity_pk ( + id INT NOT NULL AUTO_INCREMENT, + val int, + + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) +) +/ CREATE TABLE t_booleans ( id int, diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Keys.java index cd126d792a..090f1d5945 100644 --- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Keys.java @@ -14,6 +14,7 @@ package org.jooq.test.mysql.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_t_identity_pk = createIdentity(org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.ID); public static final org.jooq.Identity IDENTITY_t_triggers = createIdentity(org.jooq.test.mysql.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.mysql.generatedclasses.tables.TTriggers.ID_GENERATED); // UNIQUE and PRIMARY KEY definitions @@ -24,6 +25,7 @@ public class Keys extends org.jooq.impl.AbstractKeys { public static final org.jooq.UniqueKey KEY_t_book_store_uk_t_book_store_name = createUniqueKey(org.jooq.test.mysql.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.mysql.generatedclasses.tables.TBookStore.NAME); public static final org.jooq.UniqueKey KEY_t_book_to_book_store_PRIMARY = createUniqueKey(org.jooq.test.mysql.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.mysql.generatedclasses.tables.TBookToBookStore.BOOK_STORE_NAME, org.jooq.test.mysql.generatedclasses.tables.TBookToBookStore.BOOK_ID); public static final org.jooq.UniqueKey KEY_t_booleans_PRIMARY = createUniqueKey(org.jooq.test.mysql.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.mysql.generatedclasses.tables.TBooleans.ID); + public static final org.jooq.UniqueKey KEY_t_identity_pk_PRIMARY = createUniqueKey(org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.ID); public static final org.jooq.UniqueKey KEY_t_triggers_PRIMARY = createUniqueKey(org.jooq.test.mysql.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.mysql.generatedclasses.tables.TTriggers.ID_GENERATED); public static final org.jooq.UniqueKey KEY_x_test_case_64_69_PRIMARY = createUniqueKey(org.jooq.test.mysql.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.mysql.generatedclasses.tables.XTestCase_64_69.ID); public static final org.jooq.UniqueKey KEY_x_test_case_71_PRIMARY = createUniqueKey(org.jooq.test.mysql.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.mysql.generatedclasses.tables.XTestCase_71.ID); diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Tables.java index bdc2172d62..4d641a7dfe 100644 --- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Tables.java @@ -62,6 +62,11 @@ public final class Tables { */ public static org.jooq.test.mysql.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.mysql.generatedclasses.tables.TBooleans.T_BOOLEANS; + /** + * The table test.t_identity_pk + */ + public static org.jooq.test.mysql.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + /** * The table test.t_triggers */ diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Test.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Test.java index 2f0e64bf9a..834b995666 100644 --- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Test.java +++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/Test.java @@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses; comments = "This class is generated by jOOQ") public class Test extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 1149839477; + private static final long serialVersionUID = -1255041315; /** * The singleton instance of test @@ -37,6 +37,7 @@ public class Test extends org.jooq.impl.SchemaImpl { org.jooq.test.mysql.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.mysql.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.mysql.generatedclasses.tables.TBooleans.T_BOOLEANS, + org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.mysql.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.mysql.generatedclasses.tables.TUnsigned.T_UNSIGNED, org.jooq.test.mysql.generatedclasses.tables.VAuthor.V_AUTHOR, diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..f54a7e1ee7 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,67 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.mysql.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = -1617365357; + + /** + * The singleton instance of t_identity_pk + */ + public static final org.jooq.test.mysql.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.mysql.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.mysql.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public static final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * An uncommented item + */ + public static final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, T_IDENTITY_PK); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("t_identity_pk", org.jooq.test.mysql.generatedclasses.Test.TEST); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.mysql.generatedclasses.Keys.IDENTITY_t_identity_pk; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.mysql.generatedclasses.Keys.KEY_t_identity_pk_PRIMARY; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.mysql.generatedclasses.Keys.KEY_t_identity_pk_PRIMARY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..b5271531d5 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.mysql.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = 595483820; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.mysql.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/mysql/reset.sql b/jOOQ-test/src/org/jooq/test/mysql/reset.sql index 3c8548d456..05348aa8da 100644 --- a/jOOQ-test/src/org/jooq/test/mysql/reset.sql +++ b/jOOQ-test/src/org/jooq/test/mysql/reset.sql @@ -11,6 +11,7 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity_pk/ INSERT INTO t_language (id, cd, description, description_english) VALUES (1, 'en', 'English', 'English')/ INSERT INTO t_language (id, cd, description, description_english) VALUES (2, 'de', 'Deutsch', 'German')/ diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Keys.java index fce40f8680..77a664ebb9 100644 --- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Keys.java @@ -14,6 +14,7 @@ package org.jooq.test.mysql2.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_t_identity_pk = createIdentity(org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); public static final org.jooq.Identity IDENTITY_t_triggers = createIdentity(org.jooq.test.mysql2.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.mysql2.generatedclasses.tables.TTriggers.T_TRIGGERS.ID_GENERATED); // UNIQUE and PRIMARY KEY definitions @@ -24,6 +25,7 @@ public class Keys extends org.jooq.impl.AbstractKeys { public static final org.jooq.UniqueKey KEY_t_book_store_uk_t_book_store_name = createUniqueKey(org.jooq.test.mysql2.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.mysql2.generatedclasses.tables.TBookStore.T_BOOK_STORE.NAME); public static final org.jooq.UniqueKey KEY_t_book_to_book_store_PRIMARY = createUniqueKey(org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_STORE_NAME, org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_ID); public static final org.jooq.UniqueKey KEY_t_booleans_PRIMARY = createUniqueKey(org.jooq.test.mysql2.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.mysql2.generatedclasses.tables.TBooleans.T_BOOLEANS.ID); + public static final org.jooq.UniqueKey KEY_t_identity_pk_PRIMARY = createUniqueKey(org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); public static final org.jooq.UniqueKey KEY_t_triggers_PRIMARY = createUniqueKey(org.jooq.test.mysql2.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.mysql2.generatedclasses.tables.TTriggers.T_TRIGGERS.ID_GENERATED); public static final org.jooq.UniqueKey KEY_x_test_case_64_69_PRIMARY = createUniqueKey(org.jooq.test.mysql2.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.mysql2.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69.ID); public static final org.jooq.UniqueKey KEY_x_test_case_71_PRIMARY = createUniqueKey(org.jooq.test.mysql2.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.mysql2.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71.ID); diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Tables.java index 4f28c99199..f6809e9819 100644 --- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Tables.java @@ -62,6 +62,11 @@ public final class Tables { */ public static org.jooq.test.mysql2.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.mysql2.generatedclasses.tables.TBooleans.T_BOOLEANS; + /** + * The table test.t_identity_pk + */ + public static org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + /** * The table test.t_triggers */ diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Test2.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Test2.java index 72088a3fd3..a8dc99680c 100644 --- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Test2.java +++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Test2.java @@ -10,7 +10,7 @@ package org.jooq.test.mysql2.generatedclasses; comments = "This class is generated by jOOQ") public class Test2 extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -2059706845; + private static final long serialVersionUID = 2137298485; /** * The singleton instance of test2 @@ -37,6 +37,7 @@ public class Test2 extends org.jooq.impl.SchemaImpl { org.jooq.test.mysql2.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.mysql2.generatedclasses.tables.TBooleans.T_BOOLEANS, + org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.mysql2.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.mysql2.generatedclasses.tables.TUnsigned.T_UNSIGNED, org.jooq.test.mysql2.generatedclasses.tables.VAuthor.V_AUTHOR, diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..dd9ec7183a --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,79 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.mysql2.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = 1421630677; + + /** + * The singleton instance of t_identity_pk + */ + public static final org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.mysql2.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("t_identity_pk", org.jooq.test.mysql2.generatedclasses.Test2.TEST2); + } + + /** + * No further instances allowed + */ + private TIdentityPk(java.lang.String alias) { + super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.mysql2.generatedclasses.Keys.IDENTITY_t_identity_pk; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.mysql2.generatedclasses.Keys.KEY_t_identity_pk_PRIMARY; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.mysql2.generatedclasses.Keys.KEY_t_identity_pk_PRIMARY); + } + + @Override + public org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk as(java.lang.String alias) { + return new org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk(alias); + } +} diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..6b843243b6 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.mysql2.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = 722638248; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/postgres/create.sql b/jOOQ-test/src/org/jooq/test/postgres/create.sql index e996ea96ec..d7f0d490da 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/create.sql +++ b/jOOQ-test/src/org/jooq/test/postgres/create.sql @@ -2,7 +2,33 @@ DROP VIEW IF EXISTS v_library/ DROP VIEW IF EXISTS v_author/ DROP VIEW IF EXISTS v_book/ +DROP FUNCTION f_arrays(in_array IN integer[])/ +DROP FUNCTION f_arrays(in_array IN bigint[])/ +DROP FUNCTION f_arrays(in_array IN text[])/ +DROP FUNCTION p_arrays(in_array IN integer[], out_array OUT integer[])/ +DROP FUNCTION p_arrays(in_array IN bigint[], out_array OUT bigint[])/ +DROP FUNCTION p_arrays(in_array IN text[], out_array OUT text[])/ +DROP FUNCTION p_enhance_address1(address IN u_address_type, no OUT VARCHAR)/ +DROP FUNCTION p_enhance_address2(address OUT u_address_type)/ +DROP FUNCTION p_enhance_address3(address IN OUT u_address_type)/ +DROP FUNCTION p_unused(in1 VARCHAR, out1 OUT INTEGER, out2 IN OUT INTEGER)/ +DROP FUNCTION p_create_author()/ +DROP FUNCTION p_create_author_by_name(first_name VARCHAR, last_name VARCHAR)/ +DROP FUNCTION p_author_exists(author_name VARCHAR, result OUT INTEGER)/ +DROP FUNCTION p391( + i1 INTEGER, io1 IN OUT INTEGER, o1 OUT INTEGER, + o2 OUT INTEGER, io2 IN OUT INTEGER, i2 INTEGER) +/ +DROP FUNCTION f_author_exists(author_name VARCHAR);/ +DROP FUNCTION f_one();/ +DROP FUNCTION f_number(n int);/ +DROP FUNCTION f317(p1 int, p2 int, p3 int, p4 int);/ +DROP FUNCTION p_get_two_cursors(books OUT refcursor, authors OUT refcursor)/ +DROP FUNCTION p_get_one_cursor(total OUT int, books OUT refcursor, book_ids in int[])/ +DROP FUNCTION f_get_one_cursor(book_ids IN int[])/ + DROP TRIGGER IF EXISTS t_triggers_trigger ON t_triggers/ +DROP FUNCTION p_triggers()/ DROP TABLE IF EXISTS t_triggers CASCADE/ DROP TABLE IF EXISTS t_arrays CASCADE/ @@ -30,32 +56,8 @@ DROP TABLE IF EXISTS t_725_lob_test/ DROP TABLE IF EXISTS t_785/ DROP TABLE IF EXISTS t_959/ DROP TABLE IF EXISTS t_booleans/ - -DROP FUNCTION p_triggers()/ -DROP FUNCTION f_arrays(in_array IN integer[])/ -DROP FUNCTION f_arrays(in_array IN bigint[])/ -DROP FUNCTION f_arrays(in_array IN text[])/ -DROP FUNCTION p_arrays(in_array IN integer[], out_array OUT integer[])/ -DROP FUNCTION p_arrays(in_array IN bigint[], out_array OUT bigint[])/ -DROP FUNCTION p_arrays(in_array IN text[], out_array OUT text[])/ -DROP FUNCTION p_enhance_address1(address IN u_address_type, no OUT VARCHAR)/ -DROP FUNCTION p_enhance_address2(address OUT u_address_type)/ -DROP FUNCTION p_enhance_address3(address IN OUT u_address_type)/ -DROP FUNCTION p_unused(in1 VARCHAR, out1 OUT INTEGER, out2 IN OUT INTEGER)/ -DROP FUNCTION p_create_author()/ -DROP FUNCTION p_create_author_by_name(first_name VARCHAR, last_name VARCHAR)/ -DROP FUNCTION p_author_exists(author_name VARCHAR, result OUT INTEGER)/ -DROP FUNCTION p391( - i1 INTEGER, io1 IN OUT INTEGER, o1 OUT INTEGER, - o2 OUT INTEGER, io2 IN OUT INTEGER, i2 INTEGER) -/ -DROP FUNCTION f_author_exists(author_name VARCHAR);/ -DROP FUNCTION f_one();/ -DROP FUNCTION f_number(n int);/ -DROP FUNCTION f317(p1 int, p2 int, p3 int, p4 int);/ -DROP FUNCTION p_get_two_cursors(books OUT refcursor, authors OUT refcursor)/ -DROP FUNCTION p_get_one_cursor(total OUT int, books OUT refcursor, book_ids in int[])/ -DROP FUNCTION f_get_one_cursor(book_ids IN int[])/ +DROP TABLE IF EXISTS t_identity/ +DROP TABLE IF EXISTS t_identity_pk/ DROP TYPE IF EXISTS u_address_type CASCADE/ DROP TYPE IF EXISTS u_street_type CASCADE/ @@ -91,6 +93,20 @@ CREATE TYPE u_address_type AS ( ) / +CREATE TABLE t_identity_pk ( + id serial not null, + val int, + + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) +) +/ + +CREATE TABLE t_identity ( + id serial not null, + val int +) +/ + CREATE TABLE t_booleans ( id int, one_zero int, diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Keys.java index 1c3939f71e..ca32253e23 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Keys.java @@ -14,6 +14,8 @@ package org.jooq.test.postgres.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_t_identity = createIdentity(org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY.ID); + public static final org.jooq.Identity IDENTITY_t_identity_pk = createIdentity(org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); public static final org.jooq.Identity IDENTITY_t_triggers = createIdentity(org.jooq.test.postgres.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.postgres.generatedclasses.tables.TTriggers.T_TRIGGERS.ID_GENERATED); // UNIQUE and PRIMARY KEY definitions @@ -25,6 +27,7 @@ public class Keys extends org.jooq.impl.AbstractKeys { public static final org.jooq.UniqueKey uk_t_book_store_name = createUniqueKey(org.jooq.test.postgres.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.postgres.generatedclasses.tables.TBookStore.T_BOOK_STORE.NAME); public static final org.jooq.UniqueKey pk_b2bs = createUniqueKey(org.jooq.test.postgres.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.postgres.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_STORE_NAME, org.jooq.test.postgres.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_ID); public static final org.jooq.UniqueKey pk_t_booleans = createUniqueKey(org.jooq.test.postgres.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.postgres.generatedclasses.tables.TBooleans.T_BOOLEANS.ID); + public static final org.jooq.UniqueKey pk_t_identity_pk = createUniqueKey(org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); public static final org.jooq.UniqueKey pk_t_triggers = createUniqueKey(org.jooq.test.postgres.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.postgres.generatedclasses.tables.TTriggers.T_TRIGGERS.ID_GENERATED); public static final org.jooq.UniqueKey pk_x_test_case_64_69 = createUniqueKey(org.jooq.test.postgres.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.postgres.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69.ID); public static final org.jooq.UniqueKey pk_x_test_case_71 = createUniqueKey(org.jooq.test.postgres.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.postgres.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71.ID); diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Public.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Public.java index 8d6909ae5a..0bf3deedb2 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Public.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Public.java @@ -10,7 +10,7 @@ package org.jooq.test.postgres.generatedclasses; comments = "This class is generated by jOOQ") public class Public extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 385073319; + private static final long serialVersionUID = -2054715984; /** * The singleton instance of public @@ -53,6 +53,8 @@ public class Public extends org.jooq.impl.SchemaImpl { org.jooq.test.postgres.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.postgres.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.postgres.generatedclasses.tables.TBooleans.T_BOOLEANS, + org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY, + org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.postgres.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.postgres.generatedclasses.tables.VAuthor.V_AUTHOR, org.jooq.test.postgres.generatedclasses.tables.VBook.V_BOOK, diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Tables.java index 00019b18f5..39b94c3e49 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/Tables.java @@ -77,6 +77,16 @@ public final class Tables { */ public static org.jooq.test.postgres.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.postgres.generatedclasses.tables.TBooleans.T_BOOLEANS; + /** + * The table public.t_identity + */ + public static org.jooq.test.postgres.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY; + + /** + * The table public.t_identity_pk + */ + public static org.jooq.test.postgres.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + /** * The table public.t_triggers */ diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/TIdentity.java new file mode 100644 index 0000000000..d8892e6932 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/TIdentity.java @@ -0,0 +1,66 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.postgres.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentity extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = 64772216; + + /** + * The singleton instance of t_identity + */ + public static final org.jooq.test.postgres.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.postgres.generatedclasses.tables.TIdentity(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.postgres.generatedclasses.tables.records.TIdentityRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + */ + public final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * No further instances allowed + */ + private TIdentity() { + super("t_identity", org.jooq.test.postgres.generatedclasses.Public.PUBLIC); + } + + /** + * No further instances allowed + */ + private TIdentity(java.lang.String alias) { + super(alias, org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.postgres.generatedclasses.Keys.IDENTITY_t_identity; + } + + @Override + public org.jooq.test.postgres.generatedclasses.tables.TIdentity as(java.lang.String alias) { + return new org.jooq.test.postgres.generatedclasses.tables.TIdentity(alias); + } +} diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..75f178becf --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,79 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.postgres.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = 1753044754; + + /** + * The singleton instance of t_identity_pk + */ + public static final org.jooq.test.postgres.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.postgres.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.postgres.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("t_identity_pk", org.jooq.test.postgres.generatedclasses.Public.PUBLIC); + } + + /** + * No further instances allowed + */ + private TIdentityPk(java.lang.String alias) { + super(alias, org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.postgres.generatedclasses.Keys.IDENTITY_t_identity_pk; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.postgres.generatedclasses.Keys.pk_t_identity_pk; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.postgres.generatedclasses.Keys.pk_t_identity_pk); + } + + @Override + public org.jooq.test.postgres.generatedclasses.tables.TIdentityPk as(java.lang.String alias) { + return new org.jooq.test.postgres.generatedclasses.tables.TIdentityPk(alias); + } +} diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TAuthorRecord.java index a9bc97a8d6..e0ec8b0b0d 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TAuthorRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.postgres.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -240388905; + private static final long serialVersionUID = -1841669987; /** * An uncommented item @@ -35,10 +35,10 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl fetchTBookListByAuthorId() { + public java.util.List fetchTBookListByCoAuthorId() { return create() .selectFrom(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK) - .where(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK.AUTHOR_ID.equal(getValue(org.jooq.test.postgres.generatedclasses.tables.TAuthor.T_AUTHOR.ID))) + .where(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK.CO_AUTHOR_ID.equal(getValue(org.jooq.test.postgres.generatedclasses.tables.TAuthor.T_AUTHOR.ID))) .fetch(); } @@ -47,10 +47,10 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl fetchTBookListByCoAuthorId() { + public java.util.List fetchTBookListByAuthorId() { return create() .selectFrom(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK) - .where(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK.CO_AUTHOR_ID.equal(getValue(org.jooq.test.postgres.generatedclasses.tables.TAuthor.T_AUTHOR.ID))) + .where(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK.AUTHOR_ID.equal(getValue(org.jooq.test.postgres.generatedclasses.tables.TAuthor.T_AUTHOR.ID))) .fetch(); } diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..d633697ac6 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.postgres.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = -1892016669; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.postgres.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TIdentityRecord.java new file mode 100644 index 0000000000..87fc241adc --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TIdentityRecord.java @@ -0,0 +1,49 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.postgres.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = 216581410; + + /** + * An uncommented item + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY.ID, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY.VAL); + } + + /** + * Create a detached TIdentityRecord + */ + public TIdentityRecord() { + super(org.jooq.test.postgres.generatedclasses.tables.TIdentity.T_IDENTITY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/postgres/reset.sql b/jOOQ-test/src/org/jooq/test/postgres/reset.sql index 4fdc384c95..165021efcf 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/reset.sql +++ b/jOOQ-test/src/org/jooq/test/postgres/reset.sql @@ -12,6 +12,8 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity/ +DELETE FROM t_identity_pk/ DROP SEQUENCE IF EXISTS s_author_id/ CREATE SEQUENCE s_author_id/ diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/create.sql b/jOOQ-test/src/org/jooq/test/sqlserver/create.sql index d698e8b3a5..dc86b1c6b0 100644 --- a/jOOQ-test/src/org/jooq/test/sqlserver/create.sql +++ b/jOOQ-test/src/org/jooq/test/sqlserver/create.sql @@ -2,6 +2,28 @@ DROP VIEW v_library/ DROP VIEW v_author/ DROP VIEW v_book/ +DROP PROCEDURE p_arrays1/ +DROP PROCEDURE p_arrays2/ +DROP PROCEDURE p_arrays3/ +DROP PROCEDURE p_many_parameters/ +DROP FUNCTION f_arrays1/ +DROP FUNCTION f_arrays2/ +DROP FUNCTION f_arrays3/ +DROP PROCEDURE p_enhance_address1/ +DROP PROCEDURE p_enhance_address2/ +DROP PROCEDURE p_enhance_address3/ +DROP PROCEDURE p_unused/ +DROP PROCEDURE p_create_author/ +DROP PROCEDURE p_create_author_by_name/ +DROP PROCEDURE p_author_exists/ +DROP PROCEDURE p391/ +DROP FUNCTION f_many_parameters/ +DROP FUNCTION f_author_exists/ +DROP FUNCTION f_one/ +DROP FUNCTION f_number/ +DROP FUNCTION f317/ +DROP FUNCTION f378/ + DROP TRIGGER t_triggers_trigger/ DROP TABLE t_triggers/ @@ -28,35 +50,22 @@ DROP TABLE t_658_32/ DROP TABLE t_725_lob_test/ DROP TABLE t_785/ DROP TABLE t_booleans/ +DROP TABLE t_identity/ +DROP TABLE t_identity_pk/ -DROP PROCEDURE p_arrays1/ -DROP PROCEDURE p_arrays2/ -DROP PROCEDURE p_arrays3/ -DROP PROCEDURE p_many_parameters/ -DROP FUNCTION f_arrays1/ -DROP FUNCTION f_arrays2/ -DROP FUNCTION f_arrays3/ -DROP PROCEDURE p_enhance_address1/ -DROP PROCEDURE p_enhance_address2/ -DROP PROCEDURE p_enhance_address3/ -DROP PROCEDURE p_unused/ -DROP PROCEDURE p_create_author/ -DROP PROCEDURE p_create_author_by_name/ -DROP PROCEDURE p_author_exists/ -DROP PROCEDURE p391/ -DROP FUNCTION f_many_parameters/ -DROP FUNCTION f_author_exists/ -DROP FUNCTION f_one/ -DROP FUNCTION f_number/ -DROP FUNCTION f317/ -DROP FUNCTION f378/ +CREATE TABLE t_identity_pk ( + id INTEGER IDENTITY(1,1) NOT NULL, + val int, + + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) +) +/ -DROP TYPE u_address_type/ -DROP TYPE u_street_type/ -DROP TYPE u_string_array/ -DROP TYPE u_number_array/ -DROP TYPE u_number_long_array/ -DROP TYPE u_date_array/ +CREATE TABLE t_identity ( + id INTEGER IDENTITY(1,1) NOT NULL, + val int +) +/ CREATE TABLE t_booleans ( diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Dbo.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Dbo.java index 064afbd40f..5ab3cc8396 100644 --- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Dbo.java +++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Dbo.java @@ -10,7 +10,7 @@ package org.jooq.test.sqlserver.generatedclasses; comments = "This class is generated by jOOQ") public class Dbo extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 876759211; + private static final long serialVersionUID = -2124197744; /** * The singleton instance of dbo @@ -36,6 +36,8 @@ public class Dbo extends org.jooq.impl.SchemaImpl { org.jooq.test.sqlserver.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.sqlserver.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.sqlserver.generatedclasses.tables.TBooleans.T_BOOLEANS, + org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY, + org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.sqlserver.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlserver.generatedclasses.tables.VAuthor.V_AUTHOR, org.jooq.test.sqlserver.generatedclasses.tables.VBook.V_BOOK, diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Keys.java index 9d179023b8..207e8f303d 100644 --- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Keys.java @@ -14,6 +14,8 @@ package org.jooq.test.sqlserver.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_t_identity = createIdentity(org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY.ID); + public static final org.jooq.Identity IDENTITY_t_identity_pk = createIdentity(org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); public static final org.jooq.Identity IDENTITY_t_triggers = createIdentity(org.jooq.test.sqlserver.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlserver.generatedclasses.tables.TTriggers.T_TRIGGERS.ID_GENERATED); // UNIQUE and PRIMARY KEY definitions @@ -24,6 +26,7 @@ public class Keys extends org.jooq.impl.AbstractKeys { public static final org.jooq.UniqueKey uk_t_book_store_name = createUniqueKey(org.jooq.test.sqlserver.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.sqlserver.generatedclasses.tables.TBookStore.T_BOOK_STORE.NAME); public static final org.jooq.UniqueKey pk_b2bs = createUniqueKey(org.jooq.test.sqlserver.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.sqlserver.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_STORE_NAME, org.jooq.test.sqlserver.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_ID); public static final org.jooq.UniqueKey pk_t_booleans = createUniqueKey(org.jooq.test.sqlserver.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.sqlserver.generatedclasses.tables.TBooleans.T_BOOLEANS.ID); + public static final org.jooq.UniqueKey pk_t_identity_pk = createUniqueKey(org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); public static final org.jooq.UniqueKey pk_t_triggers = createUniqueKey(org.jooq.test.sqlserver.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlserver.generatedclasses.tables.TTriggers.T_TRIGGERS.ID_GENERATED); public static final org.jooq.UniqueKey pk_x_test_case_64_69 = createUniqueKey(org.jooq.test.sqlserver.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.sqlserver.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69.ID); public static final org.jooq.UniqueKey pk_x_test_case_71 = createUniqueKey(org.jooq.test.sqlserver.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.sqlserver.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71.ID); diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Tables.java index ee97e4a186..86a4c776ee 100644 --- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/Tables.java @@ -57,6 +57,16 @@ public final class Tables { */ public static org.jooq.test.sqlserver.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.sqlserver.generatedclasses.tables.TBooleans.T_BOOLEANS; + /** + * The table dbo.t_identity + */ + public static org.jooq.test.sqlserver.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY; + + /** + * The table dbo.t_identity_pk + */ + public static org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + /** * The table dbo.t_triggers */ diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/TIdentity.java new file mode 100644 index 0000000000..ad4c455a23 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/TIdentity.java @@ -0,0 +1,66 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.sqlserver.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentity extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = -2007708464; + + /** + * The singleton instance of t_identity + */ + public static final org.jooq.test.sqlserver.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.sqlserver.generatedclasses.tables.TIdentity(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.sqlserver.generatedclasses.tables.records.TIdentityRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + */ + public final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * No further instances allowed + */ + private TIdentity() { + super("t_identity", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO); + } + + /** + * No further instances allowed + */ + private TIdentity(java.lang.String alias) { + super(alias, org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.sqlserver.generatedclasses.Keys.IDENTITY_t_identity; + } + + @Override + public org.jooq.test.sqlserver.generatedclasses.tables.TIdentity as(java.lang.String alias) { + return new org.jooq.test.sqlserver.generatedclasses.tables.TIdentity(alias); + } +} diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..da2341f241 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,79 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.sqlserver.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = 19681038; + + /** + * The singleton instance of t_identity_pk + */ + public static final org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.sqlserver.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("t_identity_pk", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO); + } + + /** + * No further instances allowed + */ + private TIdentityPk(java.lang.String alias) { + super(alias, org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.sqlserver.generatedclasses.Keys.IDENTITY_t_identity_pk; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.sqlserver.generatedclasses.Keys.pk_t_identity_pk; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.sqlserver.generatedclasses.Keys.pk_t_identity_pk); + } + + @Override + public org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk as(java.lang.String alias) { + return new org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk(alias); + } +} diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..a2a698e855 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.sqlserver.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = 102592737; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.sqlserver.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TIdentityRecord.java new file mode 100644 index 0000000000..bfde49ef95 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TIdentityRecord.java @@ -0,0 +1,49 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.sqlserver.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = 2125906416; + + /** + * An uncommented item + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY.ID, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY.VAL); + } + + /** + * Create a detached TIdentityRecord + */ + public TIdentityRecord() { + super(org.jooq.test.sqlserver.generatedclasses.tables.TIdentity.T_IDENTITY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/reset.sql b/jOOQ-test/src/org/jooq/test/sqlserver/reset.sql index 5fbaa976aa..6e7846dae4 100644 --- a/jOOQ-test/src/org/jooq/test/sqlserver/reset.sql +++ b/jOOQ-test/src/org/jooq/test/sqlserver/reset.sql @@ -11,6 +11,8 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity/ +DELETE FROM t_identity_pk/ INSERT INTO t_language (id, cd, description, description_english) VALUES (1, 'en', 'English', 'English')/ INSERT INTO t_language (id, cd, description, description_english) VALUES (2, 'de', 'Deutsch', 'German')/ diff --git a/jOOQ-test/src/org/jooq/test/sybase/create.sql b/jOOQ-test/src/org/jooq/test/sybase/create.sql index 4db4bdd4b4..95919e673e 100644 --- a/jOOQ-test/src/org/jooq/test/sybase/create.sql +++ b/jOOQ-test/src/org/jooq/test/sybase/create.sql @@ -2,6 +2,16 @@ DROP VIEW IF EXISTS v_library/ DROP VIEW IF EXISTS v_author/ DROP VIEW IF EXISTS v_book/ +DROP PROCEDURE IF EXISTS p_unused/ +DROP PROCEDURE IF EXISTS p_author_exists/ +DROP PROCEDURE IF EXISTS p_create_author/ +DROP PROCEDURE IF EXISTS p_create_author_by_name/ +DROP PROCEDURE IF EXISTS p391/ +DROP FUNCTION IF EXISTS f_author_exists/ +DROP FUNCTION IF EXISTS f_one/ +DROP FUNCTION IF EXISTS f_number/ +DROP FUNCTION IF EXISTS f317/ + DROP TRIGGER IF EXISTS t_triggers_trigger/ DROP TABLE IF EXISTS t_triggers/ @@ -28,16 +38,22 @@ DROP TABLE IF EXISTS t_658_32/ DROP TABLE IF EXISTS t_725_lob_test/ DROP TABLE IF EXISTS t_785/ DROP TABLE IF EXISTS t_booleans/ +DROP TABLE IF EXISTS t_identity/ +DROP TABLE IF EXISTS t_identity_pk/ -DROP PROCEDURE IF EXISTS p_unused/ -DROP PROCEDURE IF EXISTS p_author_exists/ -DROP PROCEDURE IF EXISTS p_create_author/ -DROP PROCEDURE IF EXISTS p_create_author_by_name/ -DROP PROCEDURE IF EXISTS p391/ -DROP FUNCTION IF EXISTS f_author_exists/ -DROP FUNCTION IF EXISTS f_one/ -DROP FUNCTION IF EXISTS f_number/ -DROP FUNCTION IF EXISTS f317/ +CREATE TABLE t_identity_pk ( + id INTEGER NOT NULL IDENTITY, + val int, + + CONSTRAINT pk_t_identity_pk PRIMARY KEY (id) +) +/ + +CREATE TABLE t_identity ( + id INTEGER NOT NULL IDENTITY, + val int +) +/ CREATE TABLE t_booleans ( id int, diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Dba.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Dba.java index 402e34badf..8c9d9b4dae 100644 --- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Dba.java +++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Dba.java @@ -10,7 +10,7 @@ package org.jooq.test.sybase.generatedclasses; comments = "This class is generated by jOOQ") public class Dba extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -1062159826; + private static final long serialVersionUID = 1202286941; /** * The singleton instance of dba @@ -32,6 +32,8 @@ public class Dba extends org.jooq.impl.SchemaImpl { @Override public final java.util.List> getTables() { return java.util.Arrays.>asList( + org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, + org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.sybase.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.sybase.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sybase.generatedclasses.tables.T_658Ref.T_658_REF, diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Keys.java index ec12b37b58..fb2dfd6c2d 100644 --- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Keys.java @@ -14,9 +14,12 @@ package org.jooq.test.sybase.generatedclasses; public class Keys extends org.jooq.impl.AbstractKeys { // IDENTITY definitions + public static final org.jooq.Identity IDENTITY_t_identity_pk = createIdentity(org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); + public static final org.jooq.Identity IDENTITY_t_identity = createIdentity(org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY.ID); public static final org.jooq.Identity IDENTITY_t_triggers = createIdentity(org.jooq.test.sybase.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sybase.generatedclasses.tables.TTriggers.T_TRIGGERS.ID_GENERATED); // UNIQUE and PRIMARY KEY definitions + public static final org.jooq.UniqueKey t_identity_pk__pk_t_identity_pk = createUniqueKey(org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK, org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); public static final org.jooq.UniqueKey t_booleans__pk_t_booleans = createUniqueKey(org.jooq.test.sybase.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.sybase.generatedclasses.tables.TBooleans.T_BOOLEANS.ID); public static final org.jooq.UniqueKey t_triggers__pk_t_triggers = createUniqueKey(org.jooq.test.sybase.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sybase.generatedclasses.tables.TTriggers.T_TRIGGERS.ID_GENERATED); public static final org.jooq.UniqueKey t_725_lob_test__pk_t_725_lob_test = createUniqueKey(org.jooq.test.sybase.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST, org.jooq.test.sybase.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST.ID); diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Tables.java index 57561b6f60..8bf2b86de5 100644 --- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Tables.java @@ -12,6 +12,16 @@ package org.jooq.test.sybase.generatedclasses; comments = "This class is generated by jOOQ") public final class Tables { + /** + * The table dba.t_identity_pk + */ + public static org.jooq.test.sybase.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK; + + /** + * The table dba.t_identity + */ + public static org.jooq.test.sybase.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY; + /** * The table dba.t_booleans */ diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentity.java new file mode 100644 index 0000000000..b685925838 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentity.java @@ -0,0 +1,66 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.sybase.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentity extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = -1228304264; + + /** + * The singleton instance of t_identity + */ + public static final org.jooq.test.sybase.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.sybase.generatedclasses.tables.TIdentity(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.sybase.generatedclasses.tables.records.TIdentityRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + */ + public final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * No further instances allowed + */ + private TIdentity() { + super("t_identity", org.jooq.test.sybase.generatedclasses.Dba.DBA); + } + + /** + * No further instances allowed + */ + private TIdentity(java.lang.String alias) { + super(alias, org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.sybase.generatedclasses.Keys.IDENTITY_t_identity; + } + + @Override + public org.jooq.test.sybase.generatedclasses.tables.TIdentity as(java.lang.String alias) { + return new org.jooq.test.sybase.generatedclasses.tables.TIdentity(alias); + } +} diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentityPk.java new file mode 100644 index 0000000000..43a60f69b6 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentityPk.java @@ -0,0 +1,79 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.sybase.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl { + + private static final long serialVersionUID = 1125237344; + + /** + * The singleton instance of t_identity_pk + */ + public static final org.jooq.test.sybase.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.sybase.generatedclasses.tables.TIdentityPk(); + + /** + * The class holding records for this type + */ + private static final java.lang.Class __RECORD_TYPE = org.jooq.test.sybase.generatedclasses.tables.records.TIdentityPkRecord.class; + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return __RECORD_TYPE; + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public final org.jooq.TableField ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField VAL = createField("val", org.jooq.impl.SQLDataType.INTEGER, this); + + /** + * No further instances allowed + */ + private TIdentityPk() { + super("t_identity_pk", org.jooq.test.sybase.generatedclasses.Dba.DBA); + } + + /** + * No further instances allowed + */ + private TIdentityPk(java.lang.String alias) { + super(alias, org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } + + @Override + public org.jooq.Identity getIdentity() { + return org.jooq.test.sybase.generatedclasses.Keys.IDENTITY_t_identity_pk; + } + + @Override + public org.jooq.UniqueKey getMainKey() { + return org.jooq.test.sybase.generatedclasses.Keys.t_identity_pk__pk_t_identity_pk; + } + + @Override + @SuppressWarnings("unchecked") + public java.util.List> getKeys() { + return java.util.Arrays.>asList(org.jooq.test.sybase.generatedclasses.Keys.t_identity_pk__pk_t_identity_pk); + } + + @Override + public org.jooq.test.sybase.generatedclasses.tables.TIdentityPk as(java.lang.String alias) { + return new org.jooq.test.sybase.generatedclasses.tables.TIdentityPk(alias); + } +} diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TIdentityPkRecord.java new file mode 100644 index 0000000000..dc2819d6e1 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TIdentityPkRecord.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.sybase.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl { + + private static final long serialVersionUID = -1006904611; + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID, value); + } + + /** + * An uncommented item + * + * PRIMARY KEY + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK.VAL); + } + + /** + * Create a detached TIdentityPkRecord + */ + public TIdentityPkRecord() { + super(org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK); + } +} diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TIdentityRecord.java new file mode 100644 index 0000000000..74d8f61be2 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TIdentityRecord.java @@ -0,0 +1,49 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.sybase.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = {"http://www.jooq.org", "2.0.0"}, + comments = "This class is generated by jOOQ") +public class TIdentityRecord extends org.jooq.impl.TableRecordImpl { + + private static final long serialVersionUID = -376909404; + + /** + * An uncommented item + */ + public void setId(java.lang.Integer value) { + setValue(org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY.ID, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getId() { + return getValue(org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY.ID); + } + + /** + * An uncommented item + */ + public void setVal(java.lang.Integer value) { + setValue(org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY.VAL, value); + } + + /** + * An uncommented item + */ + public java.lang.Integer getVal() { + return getValue(org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY.VAL); + } + + /** + * Create a detached TIdentityRecord + */ + public TIdentityRecord() { + super(org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY); + } +} diff --git a/jOOQ-test/src/org/jooq/test/sybase/reset.sql b/jOOQ-test/src/org/jooq/test/sybase/reset.sql index 8318509922..c71bfb2cbc 100644 --- a/jOOQ-test/src/org/jooq/test/sybase/reset.sql +++ b/jOOQ-test/src/org/jooq/test/sybase/reset.sql @@ -11,6 +11,8 @@ DELETE FROM t_book/ DELETE FROM t_author/ DELETE FROM t_language/ DELETE FROM t_booleans/ +DELETE FROM t_identity/ +DELETE FROM t_identity_pk/ DROP SEQUENCE s_author_id/ CREATE SEQUENCE s_author_id/