[#1013] Add integration tests for various use-cases involving custom enum types

This commit is contained in:
Lukas Eder 2012-03-10 17:49:51 +00:00
parent affc61d698
commit 3bd59d0c25
32 changed files with 275 additions and 357 deletions

View File

@ -77,7 +77,7 @@
<forcedTypes>
<forcedType>
<name>BOOLEAN</name>
<name>BIT</name>
<expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
</forcedType>

View File

@ -77,7 +77,7 @@
<forcedTypes>
<forcedType>
<name>BIT</name>
<name>BOOLEAN</name>
<expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
</forcedType>

View File

@ -315,6 +315,18 @@ public abstract class BaseTest<
return delegate.TBooleans_Boolean_YES_NO_UC();
}
public TableField<BOOL, Boolean> TBooleans_VC() {
return delegate.TBooleans_VC();
}
public TableField<BOOL, Boolean> TBooleans_C() {
return delegate.TBooleans_C();
}
public TableField<BOOL, Boolean> TBooleans_N() {
return delegate.TBooleans_N();
}
protected Table<X> TArrays() {
return delegate.TArrays();
}

View File

@ -121,16 +121,6 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
// TODO [#677] [#1013] This doesn't work correctly yet for
// Ingres, HSQLDB, H2, Derby, Sybase ASE
// Double-check again for Postgres
// @SuppressWarnings("unchecked")
// Field<Boolean> b1 = (Field<Boolean>) getField(booleans, "C_BOOLEAN");
//
// @SuppressWarnings("unchecked")
// Field<Boolean> b2 = (Field<Boolean>) getField(booleans, "VC_BOOLEAN");
//
// @SuppressWarnings("unchecked")
// Field<Boolean> b3 = (Field<Boolean>) getField(booleans, "N_BOOLEAN");
assertEquals(1,
create().insertInto(TBooleans())
.set(TBooleans_ID(), 1)
@ -141,9 +131,9 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
.set(TBooleans_Boolean_YES_NO_UC(), Boolean_YES_NO_UC.NO)
.set(TBooleans_Boolean_YN_LC(), Boolean_YN_LC.n)
.set(TBooleans_Boolean_YN_UC(), Boolean_YN_UC.N)
// .set(b1, false)
// .set(b2, false)
// .set(b3, false)
// .set(TBooleans_C(), false)
// .set(TBooleans_VC(), false)
// .set(TBooleans_N(), false)
.execute());
assertEquals(1,
@ -156,9 +146,9 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
.set(TBooleans_Boolean_YES_NO_UC(), Boolean_YES_NO_UC.YES)
.set(TBooleans_Boolean_YN_LC(), Boolean_YN_LC.y)
.set(TBooleans_Boolean_YN_UC(), Boolean_YN_UC.Y)
// .set(b1, true)
// .set(b2, true)
// .set(b3, true)
// .set(TBooleans_C(), true)
// .set(TBooleans_VC(), true)
// .set(TBooleans_N(), true)
.execute());
Result<?> result =
@ -188,14 +178,14 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
assertEquals(Boolean_YN_UC.N, result.getValue(0, TBooleans_Boolean_YN_UC()));
assertEquals(Boolean_YN_UC.Y, result.getValue(1, TBooleans_Boolean_YN_UC()));
// assertFalse(result.getValue(0, b1));
// assertTrue(result.getValue(1, b1));
// assertFalse(result.getValue(0, TBooleans_C()));
// assertTrue(result.getValue(1, TBooleans_C()));
//
// assertFalse(result.getValue(0, b2));
// assertTrue(result.getValue(1, b2));
// assertFalse(result.getValue(0, TBooleans_VC()));
// assertTrue(result.getValue(1, TBooleans_VC()));
//
// assertFalse(result.getValue(0, b3));
// assertTrue(result.getValue(1, b3));
// assertFalse(result.getValue(0, TBooleans_N()));
// assertTrue(result.getValue(1, TBooleans_N()));
}
@SuppressWarnings({ "unchecked", "rawtypes" })

View File

@ -546,7 +546,7 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
// [#610] Collision-prone entities are only available in HSQLDB
else if (getDialect() == HSQLDB) {
assertEquals(tables + 12, schema.getTables().size());
assertEquals(tables + 11, schema.getTables().size());
}
else {

View File

@ -8,7 +8,7 @@ package org.jooq.test.ase.generatedclasses.tables;
*/
public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.ase.generatedclasses.tables.records.TBooleansRecord> {
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<org.jooq.test.as
/**
* An uncommented item
*/
public static final org.jooq.TableField<org.jooq.test.ase.generatedclasses.tables.records.TBooleansRecord, java.lang.String> VC_BOOLEAN = createField("vc_boolean", org.jooq.impl.SQLDataType.VARCHAR, T_BOOLEANS);
public static final org.jooq.TableField<org.jooq.test.ase.generatedclasses.tables.records.TBooleansRecord, java.lang.Boolean> VC_BOOLEAN = createField("vc_boolean", org.jooq.impl.SQLDataType.BIT, T_BOOLEANS);
/**
* An uncommented item
*/
public static final org.jooq.TableField<org.jooq.test.ase.generatedclasses.tables.records.TBooleansRecord, java.lang.String> C_BOOLEAN = createField("c_boolean", org.jooq.impl.SQLDataType.CHAR, T_BOOLEANS);
public static final org.jooq.TableField<org.jooq.test.ase.generatedclasses.tables.records.TBooleansRecord, java.lang.Boolean> C_BOOLEAN = createField("c_boolean", org.jooq.impl.SQLDataType.BIT, T_BOOLEANS);
/**
* An uncommented item
*/
public static final org.jooq.TableField<org.jooq.test.ase.generatedclasses.tables.records.TBooleansRecord, java.lang.Integer> N_BOOLEAN = createField("n_boolean", org.jooq.impl.SQLDataType.INTEGER, T_BOOLEANS);
public static final org.jooq.TableField<org.jooq.test.ase.generatedclasses.tables.records.TBooleansRecord, java.lang.Boolean> N_BOOLEAN = createField("n_boolean", org.jooq.impl.SQLDataType.BIT, T_BOOLEANS);
/**
* No further instances allowed

View File

@ -8,7 +8,7 @@ package org.jooq.test.ase.generatedclasses.tables.records;
*/
public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.ase.generatedclasses.tables.records.TBooleansRecord> {
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<org.jooq.
/**
* An uncommented item
*/
public void setVcBoolean(java.lang.String value) {
public void setVcBoolean(java.lang.Boolean value) {
setValue(org.jooq.test.ase.generatedclasses.tables.TBooleans.VC_BOOLEAN, value);
}
/**
* An uncommented item
*/
public java.lang.String getVcBoolean() {
public java.lang.Boolean getVcBoolean() {
return getValue(org.jooq.test.ase.generatedclasses.tables.TBooleans.VC_BOOLEAN);
}
/**
* An uncommented item
*/
public void setCBoolean(java.lang.String value) {
public void setCBoolean(java.lang.Boolean value) {
setValue(org.jooq.test.ase.generatedclasses.tables.TBooleans.C_BOOLEAN, value);
}
/**
* An uncommented item
*/
public java.lang.String getCBoolean() {
public java.lang.Boolean getCBoolean() {
return getValue(org.jooq.test.ase.generatedclasses.tables.TBooleans.C_BOOLEAN);
}
/**
* An uncommented item
*/
public void setNBoolean(java.lang.Integer value) {
public void setNBoolean(java.lang.Boolean value) {
setValue(org.jooq.test.ase.generatedclasses.tables.TBooleans.N_BOOLEAN, value);
}
/**
* An uncommented item
*/
public java.lang.Integer getNBoolean() {
public java.lang.Boolean getNBoolean() {
return getValue(org.jooq.test.ase.generatedclasses.tables.TBooleans.N_BOOLEAN);
}

View File

@ -30,7 +30,7 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.db
/**
* An uncommented item
*
*
* PRIMARY KEY
*/
public static final org.jooq.TableField<org.jooq.test.db2.generatedclasses.tables.records.TBooleansRecord, java.lang.Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, T_BOOLEANS);
@ -73,17 +73,17 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.db
/**
* An uncommented item
*/
public static final org.jooq.TableField<org.jooq.test.db2.generatedclasses.tables.records.TBooleansRecord, java.lang.String> VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.VARCHAR, T_BOOLEANS);
public static final org.jooq.TableField<org.jooq.test.db2.generatedclasses.tables.records.TBooleansRecord, java.lang.Boolean> VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS);
/**
* An uncommented item
*/
public static final org.jooq.TableField<org.jooq.test.db2.generatedclasses.tables.records.TBooleansRecord, java.lang.String> C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.CHAR, T_BOOLEANS);
public static final org.jooq.TableField<org.jooq.test.db2.generatedclasses.tables.records.TBooleansRecord, java.lang.Boolean> C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS);
/**
* An uncommented item
*/
public static final org.jooq.TableField<org.jooq.test.db2.generatedclasses.tables.records.TBooleansRecord, java.lang.Integer> N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.INTEGER, T_BOOLEANS);
public static final org.jooq.TableField<org.jooq.test.db2.generatedclasses.tables.records.TBooleansRecord, java.lang.Boolean> N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS);
/**
* No further instances allowed

View File

@ -12,7 +12,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
/**
* An uncommented item
*
*
* PRIMARY KEY
*/
public void setId(java.lang.Integer value) {
@ -21,7 +21,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
/**
* An uncommented item
*
*
* PRIMARY KEY
*/
public java.lang.Integer getId() {
@ -129,42 +129,42 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
/**
* An uncommented item
*/
public void setVcBoolean(java.lang.String value) {
public void setVcBoolean(java.lang.Boolean value) {
setValue(org.jooq.test.db2.generatedclasses.tables.TBooleans.VC_BOOLEAN, value);
}
/**
* An uncommented item
*/
public java.lang.String getVcBoolean() {
public java.lang.Boolean getVcBoolean() {
return getValue(org.jooq.test.db2.generatedclasses.tables.TBooleans.VC_BOOLEAN);
}
/**
* An uncommented item
*/
public void setCBoolean(java.lang.String value) {
public void setCBoolean(java.lang.Boolean value) {
setValue(org.jooq.test.db2.generatedclasses.tables.TBooleans.C_BOOLEAN, value);
}
/**
* An uncommented item
*/
public java.lang.String getCBoolean() {
public java.lang.Boolean getCBoolean() {
return getValue(org.jooq.test.db2.generatedclasses.tables.TBooleans.C_BOOLEAN);
}
/**
* An uncommented item
*/
public void setNBoolean(java.lang.Integer value) {
public void setNBoolean(java.lang.Boolean value) {
setValue(org.jooq.test.db2.generatedclasses.tables.TBooleans.N_BOOLEAN, value);
}
/**
* An uncommented item
*/
public java.lang.Integer getNBoolean() {
public java.lang.Boolean getNBoolean() {
return getValue(org.jooq.test.db2.generatedclasses.tables.TBooleans.N_BOOLEAN);
}

View File

@ -8,7 +8,7 @@ package org.jooq.test.derby.generatedclasses.tables;
*/
public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.derby.generatedclasses.tables.records.TBooleansRecord> {
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<org.jooq.test.de
/**
* An uncommented item
*/
public static final org.jooq.TableField<org.jooq.test.derby.generatedclasses.tables.records.TBooleansRecord, java.lang.String> VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.VARCHAR, T_BOOLEANS);
public static final org.jooq.TableField<org.jooq.test.derby.generatedclasses.tables.records.TBooleansRecord, java.lang.Boolean> VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS);
/**
* An uncommented item
*/
public static final org.jooq.TableField<org.jooq.test.derby.generatedclasses.tables.records.TBooleansRecord, java.lang.String> C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.CHAR, T_BOOLEANS);
public static final org.jooq.TableField<org.jooq.test.derby.generatedclasses.tables.records.TBooleansRecord, java.lang.Boolean> C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS);
/**
* An uncommented item
*/
public static final org.jooq.TableField<org.jooq.test.derby.generatedclasses.tables.records.TBooleansRecord, java.lang.Integer> N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.INTEGER, T_BOOLEANS);
public static final org.jooq.TableField<org.jooq.test.derby.generatedclasses.tables.records.TBooleansRecord, java.lang.Boolean> N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, T_BOOLEANS);
/**
* No further instances allowed

View File

@ -8,7 +8,7 @@ package org.jooq.test.derby.generatedclasses.tables.records;
*/
public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.derby.generatedclasses.tables.records.TBooleansRecord> {
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<org.jooq.
/**
* An uncommented item
*/
public void setVcBoolean(java.lang.String value) {
public void setVcBoolean(java.lang.Boolean value) {
setValue(org.jooq.test.derby.generatedclasses.tables.TBooleans.VC_BOOLEAN, value);
}
/**
* An uncommented item
*/
public java.lang.String getVcBoolean() {
public java.lang.Boolean getVcBoolean() {
return getValue(org.jooq.test.derby.generatedclasses.tables.TBooleans.VC_BOOLEAN);
}
/**
* An uncommented item
*/
public void setCBoolean(java.lang.String value) {
public void setCBoolean(java.lang.Boolean value) {
setValue(org.jooq.test.derby.generatedclasses.tables.TBooleans.C_BOOLEAN, value);
}
/**
* An uncommented item
*/
public java.lang.String getCBoolean() {
public java.lang.Boolean getCBoolean() {
return getValue(org.jooq.test.derby.generatedclasses.tables.TBooleans.C_BOOLEAN);
}
/**
* An uncommented item
*/
public void setNBoolean(java.lang.Integer value) {
public void setNBoolean(java.lang.Boolean value) {
setValue(org.jooq.test.derby.generatedclasses.tables.TBooleans.N_BOOLEAN, value);
}
/**
* An uncommented item
*/
public java.lang.Integer getNBoolean() {
public java.lang.Boolean getNBoolean() {
return getValue(org.jooq.test.derby.generatedclasses.tables.TBooleans.N_BOOLEAN);
}

View File

@ -63,20 +63,6 @@ DROP TABLE IF EXISTS prepared_statement/
DROP TABLE IF EXISTS t_booleans/
DROP TABLE IF EXISTS t_identity/
DROP TABLE IF EXISTS t_identity_pk/
DROP TABLE IF EXISTS t_mapped_types/
CREATE TABLE t_mapped_types (
id int,
java_util_date timestamp,
java_util_calendar timestamp,
default_enum_ordinal int,
default_enum_name varchar(10),
custom_enum_numeric int,
custom_enum_text varchar(10),
CONSTRAINT pk_t_mapped_types PRIMARY KEY (id)
)
/
CREATE TABLE t_identity_pk (
id INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1),

View File

@ -29,7 +29,6 @@ public class Keys extends org.jooq.impl.AbstractKeys {
public static final org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.TBooleansRecord> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TDatesRecord> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityPkRecord> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TTriggersRecord> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.XTestCase_64_69Record> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.XTestCase_71Record> 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);

View File

@ -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,

View File

@ -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
*/

View File

@ -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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord> {
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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord> __RECORD_TYPE = org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord.class;
/**
* The class holding records for this type
*/
@Override
public java.lang.Class<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord> getRecordType() {
return __RECORD_TYPE;
}
/**
* An uncommented item
*
* PRIMARY KEY
*/
public final org.jooq.TableField<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord, java.lang.Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, this);
/**
* An uncommented item
*/
public final org.jooq.TableField<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord, java.util.Date> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord, java.util.GregorianCalendar> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord, org.jooq.test._.converters.OrdinalEnum> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord, org.jooq.test._.converters.StringEnum> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord, org.jooq.test._.converters.OrdinalEnum1> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord, org.jooq.test._.converters.StringEnum1> 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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord> getMainKey() {
return org.jooq.test.hsqldb.generatedclasses.Keys.PK_T_MAPPED_TYPES;
}
@Override
@SuppressWarnings("unchecked")
public java.util.List<org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord>> getKeys() {
return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord>>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);
}
}

View File

@ -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<org.jooq.test.hsqldb.generatedclasses.tables.records.TMappedTypesRecord> {
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);
}
}

View File

@ -332,6 +332,21 @@ public class jOOQASETest extends jOOQAbstractTest<
return TBooleans.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return TBooleans.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return TBooleans.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return TBooleans.N_BOOLEAN;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639NumbersTable.T_639_NUMBERS_TABLE;

View File

@ -606,6 +606,9 @@ public abstract class jOOQAbstractTest<
protected abstract TableField<BOOL, Boolean_YN_UC> TBooleans_Boolean_YN_UC();
protected abstract TableField<BOOL, Boolean_YES_NO_LC> TBooleans_Boolean_YES_NO_LC();
protected abstract TableField<BOOL, Boolean_YES_NO_UC> TBooleans_Boolean_YES_NO_UC();
protected abstract TableField<BOOL, Boolean> TBooleans_VC();
protected abstract TableField<BOOL, Boolean> TBooleans_C();
protected abstract TableField<BOOL, Boolean> TBooleans_N();
protected abstract UpdatableTable<D> TDirectory();
protected abstract TableField<D, Integer> TDirectory_ID();

View File

@ -414,6 +414,21 @@ public class jOOQDB2Test extends jOOQAbstractTest<
return TBooleans.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return TBooleans.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return TBooleans.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return TBooleans.N_BOOLEAN;
}
@Override
protected Table<XUnusedRecord> TArrays() {
return null;

View File

@ -405,6 +405,21 @@ public class jOOQDerbyTest extends jOOQAbstractTest<
return TBooleans.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return TBooleans.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return TBooleans.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return TBooleans.N_BOOLEAN;
}
@Override
protected Table<XUnusedRecord> TArrays() {
return null;

View File

@ -410,6 +410,21 @@ public class jOOQH2Test extends jOOQAbstractTest<
return TBooleans.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return TBooleans.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return TBooleans.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return TBooleans.N_BOOLEAN;
}
@Override
protected Table<TArraysRecord> TArrays() {
return TArrays.T_ARRAYS;

View File

@ -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<TBooleansRecord, Boolean> TBooleans_VC() {
return T_BOOLEANS.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return T_BOOLEANS.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return T_BOOLEANS.N_BOOLEAN;
}
@Override
protected Table<TArraysRecord> 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));
}
}

View File

@ -415,6 +415,21 @@ public class jOOQHSQLDBTest2 extends jOOQAbstractTest<
return T_BOOLEANS.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return T_BOOLEANS.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return T_BOOLEANS.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return T_BOOLEANS.N_BOOLEAN;
}
@Override
protected Table<TDatesRecord> TDates() {
return T_DATES;

View File

@ -406,6 +406,21 @@ public class jOOQIngresTest extends jOOQAbstractTest<
return TBooleans.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return TBooleans.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return TBooleans.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return TBooleans.N_BOOLEAN;
}
@Override
protected Table<XUnusedRecord> TArrays() {
return null;

View File

@ -429,6 +429,21 @@ public class jOOQMySQLTest extends jOOQAbstractTest<
return TBooleans.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return TBooleans.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return TBooleans.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return TBooleans.N_BOOLEAN;
}
@Override
protected Table<XUnusedRecord> TArrays() {
return null;

View File

@ -406,6 +406,21 @@ public class jOOQMySQLTestSchemaRewrite extends jOOQAbstractTest<
return T_BOOLEANS.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return T_BOOLEANS.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return T_BOOLEANS.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return T_BOOLEANS.N_BOOLEAN;
}
@Override
protected Table<XUnusedRecord> TArrays() {
return null;

View File

@ -415,6 +415,21 @@ public class jOOQOracleTest extends jOOQAbstractTest<
return T_BOOLEANS.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return T_BOOLEANS.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return T_BOOLEANS.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return T_BOOLEANS.N_BOOLEAN;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658_REF;

View File

@ -338,6 +338,21 @@ public class jOOQPostgresTest extends jOOQAbstractTest<
return T_BOOLEANS.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return T_BOOLEANS.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return T_BOOLEANS.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return T_BOOLEANS.N_BOOLEAN;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658_REF;

View File

@ -401,6 +401,21 @@ public class jOOQSQLServerTest extends jOOQAbstractTest<
return T_BOOLEANS.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return T_BOOLEANS.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return T_BOOLEANS.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return T_BOOLEANS.N_BOOLEAN;
}
@Override
protected Table<XUnusedRecord> TArrays() {
return null;

View File

@ -400,6 +400,21 @@ public class jOOQSQLiteTest extends jOOQAbstractTest<
return TBooleans.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return TBooleans.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return TBooleans.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return TBooleans.N_BOOLEAN;
}
@Override
protected Table<XUnusedRecord> TArrays() {
return null;

View File

@ -331,6 +331,21 @@ public class jOOQSybaseTest extends jOOQAbstractTest<
return T_BOOLEANS.YES_NO_UC;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
return T_BOOLEANS.VC_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
return T_BOOLEANS.C_BOOLEAN;
}
@Override
protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
return T_BOOLEANS.N_BOOLEAN;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639_NUMBERS_TABLE;