From 3bd59d0c25cc7a36b9310dbe49246a329f968a4e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 10 Mar 2012 17:49:51 +0000 Subject: [PATCH] [#1013] Add integration tests for various use-cases involving custom enum types --- .../jooq/configuration/lukas/ase/library.xml | 2 +- .../configuration/lukas/derby/library.xml | 2 +- jOOQ-test/src/org/jooq/test/BaseTest.java | 12 ++ .../org/jooq/test/_/testcases/EnumTests.java | 34 ++--- .../jooq/test/_/testcases/GeneralTests.java | 2 +- .../generatedclasses/tables/TBooleans.java | 8 +- .../tables/records/TBooleansRecord.java | 14 +- .../generatedclasses/tables/TBooleans.java | 8 +- .../tables/records/TBooleansRecord.java | 16 +-- .../generatedclasses/tables/TBooleans.java | 8 +- .../tables/records/TBooleansRecord.java | 14 +- jOOQ-test/src/org/jooq/test/hsqldb/create.sql | 14 -- .../test/hsqldb/generatedclasses/Keys.java | 1 - .../test/hsqldb/generatedclasses/Public.java | 3 +- .../test/hsqldb/generatedclasses/Tables.java | 5 - .../generatedclasses/tables/TMappedTypes.java | 99 -------------- .../tables/records/TMappedTypesRecord.java | 123 ------------------ jOOQ-test/src/org/jooq/test/jOOQASETest.java | 15 +++ .../src/org/jooq/test/jOOQAbstractTest.java | 3 + jOOQ-test/src/org/jooq/test/jOOQDB2Test.java | 15 +++ .../src/org/jooq/test/jOOQDerbyTest.java | 15 +++ jOOQ-test/src/org/jooq/test/jOOQH2Test.java | 15 +++ .../src/org/jooq/test/jOOQHSQLDBTest.java | 69 +++------- .../src/org/jooq/test/jOOQHSQLDBTest2.java | 15 +++ .../src/org/jooq/test/jOOQIngresTest.java | 15 +++ .../src/org/jooq/test/jOOQMySQLTest.java | 15 +++ .../jooq/test/jOOQMySQLTestSchemaRewrite.java | 15 +++ .../src/org/jooq/test/jOOQOracleTest.java | 15 +++ .../src/org/jooq/test/jOOQPostgresTest.java | 15 +++ .../src/org/jooq/test/jOOQSQLServerTest.java | 15 +++ .../src/org/jooq/test/jOOQSQLiteTest.java | 15 +++ .../src/org/jooq/test/jOOQSybaseTest.java | 15 +++ 32 files changed, 275 insertions(+), 357 deletions(-) delete mode 100644 jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TMappedTypes.java delete mode 100644 jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TMappedTypesRecord.java diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.xml index 6f7991cac0..763fc55533 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.xml +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.xml @@ -77,7 +77,7 @@ - BOOLEAN + BIT (?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN) diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml index e3a8313499..e1f3d57fc7 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml @@ -77,7 +77,7 @@ - BIT + BOOLEAN (?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN) diff --git a/jOOQ-test/src/org/jooq/test/BaseTest.java b/jOOQ-test/src/org/jooq/test/BaseTest.java index f442f12ada..27872359fe 100644 --- a/jOOQ-test/src/org/jooq/test/BaseTest.java +++ b/jOOQ-test/src/org/jooq/test/BaseTest.java @@ -315,6 +315,18 @@ public abstract class BaseTest< return delegate.TBooleans_Boolean_YES_NO_UC(); } + public TableField TBooleans_VC() { + return delegate.TBooleans_VC(); + } + + public TableField TBooleans_C() { + return delegate.TBooleans_C(); + } + + public TableField TBooleans_N() { + return delegate.TBooleans_N(); + } + protected Table TArrays() { return delegate.TArrays(); } diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java index 7fe4c94867..38bacced5c 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java @@ -121,16 +121,6 @@ extends BaseTest b1 = (Field) getField(booleans, "C_BOOLEAN"); -// -// @SuppressWarnings("unchecked") -// Field b2 = (Field) getField(booleans, "VC_BOOLEAN"); -// -// @SuppressWarnings("unchecked") -// Field b3 = (Field) getField(booleans, "N_BOOLEAN"); - assertEquals(1, create().insertInto(TBooleans()) .set(TBooleans_ID(), 1) @@ -141,9 +131,9 @@ extends BaseTest result = @@ -188,14 +178,14 @@ extends BaseTest { - private static final long serialVersionUID = -1590319896; + private static final long serialVersionUID = -241244478; /** * The singleton instance of dbo.t_booleans @@ -73,17 +73,17 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl VC_BOOLEAN = createField("vc_boolean", org.jooq.impl.SQLDataType.VARCHAR, T_BOOLEANS); + public static final org.jooq.TableField VC_BOOLEAN = createField("vc_boolean", org.jooq.impl.SQLDataType.BIT, T_BOOLEANS); /** * An uncommented item */ - public static final org.jooq.TableField C_BOOLEAN = createField("c_boolean", org.jooq.impl.SQLDataType.CHAR, T_BOOLEANS); + public static final org.jooq.TableField C_BOOLEAN = createField("c_boolean", org.jooq.impl.SQLDataType.BIT, T_BOOLEANS); /** * An uncommented item */ - public static final org.jooq.TableField N_BOOLEAN = createField("n_boolean", org.jooq.impl.SQLDataType.INTEGER, T_BOOLEANS); + public static final org.jooq.TableField N_BOOLEAN = createField("n_boolean", org.jooq.impl.SQLDataType.BIT, T_BOOLEANS); /** * No further instances allowed diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBooleansRecord.java index 6764009f8e..e872cbf245 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBooleansRecord.java @@ -8,7 +8,7 @@ package org.jooq.test.ase.generatedclasses.tables.records; */ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -1880706209; + private static final long serialVersionUID = 188549929; /** * An uncommented item @@ -129,42 +129,42 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, T_BOOLEANS); @@ -73,17 +73,17 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.VARCHAR, T_BOOLEANS); + public static final org.jooq.TableField VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS); /** * An uncommented item */ - public static final org.jooq.TableField C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.CHAR, T_BOOLEANS); + public static final org.jooq.TableField C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS); /** * An uncommented item */ - public static final org.jooq.TableField N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.INTEGER, T_BOOLEANS); + public static final org.jooq.TableField N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS); /** * No further instances allowed diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBooleansRecord.java index 1fc25a3c56..bc393a1951 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBooleansRecord.java @@ -12,7 +12,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -1609040401; + private static final long serialVersionUID = 944678732; /** * The singleton instance of TEST.T_BOOLEANS @@ -73,17 +73,17 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.VARCHAR, T_BOOLEANS); + public static final org.jooq.TableField VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS); /** * An uncommented item */ - public static final org.jooq.TableField C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.CHAR, T_BOOLEANS); + public static final org.jooq.TableField C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS); /** * An uncommented item */ - public static final org.jooq.TableField N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.INTEGER, T_BOOLEANS); + public static final org.jooq.TableField N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS); /** * No further instances allowed diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TBooleansRecord.java index 186a2e1467..868d7ff3c9 100644 --- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/TBooleansRecord.java @@ -8,7 +8,7 @@ package org.jooq.test.derby.generatedclasses.tables.records; */ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -762543030; + private static final long serialVersionUID = 621358932; /** * An uncommented item @@ -129,42 +129,42 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl 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_DATES = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.TDates.T_DATES, org.jooq.test.hsqldb.generatedclasses.tables.TDates.T_DATES.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_MAPPED_TYPES = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES, org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.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 a9c1945913..8aff0bb2ee 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 = 65328174; + private static final long serialVersionUID = -459797272; /** * The singleton instance of PUBLIC @@ -55,7 +55,6 @@ public class Public extends org.jooq.impl.SchemaImpl { org.jooq.test.hsqldb.generatedclasses.tables.TDates.T_DATES, 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.TMappedTypes.T_MAPPED_TYPES, 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 14fee29abc..769ec01a92 100644 --- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java @@ -127,11 +127,6 @@ public final class Tables { */ 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_MAPPED_TYPES - */ - public static org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes T_MAPPED_TYPES = org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES; - /** * The table PUBLIC.T_TRIGGERS */ diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TMappedTypes.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TMappedTypes.java deleted file mode 100644 index 5d735f2085..0000000000 --- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TMappedTypes.java +++ /dev/null @@ -1,99 +0,0 @@ -/** - * 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.6"}, - comments = "This class is generated by jOOQ") -public class TMappedTypes extends org.jooq.impl.UpdatableTableImpl { - - private static final long serialVersionUID = 197285916; - - /** - * The singleton instance of PUBLIC.T_MAPPED_TYPES - */ - public static final org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes T_MAPPED_TYPES = new org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes(); - - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord.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 JAVA_UTIL_DATE = createField("JAVA_UTIL_DATE", org.jooq.impl.SQLDataType.TIMESTAMP.asConvertedDataType(new org.jooq.test._.converters.DateConverter()), this); - - /** - * An uncommented item - */ - public final org.jooq.TableField JAVA_UTIL_CALENDAR = createField("JAVA_UTIL_CALENDAR", org.jooq.impl.SQLDataType.TIMESTAMP.asConvertedDataType(new org.jooq.test._.converters.CalendarConverter()), this); - - /** - * An uncommented item - */ - public final org.jooq.TableField DEFAULT_ENUM_ORDINAL = createField("DEFAULT_ENUM_ORDINAL", org.jooq.impl.SQLDataType.INTEGER.asConvertedDataType(new org.jooq.test._.converters.OrdinalEnumConverter()), this); - - /** - * An uncommented item - */ - public final org.jooq.TableField DEFAULT_ENUM_NAME = createField("DEFAULT_ENUM_NAME", org.jooq.impl.SQLDataType.VARCHAR.asConvertedDataType(new org.jooq.test._.converters.StringEnumConverter()), this); - - /** - * An uncommented item - */ - public final org.jooq.TableField CUSTOM_ENUM_NUMERIC = createField("CUSTOM_ENUM_NUMERIC", org.jooq.impl.SQLDataType.INTEGER.asConvertedDataType(new org.jooq.test._.converters.OrdinalEnum1Converter()), this); - - /** - * An uncommented item - */ - public final org.jooq.TableField CUSTOM_ENUM_TEXT = createField("CUSTOM_ENUM_TEXT", org.jooq.impl.SQLDataType.VARCHAR.asConvertedDataType(new org.jooq.test._.converters.StringEnum1Converter()), this); - - /** - * No further instances allowed - */ - private TMappedTypes() { - super("T_MAPPED_TYPES", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC); - } - - /** - * No further instances allowed - */ - private TMappedTypes(java.lang.String alias) { - super(alias, org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES); - } - - @Override - public org.jooq.UniqueKey getMainKey() { - return org.jooq.test.hsqldb.generatedclasses.Keys.PK_T_MAPPED_TYPES; - } - - @Override - @SuppressWarnings("unchecked") - public java.util.List> getKeys() { - return java.util.Arrays.>asList(org.jooq.test.hsqldb.generatedclasses.Keys.PK_T_MAPPED_TYPES); - } - - @Override - public org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes as(java.lang.String alias) { - return new org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes(alias); - } -} diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TMappedTypesRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TMappedTypesRecord.java deleted file mode 100644 index d74c793ceb..0000000000 --- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TMappedTypesRecord.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * 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.6"}, - comments = "This class is generated by jOOQ") -public class TMappedTypesRecord extends org.jooq.impl.UpdatableRecordImpl { - - private static final long serialVersionUID = 1171355220; - - /** - * An uncommented item - * - * PRIMARY KEY - */ - public void setId(java.lang.Integer value) { - setValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.ID, value); - } - - /** - * An uncommented item - * - * PRIMARY KEY - */ - public java.lang.Integer getId() { - return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.ID); - } - - /** - * An uncommented item - */ - public void setJavaUtilDate(java.util.Date value) { - setValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.JAVA_UTIL_DATE, value); - } - - /** - * An uncommented item - */ - public java.util.Date getJavaUtilDate() { - return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.JAVA_UTIL_DATE); - } - - /** - * An uncommented item - */ - public void setJavaUtilCalendar(java.util.GregorianCalendar value) { - setValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.JAVA_UTIL_CALENDAR, value); - } - - /** - * An uncommented item - */ - public java.util.GregorianCalendar getJavaUtilCalendar() { - return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.JAVA_UTIL_CALENDAR); - } - - /** - * An uncommented item - */ - public void setDefaultEnumOrdinal(org.jooq.test._.converters.OrdinalEnum value) { - setValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL, value); - } - - /** - * An uncommented item - */ - public org.jooq.test._.converters.OrdinalEnum getDefaultEnumOrdinal() { - return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL); - } - - /** - * An uncommented item - */ - public void setDefaultEnumName(org.jooq.test._.converters.StringEnum value) { - setValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.DEFAULT_ENUM_NAME, value); - } - - /** - * An uncommented item - */ - public org.jooq.test._.converters.StringEnum getDefaultEnumName() { - return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.DEFAULT_ENUM_NAME); - } - - /** - * An uncommented item - */ - public void setCustomEnumNumeric(org.jooq.test._.converters.OrdinalEnum1 value) { - setValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC, value); - } - - /** - * An uncommented item - */ - public org.jooq.test._.converters.OrdinalEnum1 getCustomEnumNumeric() { - return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC); - } - - /** - * An uncommented item - */ - public void setCustomEnumText(org.jooq.test._.converters.StringEnum1 value) { - setValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.CUSTOM_ENUM_TEXT, value); - } - - /** - * An uncommented item - */ - public org.jooq.test._.converters.StringEnum1 getCustomEnumText() { - return getValue(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES.CUSTOM_ENUM_TEXT); - } - - /** - * Create a detached TMappedTypesRecord - */ - public TMappedTypesRecord() { - super(org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES); - } -} diff --git a/jOOQ-test/src/org/jooq/test/jOOQASETest.java b/jOOQ-test/src/org/jooq/test/jOOQASETest.java index 8df97262a6..51bf4639b9 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQASETest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQASETest.java @@ -332,6 +332,21 @@ public class jOOQASETest extends jOOQAbstractTest< return TBooleans.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return TBooleans.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return TBooleans.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return TBooleans.N_BOOLEAN; + } + @Override protected Table T639() { return T_639NumbersTable.T_639_NUMBERS_TABLE; diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java index 41b5452ffe..e8c9eb1d20 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java @@ -606,6 +606,9 @@ public abstract class jOOQAbstractTest< protected abstract TableField TBooleans_Boolean_YN_UC(); protected abstract TableField TBooleans_Boolean_YES_NO_LC(); protected abstract TableField TBooleans_Boolean_YES_NO_UC(); + protected abstract TableField TBooleans_VC(); + protected abstract TableField TBooleans_C(); + protected abstract TableField TBooleans_N(); protected abstract UpdatableTable TDirectory(); protected abstract TableField TDirectory_ID(); diff --git a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java index 9aefb3a2cc..e3059c4135 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java +++ b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java @@ -414,6 +414,21 @@ public class jOOQDB2Test extends jOOQAbstractTest< return TBooleans.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return TBooleans.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return TBooleans.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return TBooleans.N_BOOLEAN; + } + @Override protected Table TArrays() { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java b/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java index 7b805b5848..7482c482a8 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java @@ -405,6 +405,21 @@ public class jOOQDerbyTest extends jOOQAbstractTest< return TBooleans.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return TBooleans.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return TBooleans.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return TBooleans.N_BOOLEAN; + } + @Override protected Table TArrays() { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java b/jOOQ-test/src/org/jooq/test/jOOQH2Test.java index 0a5a680418..1741e96f7e 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java +++ b/jOOQ-test/src/org/jooq/test/jOOQH2Test.java @@ -410,6 +410,21 @@ public class jOOQH2Test extends jOOQAbstractTest< return TBooleans.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return TBooleans.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return TBooleans.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return TBooleans.N_BOOLEAN; + } + @Override protected Table TArrays() { return TArrays.T_ARRAYS; diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java index abe63962ee..a047f1385f 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java @@ -36,7 +36,6 @@ package org.jooq.test; -import static junit.framework.Assert.assertEquals; import static org.jooq.test.hsqldb.generatedclasses.Tables.T_639_NUMBERS_TABLE; import static org.jooq.test.hsqldb.generatedclasses.Tables.T_658_REF; import static org.jooq.test.hsqldb.generatedclasses.Tables.T_725_LOB_TEST; @@ -54,13 +53,10 @@ 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; import static org.jooq.test.hsqldb.generatedclasses.Tables.V_LIBRARY; -import static org.jooq.test.hsqldb.generatedclasses.tables.TMappedTypes.T_MAPPED_TYPES; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Date; -import java.util.Calendar; -import java.util.GregorianCalendar; import org.jooq.ArrayRecord; import org.jooq.DataType; @@ -80,10 +76,6 @@ import org.jooq.test._.converters.Boolean_YES_NO_LC; import org.jooq.test._.converters.Boolean_YES_NO_UC; import org.jooq.test._.converters.Boolean_YN_LC; import org.jooq.test._.converters.Boolean_YN_UC; -import org.jooq.test._.converters.OrdinalEnum; -import org.jooq.test._.converters.OrdinalEnum1; -import org.jooq.test._.converters.StringEnum; -import org.jooq.test._.converters.StringEnum1; import org.jooq.test.hsqldb.generatedclasses.PublicFactory; import org.jooq.test.hsqldb.generatedclasses.Routines; import org.jooq.test.hsqldb.generatedclasses.Sequences; @@ -96,7 +88,6 @@ import org.jooq.test.hsqldb.generatedclasses.tables.records.TBooleansRecord; import org.jooq.test.hsqldb.generatedclasses.tables.records.TDatesRecord; 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.TMappedTypesRecord; 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; @@ -110,8 +101,6 @@ import org.jooq.tools.unsigned.ULong; import org.jooq.tools.unsigned.UShort; import org.jooq.util.hsqldb.HSQLDBDataType; -import org.junit.Test; - /** * @author Lukas Eder */ @@ -415,6 +404,21 @@ public class jOOQHSQLDBTest extends jOOQAbstractTest< return T_BOOLEANS.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return T_BOOLEANS.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return T_BOOLEANS.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return T_BOOLEANS.N_BOOLEAN; + } + @Override protected Table TArrays() { return T_ARRAYS; @@ -734,47 +738,4 @@ public class jOOQHSQLDBTest extends jOOQAbstractTest< HSQLDBDataType.VARCHARIGNORECASE, }; } - - @Test - public void testMapper() { - jOOQAbstractTest.reset = false; - - // TODO: Run this test twice, once with stmt, once with pstmt - TMappedTypesRecord record; - GregorianCalendar now = (GregorianCalendar) Calendar.getInstance(); - - // Storing a record using fields from a mapper - record = create().newRecord(T_MAPPED_TYPES); - record.setId(1); - record.setValue(T_MAPPED_TYPES.DEFAULT_ENUM_NAME, StringEnum.A); - record.setValue(T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL, OrdinalEnum.B); - record.setValue(T_MAPPED_TYPES.CUSTOM_ENUM_TEXT, StringEnum1.C); - record.setValue(T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC, OrdinalEnum1.C); - record.setValue(T_MAPPED_TYPES.JAVA_UTIL_DATE, now.getTime()); - record.setValue(T_MAPPED_TYPES.JAVA_UTIL_CALENDAR, now); - - assertEquals(1, record.store()); - - // Retrieving that record again using fields from a mapper - record = create().newRecord(T_MAPPED_TYPES); - record.setId(1); - record.refresh(); - assertEquals(StringEnum.A, record.getValue(T_MAPPED_TYPES.DEFAULT_ENUM_NAME)); - assertEquals(OrdinalEnum.B, record.getValue(T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL)); - assertEquals(StringEnum1.C, record.getValue(T_MAPPED_TYPES.CUSTOM_ENUM_TEXT)); - assertEquals(OrdinalEnum1.C, record.getValue(T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC)); - assertEquals(now.getTime(), record.getValue(T_MAPPED_TYPES.JAVA_UTIL_DATE)); - assertEquals(now, record.getValue(T_MAPPED_TYPES.JAVA_UTIL_CALENDAR)); - - // Check if using custom types in filters works - assertEquals(1, create().selectCount() - .from(T_MAPPED_TYPES) - .where(T_MAPPED_TYPES.DEFAULT_ENUM_NAME.equal(StringEnum.A)) - .and(T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL.equal(OrdinalEnum.B)) - .and(T_MAPPED_TYPES.CUSTOM_ENUM_TEXT.equal(StringEnum1.C)) - .and(T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC.equal(OrdinalEnum1.C)) - .and(T_MAPPED_TYPES.JAVA_UTIL_DATE.equal(now.getTime())) - .and(T_MAPPED_TYPES.JAVA_UTIL_CALENDAR.equal(now)) - .fetchOne(0)); - } } diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java index 7129c05429..fd8a9b59f8 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java +++ b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java @@ -415,6 +415,21 @@ public class jOOQHSQLDBTest2 extends jOOQAbstractTest< return T_BOOLEANS.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return T_BOOLEANS.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return T_BOOLEANS.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return T_BOOLEANS.N_BOOLEAN; + } + @Override protected Table TDates() { return T_DATES; diff --git a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java b/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java index 5fe14a3d5d..d5ef59e91a 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java @@ -406,6 +406,21 @@ public class jOOQIngresTest extends jOOQAbstractTest< return TBooleans.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return TBooleans.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return TBooleans.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return TBooleans.N_BOOLEAN; + } + @Override protected Table TArrays() { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java b/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java index a3f6ae8f3a..4be1ae22cc 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java @@ -429,6 +429,21 @@ public class jOOQMySQLTest extends jOOQAbstractTest< return TBooleans.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return TBooleans.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return TBooleans.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return TBooleans.N_BOOLEAN; + } + @Override protected Table TArrays() { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java index 300a3b4052..50871a2e01 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java +++ b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java @@ -406,6 +406,21 @@ public class jOOQMySQLTestSchemaRewrite extends jOOQAbstractTest< return T_BOOLEANS.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return T_BOOLEANS.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return T_BOOLEANS.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return T_BOOLEANS.N_BOOLEAN; + } + @Override protected Table TArrays() { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java index 02b6e0af69..2c72380887 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java @@ -415,6 +415,21 @@ public class jOOQOracleTest extends jOOQAbstractTest< return T_BOOLEANS.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return T_BOOLEANS.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return T_BOOLEANS.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return T_BOOLEANS.N_BOOLEAN; + } + @Override protected Table T658() { return T_658_REF; diff --git a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java b/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java index e8b23fd527..19e21ac4a8 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java @@ -338,6 +338,21 @@ public class jOOQPostgresTest extends jOOQAbstractTest< return T_BOOLEANS.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return T_BOOLEANS.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return T_BOOLEANS.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return T_BOOLEANS.N_BOOLEAN; + } + @Override protected Table T658() { return T_658_REF; diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java b/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java index 7c9c7798a2..1c51ade73f 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java @@ -401,6 +401,21 @@ public class jOOQSQLServerTest extends jOOQAbstractTest< return T_BOOLEANS.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return T_BOOLEANS.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return T_BOOLEANS.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return T_BOOLEANS.N_BOOLEAN; + } + @Override protected Table TArrays() { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java b/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java index 815acc71fd..720eaa7063 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java @@ -400,6 +400,21 @@ public class jOOQSQLiteTest extends jOOQAbstractTest< return TBooleans.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return TBooleans.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return TBooleans.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return TBooleans.N_BOOLEAN; + } + @Override protected Table TArrays() { return null; diff --git a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java b/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java index baa0e02ae4..31b772aa2b 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java @@ -331,6 +331,21 @@ public class jOOQSybaseTest extends jOOQAbstractTest< return T_BOOLEANS.YES_NO_UC; } + @Override + protected TableField TBooleans_VC() { + return T_BOOLEANS.VC_BOOLEAN; + } + + @Override + protected TableField TBooleans_C() { + return T_BOOLEANS.C_BOOLEAN; + } + + @Override + protected TableField TBooleans_N() { + return T_BOOLEANS.N_BOOLEAN; + } + @Override protected Table T639() { return T_639_NUMBERS_TABLE;