diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml index eadceb583e..907645de32 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml @@ -54,6 +54,23 @@ BOOLEAN (?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN) + + + TINYINTUNSIGNED + (?i:(.*?.)?T_UNSIGNED.U_BYTE) + + + SMALLINTUNSIGNED + (?i:(.*?.)?T_UNSIGNED.U_SHORT) + + + INTEGERUNSIGNED + (?i:(.*?.)?T_UNSIGNED.U_INT) + + + BIGINTUNSIGNED + (?i:(.*?.)?T_UNSIGNED.U_LONG) + org.jooq.test._.converters.Boolean_YES_NO_LC diff --git a/jOOQ-test/src/org/jooq/test/H2Test.java b/jOOQ-test/src/org/jooq/test/H2Test.java index 2621571558..6b9c9e769f 100644 --- a/jOOQ-test/src/org/jooq/test/H2Test.java +++ b/jOOQ-test/src/org/jooq/test/H2Test.java @@ -42,6 +42,7 @@ import static org.jooq.test.h2.generatedclasses.Tables.T_DATES; import static org.jooq.test.h2.generatedclasses.Tables.T_EXOTIC_TYPES; import static org.jooq.test.h2.generatedclasses.Tables.T_IDENTITY; import static org.jooq.test.h2.generatedclasses.Tables.T_IDENTITY_PK; +import static org.jooq.test.h2.generatedclasses.Tables.T_UNSIGNED; import static org.jooq.test.h2.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.h2.generatedclasses.Tables.V_BOOK; @@ -86,6 +87,7 @@ import org.jooq.test.h2.generatedclasses.tables.TExoticTypes; import org.jooq.test.h2.generatedclasses.tables.TIdentity; import org.jooq.test.h2.generatedclasses.tables.TIdentityPk; import org.jooq.test.h2.generatedclasses.tables.TTriggers; +import org.jooq.test.h2.generatedclasses.tables.TUnsigned; import org.jooq.test.h2.generatedclasses.tables.T_639NumbersTable; import org.jooq.test.h2.generatedclasses.tables.T_725LobTest; import org.jooq.test.h2.generatedclasses.tables.T_785; @@ -102,6 +104,7 @@ import org.jooq.test.h2.generatedclasses.tables.records.TExoticTypesRecord; import org.jooq.test.h2.generatedclasses.tables.records.TIdentityPkRecord; import org.jooq.test.h2.generatedclasses.tables.records.TIdentityRecord; import org.jooq.test.h2.generatedclasses.tables.records.TTriggersRecord; +import org.jooq.test.h2.generatedclasses.tables.records.TUnsignedRecord; import org.jooq.test.h2.generatedclasses.tables.records.T_639NumbersTableRecord; import org.jooq.test.h2.generatedclasses.tables.records.T_725LobTestRecord; import org.jooq.test.h2.generatedclasses.tables.records.T_785Record; @@ -131,7 +134,7 @@ public class H2Test extends jOOQAbstractTest< TBooleansRecord, XUnusedRecord, TTriggersRecord, - XUnusedRecord, + TUnsignedRecord, TExoticTypesRecord, TIdentityRecord, TIdentityPkRecord, @@ -355,28 +358,28 @@ public class H2Test extends jOOQAbstractTest< } @Override - protected Table TUnsigned() { - return null; + protected Table TUnsigned() { + return T_UNSIGNED; } @Override - protected TableField TUnsigned_U_BYTE() { - return null; + protected TableField TUnsigned_U_BYTE() { + return TUnsigned.U_BYTE; } @Override - protected TableField TUnsigned_U_SHORT() { - return null; + protected TableField TUnsigned_U_SHORT() { + return TUnsigned.U_SHORT; } @Override - protected TableField TUnsigned_U_INT() { - return null; + protected TableField TUnsigned_U_INT() { + return TUnsigned.U_INT; } @Override - protected TableField TUnsigned_U_LONG() { - return null; + protected TableField TUnsigned_U_LONG() { + return TUnsigned.U_LONG; } @Override diff --git a/jOOQ-test/src/org/jooq/test/h2/create.sql b/jOOQ-test/src/org/jooq/test/h2/create.sql index 4a6700c59b..ae9137b0b6 100644 --- a/jOOQ-test/src/org/jooq/test/h2/create.sql +++ b/jOOQ-test/src/org/jooq/test/h2/create.sql @@ -43,6 +43,7 @@ DROP TABLE IF EXISTS t_658_32/ DROP TABLE IF EXISTS t_725_lob_test/ DROP TABLE IF EXISTS t_785/ DROP TABLE IF EXISTS t_877/ +DROP TABLE IF EXISTS t_unsigned/ DROP TABLE IF EXISTS t_booleans/ DROP TABLE IF EXISTS t_identity/ DROP TABLE IF EXISTS t_identity_pk/ @@ -98,6 +99,14 @@ CREATE TABLE t_booleans ( ) / +CREATE TABLE t_unsigned ( + u_byte tinyint unsigned, + u_short smallint unsigned, + u_int int unsigned, + u_long bigint unsigned +) +/ + CREATE TABLE t_triggers ( id_generated int AUTO_INCREMENT, id int, diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Public.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Public.java index 99995619cf..a7cb83bf29 100644 --- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Public.java +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Public.java @@ -9,7 +9,7 @@ package org.jooq.test.h2.generatedclasses; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Public extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -188710307; + private static final long serialVersionUID = -571682452; /** * The singleton instance of PUBLIC @@ -50,6 +50,7 @@ public class Public extends org.jooq.impl.SchemaImpl { org.jooq.test.h2.generatedclasses.tables.TIdentity.T_IDENTITY, org.jooq.test.h2.generatedclasses.tables.TDates.T_DATES, org.jooq.test.h2.generatedclasses.tables.TBooleans.T_BOOLEANS, + org.jooq.test.h2.generatedclasses.tables.TUnsigned.T_UNSIGNED, org.jooq.test.h2.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.h2.generatedclasses.tables.TLanguage.T_LANGUAGE, org.jooq.test.h2.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST, diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Tables.java index c7791b5788..2eaafe9c0f 100644 --- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/Tables.java @@ -36,6 +36,11 @@ public class Tables { */ public static final org.jooq.test.h2.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.h2.generatedclasses.tables.TBooleans.T_BOOLEANS; + /** + * The table PUBLIC.T_UNSIGNED + */ + public static final org.jooq.test.h2.generatedclasses.tables.TUnsigned T_UNSIGNED = org.jooq.test.h2.generatedclasses.tables.TUnsigned.T_UNSIGNED; + /** * The table PUBLIC.T_TRIGGERS */ diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TUnsigned.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TUnsigned.java new file mode 100644 index 0000000000..fe302b38e7 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TUnsigned.java @@ -0,0 +1,53 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class TUnsigned extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = 2011854816; + + /** + * The singleton instance of PUBLIC.T_UNSIGNED + */ + public static final org.jooq.test.h2.generatedclasses.tables.TUnsigned T_UNSIGNED = new org.jooq.test.h2.generatedclasses.tables.TUnsigned(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return org.jooq.test.h2.generatedclasses.tables.records.TUnsignedRecord.class; + } + + /** + * The column PUBLIC.T_UNSIGNED.U_BYTE. + */ + public static final org.jooq.TableField U_BYTE = createField("U_BYTE", org.jooq.impl.SQLDataType.TINYINTUNSIGNED, T_UNSIGNED); + + /** + * The column PUBLIC.T_UNSIGNED.U_SHORT. + */ + public static final org.jooq.TableField U_SHORT = createField("U_SHORT", org.jooq.impl.SQLDataType.SMALLINTUNSIGNED, T_UNSIGNED); + + /** + * The column PUBLIC.T_UNSIGNED.U_INT. + */ + public static final org.jooq.TableField U_INT = createField("U_INT", org.jooq.impl.SQLDataType.INTEGERUNSIGNED, T_UNSIGNED); + + /** + * The column PUBLIC.T_UNSIGNED.U_LONG. + */ + public static final org.jooq.TableField U_LONG = createField("U_LONG", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, T_UNSIGNED); + + /** + * No further instances allowed + */ + private TUnsigned() { + super("T_UNSIGNED", org.jooq.test.h2.generatedclasses.Public.PUBLIC); + } +} diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/interfaces/ITUnsigned.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/interfaces/ITUnsigned.java new file mode 100644 index 0000000000..50001b8009 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/interfaces/ITUnsigned.java @@ -0,0 +1,65 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables.interfaces; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public interface ITUnsigned extends java.io.Serializable { + + /** + * Setter for PUBLIC.T_UNSIGNED.U_BYTE. + */ + public void setUByte(org.jooq.types.UByte value); + + /** + * Getter for PUBLIC.T_UNSIGNED.U_BYTE. + */ + public org.jooq.types.UByte getUByte(); + + /** + * Setter for PUBLIC.T_UNSIGNED.U_SHORT. + */ + public void setUShort(org.jooq.types.UShort value); + + /** + * Getter for PUBLIC.T_UNSIGNED.U_SHORT. + */ + public org.jooq.types.UShort getUShort(); + + /** + * Setter for PUBLIC.T_UNSIGNED.U_INT. + */ + public void setUInt(org.jooq.types.UInteger value); + + /** + * Getter for PUBLIC.T_UNSIGNED.U_INT. + */ + public org.jooq.types.UInteger getUInt(); + + /** + * Setter for PUBLIC.T_UNSIGNED.U_LONG. + */ + public void setULong(org.jooq.types.ULong value); + + /** + * Getter for PUBLIC.T_UNSIGNED.U_LONG. + */ + public org.jooq.types.ULong getULong(); + + // ------------------------------------------------------------------------- + // FROM and INTO + // ------------------------------------------------------------------------- + + /** + * Load data from another generated Record/POJO implementing the common interface ITUnsigned + */ + public void from(org.jooq.test.h2.generatedclasses.tables.interfaces.ITUnsigned from); + + /** + * Copy data into another generated Record/POJO implementing the common interface ITUnsigned + */ + public E into(E into); +} diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/pojos/TUnsigned.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/pojos/TUnsigned.java new file mode 100644 index 0000000000..8048487de9 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/pojos/TUnsigned.java @@ -0,0 +1,82 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables.pojos; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class TUnsigned implements org.jooq.test.h2.generatedclasses.tables.interfaces.ITUnsigned { + + private static final long serialVersionUID = -794383215; + + private org.jooq.types.UByte uByte; + private org.jooq.types.UShort uShort; + private org.jooq.types.UInteger uInt; + private org.jooq.types.ULong uLong; + + @Override + public org.jooq.types.UByte getUByte() { + return this.uByte; + } + + @Override + public void setUByte(org.jooq.types.UByte uByte) { + this.uByte = uByte; + } + + @Override + public org.jooq.types.UShort getUShort() { + return this.uShort; + } + + @Override + public void setUShort(org.jooq.types.UShort uShort) { + this.uShort = uShort; + } + + @Override + public org.jooq.types.UInteger getUInt() { + return this.uInt; + } + + @Override + public void setUInt(org.jooq.types.UInteger uInt) { + this.uInt = uInt; + } + + @Override + public org.jooq.types.ULong getULong() { + return this.uLong; + } + + @Override + public void setULong(org.jooq.types.ULong uLong) { + this.uLong = uLong; + } + + // ------------------------------------------------------------------------- + // FROM and INTO + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public void from(org.jooq.test.h2.generatedclasses.tables.interfaces.ITUnsigned from) { + setUByte(from.getUByte()); + setUShort(from.getUShort()); + setUInt(from.getUInt()); + setULong(from.getULong()); + } + + /** + * {@inheritDoc} + */ + @Override + public E into(E into) { + into.from(this); + return into; + } +} diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TUnsignedRecord.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TUnsignedRecord.java new file mode 100644 index 0000000000..d56dbeaf57 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TUnsignedRecord.java @@ -0,0 +1,196 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.h2.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class TUnsignedRecord extends org.jooq.impl.TableRecordImpl implements org.jooq.Record4, org.jooq.test.h2.generatedclasses.tables.interfaces.ITUnsigned { + + private static final long serialVersionUID = 1036458223; + + /** + * Setter for PUBLIC.T_UNSIGNED.U_BYTE. + */ + @Override + public void setUByte(org.jooq.types.UByte value) { + setValue(0, value); + } + + /** + * Getter for PUBLIC.T_UNSIGNED.U_BYTE. + */ + @Override + public org.jooq.types.UByte getUByte() { + return (org.jooq.types.UByte) getValue(0); + } + + /** + * Setter for PUBLIC.T_UNSIGNED.U_SHORT. + */ + @Override + public void setUShort(org.jooq.types.UShort value) { + setValue(1, value); + } + + /** + * Getter for PUBLIC.T_UNSIGNED.U_SHORT. + */ + @Override + public org.jooq.types.UShort getUShort() { + return (org.jooq.types.UShort) getValue(1); + } + + /** + * Setter for PUBLIC.T_UNSIGNED.U_INT. + */ + @Override + public void setUInt(org.jooq.types.UInteger value) { + setValue(2, value); + } + + /** + * Getter for PUBLIC.T_UNSIGNED.U_INT. + */ + @Override + public org.jooq.types.UInteger getUInt() { + return (org.jooq.types.UInteger) getValue(2); + } + + /** + * Setter for PUBLIC.T_UNSIGNED.U_LONG. + */ + @Override + public void setULong(org.jooq.types.ULong value) { + setValue(3, value); + } + + /** + * Getter for PUBLIC.T_UNSIGNED.U_LONG. + */ + @Override + public org.jooq.types.ULong getULong() { + return (org.jooq.types.ULong) getValue(3); + } + + // ------------------------------------------------------------------------- + // Record4 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row4 fieldsRow() { + return (org.jooq.Row4) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row4 valuesRow() { + return (org.jooq.Row4) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return org.jooq.test.h2.generatedclasses.tables.TUnsigned.U_BYTE; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return org.jooq.test.h2.generatedclasses.tables.TUnsigned.U_SHORT; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return org.jooq.test.h2.generatedclasses.tables.TUnsigned.U_INT; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field4() { + return org.jooq.test.h2.generatedclasses.tables.TUnsigned.U_LONG; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.types.UByte value1() { + return getUByte(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.types.UShort value2() { + return getUShort(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.types.UInteger value3() { + return getUInt(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.types.ULong value4() { + return getULong(); + } + + // ------------------------------------------------------------------------- + // FROM and INTO + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public void from(org.jooq.test.h2.generatedclasses.tables.interfaces.ITUnsigned from) { + setUByte(from.getUByte()); + setUShort(from.getUShort()); + setUInt(from.getUInt()); + setULong(from.getULong()); + } + + /** + * {@inheritDoc} + */ + @Override + public E into(E into) { + into.from(this); + return into; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached TUnsignedRecord + */ + public TUnsignedRecord() { + super(org.jooq.test.h2.generatedclasses.tables.TUnsigned.T_UNSIGNED); + } +}