From 32f4ac70bf3377752fe60fa2b1c9589c0534fb0d Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 20 Jun 2014 10:44:04 +0200 Subject: [PATCH] [#3342] Cannot INSERT into tables with Firebird BLOB types - Regenerated database --- .../generatedclasses/DefaultSchema.java | 3 +- .../firebird/generatedclasses/Tables.java | 5 + .../generatedclasses/tables/TBook.java | 6 +- .../generatedclasses/tables/T_3342.java | 68 ++++++++++ .../generatedclasses/tables/T_725LobTest.java | 4 +- .../generatedclasses/tables/VBook.java | 6 +- .../tables/interfaces/ITBook.java | 5 +- .../tables/interfaces/IT_3342.java | 38 ++++++ .../tables/interfaces/IT_725LobTest.java | 2 +- .../tables/interfaces/IVBook.java | 5 +- .../tables/records/TBookRecord.java | 7 +- .../tables/records/T_3342Record.java | 126 ++++++++++++++++++ .../tables/records/T_725LobTestRecord.java | 4 +- .../tables/records/VBookRecord.java | 7 +- 14 files changed, 260 insertions(+), 26 deletions(-) create mode 100644 jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/T_3342.java create mode 100644 jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_3342.java create mode 100644 jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/T_3342Record.java diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/DefaultSchema.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/DefaultSchema.java index 47078baae3..2ccf0ce734 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/DefaultSchema.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/DefaultSchema.java @@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultSchema extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 689343034; + private static final long serialVersionUID = -315496449; /** * The singleton instance of @@ -44,6 +44,7 @@ public class DefaultSchema extends org.jooq.impl.SchemaImpl { private final java.util.List> getTables0() { return java.util.Arrays.>asList( + org.jooq.test.firebird.generatedclasses.tables.T_3342.T_3342, org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.firebird.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST, org.jooq.test.firebird.generatedclasses.tables.T_785.T_785, diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/Tables.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/Tables.java index 4f1f007698..0b03d8ab3c 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/Tables.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/Tables.java @@ -11,6 +11,11 @@ package org.jooq.test.firebird.generatedclasses; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { + /** + * The table T_3342 + */ + public static final org.jooq.test.firebird.generatedclasses.tables.T_3342 T_3342 = org.jooq.test.firebird.generatedclasses.tables.T_3342.T_3342; + /** * The table T_639_NUMBERS_TABLE */ diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/TBook.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/TBook.java index 8dedee23ac..beb92f8530 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/TBook.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/TBook.java @@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TBook extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -500033945; + private static final long serialVersionUID = -402557881; /** * The singleton instance of T_BOOK @@ -62,12 +62,12 @@ public class TBook extends org.jooq.impl.TableImplT_BOOK.CONTENT_TEXT. */ - public final org.jooq.TableField CONTENT_TEXT = createField("CONTENT_TEXT", org.jooq.impl.SQLDataType.CLOB.length(8), this, ""); + public final org.jooq.TableField CONTENT_TEXT = createField("CONTENT_TEXT", org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column T_BOOK.CONTENT_PDF. */ - public final org.jooq.TableField CONTENT_PDF = createField("CONTENT_PDF", org.jooq.impl.SQLDataType.BLOB.length(8), this, ""); + public final org.jooq.TableField CONTENT_PDF = createField("CONTENT_PDF", org.jooq.impl.SQLDataType.BLOB, this, ""); /** * The column T_BOOK.REC_VERSION. diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/T_3342.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/T_3342.java new file mode 100644 index 0000000000..079b6e1632 --- /dev/null +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/T_3342.java @@ -0,0 +1,68 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.firebird.generatedclasses.tables; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class T_3342 extends org.jooq.impl.TableImpl { + + private static final long serialVersionUID = 305225727; + + /** + * The singleton instance of T_3342 + */ + public static final org.jooq.test.firebird.generatedclasses.tables.T_3342 T_3342 = new org.jooq.test.firebird.generatedclasses.tables.T_3342(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return org.jooq.test.firebird.generatedclasses.tables.records.T_3342Record.class; + } + + /** + * The column T_3342.B. + */ + public final org.jooq.TableField B = createField("B", org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * Create a T_3342 table reference + */ + public T_3342() { + this("T_3342", null); + } + + /** + * Create an aliased T_3342 table reference + */ + public T_3342(java.lang.String alias) { + this(alias, org.jooq.test.firebird.generatedclasses.tables.T_3342.T_3342); + } + + private T_3342(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private T_3342(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field[] parameters) { + super(alias, org.jooq.test.firebird.generatedclasses.DefaultSchema.DEFAULT_SCHEMA, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.test.firebird.generatedclasses.tables.T_3342 as(java.lang.String alias) { + return new org.jooq.test.firebird.generatedclasses.tables.T_3342(alias, this); + } + + /** + * Rename this table + */ + public org.jooq.test.firebird.generatedclasses.tables.T_3342 rename(java.lang.String name) { + return new org.jooq.test.firebird.generatedclasses.tables.T_3342(name, null); + } +} diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/T_725LobTest.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/T_725LobTest.java index 4d9842b052..534227457d 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/T_725LobTest.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/T_725LobTest.java @@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class T_725LobTest extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 2130208323; + private static final long serialVersionUID = -1439582680; /** * The singleton instance of T_725_LOB_TEST @@ -32,7 +32,7 @@ public class T_725LobTest extends org.jooq.impl.TableImplT_725_LOB_TEST.LOB. */ - public final org.jooq.TableField LOB = createField("LOB", org.jooq.impl.SQLDataType.BLOB.length(8), this, ""); + public final org.jooq.TableField LOB = createField("LOB", org.jooq.impl.SQLDataType.BLOB, this, ""); /** * Create a T_725_LOB_TEST table reference diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/VBook.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/VBook.java index 1594eeb23f..22f0383842 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/VBook.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/VBook.java @@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VBook extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -72893728; + private static final long serialVersionUID = 1187449344; /** * The singleton instance of V_BOOK @@ -62,12 +62,12 @@ public class VBook extends org.jooq.impl.TableImplV_BOOK.CONTENT_TEXT. */ - public final org.jooq.TableField CONTENT_TEXT = createField("CONTENT_TEXT", org.jooq.impl.SQLDataType.CLOB.length(8), this, ""); + public final org.jooq.TableField CONTENT_TEXT = createField("CONTENT_TEXT", org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column V_BOOK.CONTENT_PDF. */ - public final org.jooq.TableField CONTENT_PDF = createField("CONTENT_PDF", org.jooq.impl.SQLDataType.BLOB.length(8), this, ""); + public final org.jooq.TableField CONTENT_PDF = createField("CONTENT_PDF", org.jooq.impl.SQLDataType.BLOB, this, ""); /** * The column V_BOOK.REC_VERSION. diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/ITBook.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/ITBook.java index c631147d4e..df6e1a19c8 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/ITBook.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/ITBook.java @@ -103,8 +103,7 @@ public interface ITBook extends java.io.Serializable { /** * Getter for T_BOOK.CONTENT_TEXT. */ - @javax.persistence.Column(name = "CONTENT_TEXT", length = 8) - @javax.validation.constraints.Size(max = 8) + @javax.persistence.Column(name = "CONTENT_TEXT") public java.lang.String getContentText(); /** @@ -115,7 +114,7 @@ public interface ITBook extends java.io.Serializable { /** * Getter for T_BOOK.CONTENT_PDF. */ - @javax.persistence.Column(name = "CONTENT_PDF", length = 8) + @javax.persistence.Column(name = "CONTENT_PDF") public byte[] getContentPdf(); /** diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_3342.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_3342.java new file mode 100644 index 0000000000..f568f3df68 --- /dev/null +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_3342.java @@ -0,0 +1,38 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.firebird.generatedclasses.tables.interfaces; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@javax.persistence.Entity +@javax.persistence.Table(name = "T_3342") +public interface IT_3342 extends java.io.Serializable { + + /** + * Setter for T_3342.B. + */ + public void setB(java.lang.String value); + + /** + * Getter for T_3342.B. + */ + @javax.persistence.Column(name = "B") + public java.lang.String getB(); + + // ------------------------------------------------------------------------- + // FROM and INTO + // ------------------------------------------------------------------------- + + /** + * Load data from another generated Record/POJO implementing the common interface IT_3342 + */ + public void from(org.jooq.test.firebird.generatedclasses.tables.interfaces.IT_3342 from); + + /** + * Copy data into another generated Record/POJO implementing the common interface IT_3342 + */ + public E into(E into); +} diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_725LobTest.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_725LobTest.java index f3450ca7a3..211ea8df89 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_725LobTest.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_725LobTest.java @@ -32,7 +32,7 @@ public interface IT_725LobTest extends java.io.Serializable { /** * Getter for T_725_LOB_TEST.LOB. */ - @javax.persistence.Column(name = "LOB", length = 8) + @javax.persistence.Column(name = "LOB") public byte[] getLob(); // ------------------------------------------------------------------------- diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IVBook.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IVBook.java index cb86c9dc4e..8b02ad28f9 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IVBook.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/interfaces/IVBook.java @@ -97,8 +97,7 @@ public interface IVBook extends java.io.Serializable { /** * Getter for V_BOOK.CONTENT_TEXT. */ - @javax.persistence.Column(name = "CONTENT_TEXT", length = 8) - @javax.validation.constraints.Size(max = 8) + @javax.persistence.Column(name = "CONTENT_TEXT") public java.lang.String getContentText(); /** @@ -109,7 +108,7 @@ public interface IVBook extends java.io.Serializable { /** * Getter for V_BOOK.CONTENT_PDF. */ - @javax.persistence.Column(name = "CONTENT_PDF", length = 8) + @javax.persistence.Column(name = "CONTENT_PDF") public byte[] getContentPdf(); /** diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/TBookRecord.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/TBookRecord.java index cbab740548..ef09a574ce 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/TBookRecord.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/TBookRecord.java @@ -11,7 +11,7 @@ package org.jooq.test.firebird.generatedclasses.tables.records; @javax.persistence.Table(name = "T_BOOK") public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record10, org.jooq.test.firebird.generatedclasses.tables.interfaces.ITBook { - private static final long serialVersionUID = -2147249914; + private static final long serialVersionUID = -1204600851; /** * Setter for T_BOOK.ID. @@ -150,8 +150,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImplT_BOOK.CONTENT_TEXT. */ - @javax.persistence.Column(name = "CONTENT_TEXT", length = 8) - @javax.validation.constraints.Size(max = 8) + @javax.persistence.Column(name = "CONTENT_TEXT") @Override public java.lang.String getContentText() { return (java.lang.String) getValue(7); @@ -168,7 +167,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImplT_BOOK.CONTENT_PDF. */ - @javax.persistence.Column(name = "CONTENT_PDF", length = 8) + @javax.persistence.Column(name = "CONTENT_PDF") @Override public byte[] getContentPdf() { return (byte[]) getValue(8); diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/T_3342Record.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/T_3342Record.java new file mode 100644 index 0000000000..8cff87e870 --- /dev/null +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/T_3342Record.java @@ -0,0 +1,126 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.firebird.generatedclasses.tables.records; + +/** + * This class is generated by jOOQ. + */ +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@javax.persistence.Entity +@javax.persistence.Table(name = "T_3342") +public class T_3342Record extends org.jooq.impl.TableRecordImpl implements org.jooq.Record1, org.jooq.test.firebird.generatedclasses.tables.interfaces.IT_3342 { + + private static final long serialVersionUID = -2022932139; + + /** + * Setter for T_3342.B. + */ + @Override + public void setB(java.lang.String value) { + setValue(0, value); + } + + /** + * Getter for T_3342.B. + */ + @javax.persistence.Column(name = "B") + @Override + public java.lang.String getB() { + return (java.lang.String) getValue(0); + } + + // ------------------------------------------------------------------------- + // Record1 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row1 fieldsRow() { + return (org.jooq.Row1) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row1 valuesRow() { + return (org.jooq.Row1) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return org.jooq.test.firebird.generatedclasses.tables.T_3342.T_3342.B; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value1() { + return getB(); + } + + /** + * {@inheritDoc} + */ + @Override + public T_3342Record value1(java.lang.String value) { + setB(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public T_3342Record values(java.lang.String value1) { + return this; + } + + // ------------------------------------------------------------------------- + // FROM and INTO + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public void from(org.jooq.test.firebird.generatedclasses.tables.interfaces.IT_3342 from) { + setB(from.getB()); + } + + /** + * {@inheritDoc} + */ + @Override + public E into(E into) { + into.from(this); + return into; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached T_3342Record + */ + public T_3342Record() { + super(org.jooq.test.firebird.generatedclasses.tables.T_3342.T_3342); + } + + /** + * Create a detached, initialised T_3342Record + */ + public T_3342Record(java.lang.String b) { + super(org.jooq.test.firebird.generatedclasses.tables.T_3342.T_3342); + + setValue(0, b); + } +} diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/T_725LobTestRecord.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/T_725LobTestRecord.java index 5d6eefffb6..8742970d6b 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/T_725LobTestRecord.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/T_725LobTestRecord.java @@ -11,7 +11,7 @@ package org.jooq.test.firebird.generatedclasses.tables.records; @javax.persistence.Table(name = "T_725_LOB_TEST") public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record2, org.jooq.test.firebird.generatedclasses.tables.interfaces.IT_725LobTest { - private static final long serialVersionUID = -1999653050; + private static final long serialVersionUID = -115154187; /** * Setter for T_725_LOB_TEST.ID. @@ -43,7 +43,7 @@ public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImplT_725_LOB_TEST.LOB. */ - @javax.persistence.Column(name = "LOB", length = 8) + @javax.persistence.Column(name = "LOB") @Override public byte[] getLob() { return (byte[]) getValue(1); diff --git a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/VBookRecord.java b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/VBookRecord.java index 01aae27bbc..152d5fd8e6 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/VBookRecord.java +++ b/jOOQ-test/src/test/java/org/jooq/test/firebird/generatedclasses/tables/records/VBookRecord.java @@ -11,7 +11,7 @@ package org.jooq.test.firebird.generatedclasses.tables.records; @javax.persistence.Table(name = "V_BOOK") public class VBookRecord extends org.jooq.impl.TableRecordImpl implements org.jooq.Record10, org.jooq.test.firebird.generatedclasses.tables.interfaces.IVBook { - private static final long serialVersionUID = 1510572261; + private static final long serialVersionUID = 397209822; /** * Setter for V_BOOK.ID. @@ -144,8 +144,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImplV_BOOK.CONTENT_TEXT. */ - @javax.persistence.Column(name = "CONTENT_TEXT", length = 8) - @javax.validation.constraints.Size(max = 8) + @javax.persistence.Column(name = "CONTENT_TEXT") @Override public java.lang.String getContentText() { return (java.lang.String) getValue(7); @@ -162,7 +161,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImplV_BOOK.CONTENT_PDF. */ - @javax.persistence.Column(name = "CONTENT_PDF", length = 8) + @javax.persistence.Column(name = "CONTENT_PDF") @Override public byte[] getContentPdf() { return (byte[]) getValue(8);