diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractTypedElementDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractTypedElementDefinition.java index cf5fdc4daf..dd7554c81e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractTypedElementDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractTypedElementDefinition.java @@ -35,6 +35,9 @@ */ package org.jooq.util; +import org.jooq.DataType; +import org.jooq.exception.SQLDialectNotSupportedException; +import org.jooq.impl.FieldTypeHelper; import org.jooq.tools.JooqLogger; import org.jooq.tools.StringUtils; @@ -80,11 +83,25 @@ abstract class AbstractTypedElementDefinition String forcedType = property.replace("generator.database.forced-type.", ""); log.debug("Forcing type", this + " into " + forcedType); - type = new DefaultDataTypeDefinition(db, - definedType.getType(), - definedType.getPrecision(), - definedType.getScale(), - forcedType); + DataType forcedDataType = null; + + String t = definedType.getType(); + int p = definedType.getPrecision(); + int s = definedType.getScale(); + + try { + forcedDataType = FieldTypeHelper.getDialectDataType(db.getDialect(), forcedType, p, s); + } catch (SQLDialectNotSupportedException ignore) {} + + // [#677] SQLDataType matches are actual type-rewrites + if (forcedDataType != null) { + type = new DefaultDataTypeDefinition(db, forcedType, p, s); + } + + // Other forced types are UDT's, enums, etc. + else { + type = new DefaultDataTypeDefinition(db, t, p, s, forcedType); + } } } } diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/db2/library.properties b/jOOQ-test/configuration/org/jooq/configuration/espen/db2/library.properties index d0ee6cfae2..ac57375cdb 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/espen/db2/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/espen/db2/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.records=true generator.generate.relations=true diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/h2/library.properties b/jOOQ-test/configuration/org/jooq/configuration/espen/h2/library.properties index a60417493c..4a10926913 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/espen/h2/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/espen/h2/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields=false diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/library.properties b/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/library.properties index 5fe5b808c4..a08874d319 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields=true diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/sybase/library.properties b/jOOQ-test/configuration/org/jooq/configuration/espen/sybase/library.properties index 5956de48e5..14da7b8f2e 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/espen/sybase/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/espen/sybase/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BIT=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.records=true diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.properties index 32c1414d8b..2806993b17 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BIT=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.records=true diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.properties index 6dbe751154..7371b6feb8 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.records=true generator.generate.relations=true diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.properties index 52d32ecd6d..65516974a7 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields=false diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.properties index c0a94d9b7e..85a580ac1f 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.properties @@ -28,6 +28,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields=false diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.properties index 3aafba2bd5..f5e0d12074 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields= diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/library.properties index b7116247fc..d8bd5d4513 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields=false diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.properties index 988556b5c3..b518436881 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.properties @@ -32,6 +32,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields=true diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.properties index 908a821b5d..39cc0091fa 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields=false diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.properties index 14c5340171..b33d64ae3a 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields= diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.properties index b4da92c5fd..1c88072d39 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.deprecated=false diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.properties index 901b05dda2..288010d3f8 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields=false diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/library.properties index 23796ebf96..88e84df500 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BIT=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.instance-fields=true diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.properties index 5956de48e5..14da7b8f2e 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.properties +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.properties @@ -27,6 +27,9 @@ generator.database.forced-type.BOOLEAN_YES_NO_LC=(?i:(.*?\.)?T_BOOLEANS\.YES_NO_ generator.database.forced-type.BOOLEAN_TRUE_FALSE_UC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_UC) generator.database.forced-type.BOOLEAN_TRUE_FALSE_LC=(?i:(.*?\.)?T_BOOLEANS\.TRUE_FALSE_LC) +#[#677] Forced types +generator.database.forced-type.BIT=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN) + #Generator configuration generator.generate.relations=true generator.generate.records=true diff --git a/jOOQ-test/src/org/jooq/test/ase/create.sql b/jOOQ-test/src/org/jooq/test/ase/create.sql index 2a3f16197c..7f5ba68474 100644 --- a/jOOQ-test/src/org/jooq/test/ase/create.sql +++ b/jOOQ-test/src/org/jooq/test/ase/create.sql @@ -46,7 +46,10 @@ CREATE TABLE t_booleans ( yes_no_uc varchar(3), y_n_lc char(1), y_n_uc char(1), - + vc_boolean varchar(1), + c_boolean char(1), + n_boolean int, + CONSTRAINT pk_t_booleans PRIMARY KEY (id) ) / diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TBooleans.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TBooleans.java index 98f9e4b998..78adb13104 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TBooleans.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/TBooleans.java @@ -10,7 +10,7 @@ package org.jooq.test.ase.generatedclasses.tables; comments = "This class is generated by jOOQ") public class TBooleans extends org.jooq.impl.UpdatableTableImpl { - private static final long serialVersionUID = -1097732616; + private static final long serialVersionUID = -801758542; /** * The singleton instance of t_booleans @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("y_n_uc", org.jooq.util.ase.ASEDataType.VARCHAR.asEnumDataType(org.jooq.test.ase.generatedclasses.enums.BooleanYnUc.class), T_BOOLEANS); + /** + * An uncommented item + */ + 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.BIT, T_BOOLEANS); + + /** + * An uncommented item + */ + 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 4cfce27ea5..ec70c7ca4e 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 @@ -10,7 +10,7 @@ package org.jooq.test.ase.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -1370911944; + private static final long serialVersionUID = -848267378; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 518109909; + private static final long serialVersionUID = -1596180212; /** * The singleton instance of T_BOOLEANS @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("Y_N_UC", org.jooq.util.db2.DB2DataType.VARCHAR.asEnumDataType(org.jooq.test.db2.generatedclasses.enums.BooleanYnUc.class), T_BOOLEANS); + /** + * An uncommented item + */ + public static final org.jooq.TableField VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.VARCHAR, T_BOOLEANS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.CHAR, T_BOOLEANS); + + /** + * An uncommented item + */ + public static final org.jooq.TableField N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.INTEGER, 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 e5faf75e21..2a2552a769 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 @@ -10,7 +10,7 @@ package org.jooq.test.db2.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -225107825; + private static final long serialVersionUID = 129265915; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 86001341; + private static final long serialVersionUID = 2005251419; /** * The singleton instance of T_BOOLEANS @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("Y_N_UC", org.jooq.util.derby.DerbyDataType.VARCHAR.asEnumDataType(org.jooq.test.derby.generatedclasses.enums.BooleanYnUc.class), T_BOOLEANS); + /** + * An uncommented item + */ + 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.BOOLEAN, T_BOOLEANS); + + /** + * An uncommented item + */ + 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 02bafdf990..7021f6c989 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 @@ -10,7 +10,7 @@ package org.jooq.test.derby.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 541647675; + private static final long serialVersionUID = 1812991089; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 1972861703; + private static final long serialVersionUID = -425268107; /** * The singleton instance of T_BOOLEANS @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("Y_N_UC", org.jooq.util.h2.H2DataType.VARCHAR.asEnumDataType(org.jooq.test.h2.generatedclasses.enums.BooleanYnUc.class), T_BOOLEANS); + /** + * An uncommented item + */ + 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.BOOLEAN, T_BOOLEANS); + + /** + * An uncommented item + */ + 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/h2/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TBooleansRecord.java index 816e7c7345..d0e68b76e8 100644 --- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.h2.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 1564445385; + private static final long serialVersionUID = 2025485969; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 732324532; + private static final long serialVersionUID = 768489084; /** * The singleton instance of T_BOOLEANS @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("Y_N_UC", org.jooq.util.hsqldb.HSQLDBDataType.VARCHAR.asEnumDataType(org.jooq.test.hsqldb.generatedclasses.enums.BooleanYnUc.class), this); + /** + * An uncommented item + */ + public final org.jooq.TableField VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, this); + /** * No further instances allowed */ diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBooleansRecord.java index a4b64a8175..3cb512e3fa 100644 --- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -305006863; + private static final long serialVersionUID = -1407917509; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -927471981; + private static final long serialVersionUID = 86610429; /** * The singleton instance of t_booleans @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("y_n_uc", org.jooq.util.ingres.IngresDataType.VARCHAR.asEnumDataType(org.jooq.test.ingres.generatedclasses.enums.BooleanYnUc.class), T_BOOLEANS); + /** + * An uncommented item + */ + 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.BOOLEAN, T_BOOLEANS); + + /** + * An uncommented item + */ + 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/ingres/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBooleansRecord.java index c652a1f8a1..16e70f6273 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.ingres.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 181865829; + private static final long serialVersionUID = -878743787; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl booleans = (Table) getTable("T_BOOLEANS"); @@ -6628,6 +6632,15 @@ public abstract class jOOQAbstractTest< EnumType e7False = (EnumType) e7.getType().getField("N").get(e7.getType()); EnumType e7True = (EnumType) e7.getType().getField("Y").get(e7.getType()); + @SuppressWarnings("unchecked") + Field 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(booleans) .set(id, 1) @@ -6638,6 +6651,9 @@ public abstract class jOOQAbstractTest< .set(e5, e5False) .set(e6, e6False) .set(e7, e7False) + .set(b1, false) + .set(b2, false) + .set(b3, false) .execute()); assertEquals(1, @@ -6650,6 +6666,9 @@ public abstract class jOOQAbstractTest< .set(e5, e5True) .set(e6, e6True) .set(e7, e7True) + .set(b1, true) + .set(b2, true) + .set(b3, true) .execute()); Result result = @@ -6678,6 +6697,15 @@ public abstract class jOOQAbstractTest< assertEquals(e7False, result.getValue(0, e7)); assertEquals(e7True, result.getValue(1, e7)); + + assertFalse(result.getValue(0, b1)); + assertTrue(result.getValue(1, b1)); + + assertFalse(result.getValue(0, b2)); + assertTrue(result.getValue(1, b2)); + + assertFalse(result.getValue(0, b3)); + assertTrue(result.getValue(1, b3)); } @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/jOOQ-test/src/org/jooq/test/mysql/create.sql b/jOOQ-test/src/org/jooq/test/mysql/create.sql index 3638177860..8cbc1daeda 100644 --- a/jOOQ-test/src/org/jooq/test/mysql/create.sql +++ b/jOOQ-test/src/org/jooq/test/mysql/create.sql @@ -48,6 +48,9 @@ CREATE TABLE t_booleans ( yes_no_uc varchar(3), y_n_lc char(1), y_n_uc char(1), + vc_boolean varchar(1), + c_boolean char(1), + n_boolean int, CONSTRAINT pk_t_booleans PRIMARY KEY (id) ) diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/TBooleans.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/TBooleans.java index 3e4f0d48d6..2bbea7ce85 100644 --- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/TBooleans.java +++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/TBooleans.java @@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses.tables; comments = "This class is generated by jOOQ") public class TBooleans extends org.jooq.impl.UpdatableTableImpl { - private static final long serialVersionUID = 1274749271; + private static final long serialVersionUID = -1906215805; /** * The singleton instance of t_booleans @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("y_n_uc", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.test.mysql.generatedclasses.enums.BooleanYnUc.class), T_BOOLEANS); + /** + * An uncommented item + */ + 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.BOOLEAN, T_BOOLEANS); + + /** + * An uncommented item + */ + 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/mysql/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/TBooleansRecord.java index 9a4fb988cf..9afa4595b1 100644 --- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -906242639; + private static final long serialVersionUID = -1170271833; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -242609594; + private static final long serialVersionUID = -1407410838; /** * The singleton instance of t_booleans @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("y_n_uc", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.test.mysql2.generatedclasses.enums.BooleanYnUc.class), this); + /** + * An uncommented item + */ + public final org.jooq.TableField VC_BOOLEAN = createField("vc_boolean", org.jooq.impl.SQLDataType.BOOLEAN, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField C_BOOLEAN = createField("c_boolean", org.jooq.impl.SQLDataType.BOOLEAN, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField N_BOOLEAN = createField("n_boolean", org.jooq.impl.SQLDataType.BOOLEAN, this); + /** * No further instances allowed */ diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/records/TBooleansRecord.java index 5a8880acc8..c63c166c1d 100644 --- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.mysql2.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 747958365; + private static final long serialVersionUID = 1010006567; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 301587990; + private static final long serialVersionUID = 350344872; /** * The singleton instance of T_BOOLEANS @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("Y_N_UC", org.jooq.util.oracle.OracleDataType.VARCHAR2.asEnumDataType(org.jooq.test.oracle.generatedclasses.enums.BooleanYnUc.class), this); + /** + * An uncommented item + */ + public final org.jooq.TableField VC_BOOLEAN = createField("VC_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField C_BOOLEAN = createField("C_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField N_BOOLEAN = createField("N_BOOLEAN", org.jooq.impl.SQLDataType.BOOLEAN, this); + /** * No further instances allowed */ diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/tables/records/TBooleansRecord.java index a64741d8eb..deb44fb7ba 100644 --- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.oracle.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 688289419; + private static final long serialVersionUID = 1189271701; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -582636471; + private static final long serialVersionUID = 1245845606; /** * The singleton instance of t_booleans @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("y_n_uc", org.jooq.util.postgres.PostgresDataType.VARCHAR.asEnumDataType(org.jooq.test.postgres.generatedclasses.enums.BooleanYnUc.class), this); + /** + * An uncommented item + */ + public final org.jooq.TableField VC_BOOLEAN = createField("vc_boolean", org.jooq.impl.SQLDataType.BOOLEAN, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField C_BOOLEAN = createField("c_boolean", org.jooq.impl.SQLDataType.BOOLEAN, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField N_BOOLEAN = createField("n_boolean", org.jooq.impl.SQLDataType.BOOLEAN, this); + /** * No further instances allowed */ diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TBooleansRecord.java index 2c76f342f4..59a37f1d4a 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.postgres.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 550318022; + private static final long serialVersionUID = -611216784; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl IDENTITY_t_triggers = createIdentity(org.jooq.test.sqlite.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlite.generatedclasses.tables.TTriggers.ID_GENERATED); // UNIQUE and PRIMARY KEY definitions public static final org.jooq.UniqueKey pk_t_639_numbers_table_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.ID); diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBooleans.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBooleans.java index 6c71c48b93..f85b8808b2 100644 --- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBooleans.java +++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBooleans.java @@ -10,7 +10,7 @@ package org.jooq.test.sqlite.generatedclasses.tables; comments = "This class is generated by jOOQ") public class TBooleans extends org.jooq.impl.UpdatableTableImpl { - private static final long serialVersionUID = -1070794035; + private static final long serialVersionUID = -1776558663; /** * The singleton instance of t_booleans @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("y_n_uc", org.jooq.util.sqlite.SQLiteDataType.LONGVARCHAR.asEnumDataType(org.jooq.test.sqlite.generatedclasses.enums.BooleanYnUc.class), T_BOOLEANS); + /** + * An uncommented item + */ + 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.BOOLEAN, T_BOOLEANS); + + /** + * An uncommented item + */ + 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/sqlite/generatedclasses/tables/TTriggers.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java index be44529a3f..39fa8a9454 100644 --- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java +++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java @@ -10,7 +10,7 @@ package org.jooq.test.sqlite.generatedclasses.tables; comments = "This class is generated by jOOQ") public class TTriggers extends org.jooq.impl.UpdatableTableImpl { - private static final long serialVersionUID = 1709423919; + private static final long serialVersionUID = 2031756274; /** * The singleton instance of t_triggers @@ -54,11 +54,6 @@ public class TTriggers extends org.jooq.impl.UpdatableTableImpl getIdentity() { - return org.jooq.test.sqlite.generatedclasses.Keys.IDENTITY_t_triggers; - } - @Override public org.jooq.UniqueKey getMainKey() { return org.jooq.test.sqlite.generatedclasses.Keys.pk_t_triggers_id_generated; diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/TBooleansRecord.java index 6132dfa12a..4d1f12826a 100644 --- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.sqlite.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -1363227825; + private static final long serialVersionUID = 2119492123; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -1576995343; + private static final long serialVersionUID = 1820041971; /** * The singleton instance of t_booleans @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("y_n_uc", org.jooq.util.sqlserver.SQLServerDataType.VARCHAR.asEnumDataType(org.jooq.test.sqlserver.generatedclasses.enums.BooleanYnUc.class), this); + /** + * An uncommented item + */ + public final org.jooq.TableField VC_BOOLEAN = createField("vc_boolean", org.jooq.impl.SQLDataType.BIT, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField C_BOOLEAN = createField("c_boolean", org.jooq.impl.SQLDataType.BIT, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField N_BOOLEAN = createField("n_boolean", org.jooq.impl.SQLDataType.BIT, this); + /** * No further instances allowed */ diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TBooleansRecord.java index 1d500c2ba2..ea8503ff35 100644 --- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.sqlserver.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = 1792556394; + private static final long serialVersionUID = 192336908; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -1837270413; + private static final long serialVersionUID = 730236051; /** * The singleton instance of t_booleans @@ -72,6 +72,21 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl Y_N_UC = createField("y_n_uc", org.jooq.util.sybase.SybaseDataType.VARCHAR.asEnumDataType(org.jooq.test.sybase.generatedclasses.enums.BooleanYnUc.class), this); + /** + * An uncommented item + */ + public final org.jooq.TableField VC_BOOLEAN = createField("vc_boolean", org.jooq.impl.SQLDataType.BIT, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField C_BOOLEAN = createField("c_boolean", org.jooq.impl.SQLDataType.BIT, this); + + /** + * An uncommented item + */ + public final org.jooq.TableField N_BOOLEAN = createField("n_boolean", org.jooq.impl.SQLDataType.BIT, this); + /** * No further instances allowed */ diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBooleansRecord.java index b79b26ac71..1858750c03 100644 --- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBooleansRecord.java @@ -10,7 +10,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records; comments = "This class is generated by jOOQ") public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl { - private static final long serialVersionUID = -221587196; + private static final long serialVersionUID = 1979559150; /** * An uncommented item @@ -128,6 +128,48 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl