diff --git a/jOOQ-examples/jOOQ-flyway-example/pom.xml b/jOOQ-examples/jOOQ-flyway-example/pom.xml index 8e3f7afa7e..a66e3e98e7 100644 --- a/jOOQ-examples/jOOQ-flyway-example/pom.xml +++ b/jOOQ-examples/jOOQ-flyway-example/pom.xml @@ -158,6 +158,7 @@ .* FLYWAY_TEST + SELECT :schema_name || '_' || MAX("version") FROM "schema_version" SELECT :schema_name || '_' || MAX("version") FROM "schema_version" diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java index 4e6472739c..81242107cf 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java @@ -33,7 +33,7 @@ import org.jooq.impl.SchemaImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Public extends SchemaImpl { - private static final long serialVersionUID = -1420337279; + private static final long serialVersionUID = 1937000285; /** * The reference instance of PUBLIC @@ -85,9 +85,9 @@ public class Public extends SchemaImpl { private final List> getSequences0() { return Arrays.>asList( - Sequences.SYSTEM_SEQUENCE_70BE46BF_63D1_4F2A_B1C0_A31847E2D3F6, - Sequences.SYSTEM_SEQUENCE_7C66F721_38BD_4793_86A9_FB9269960DA2, - Sequences.SYSTEM_SEQUENCE_CB0D4218_064F_45BC_B7EB_ACA8D001DEC2); + Sequences.SYSTEM_SEQUENCE_4433876A_B02A_44B8_947E_9C2240443B3B, + Sequences.SYSTEM_SEQUENCE_473BBBB1_4C40_47D6_B053_C4BE16B8A6FE, + Sequences.SYSTEM_SEQUENCE_EB7910E6_C36C_4254_83A3_810E0B29176D); } @Override diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Sequences.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Sequences.java index fef90b6b5f..1e2e088be8 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Sequences.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Sequences.java @@ -24,17 +24,17 @@ import org.jooq.impl.SequenceImpl; public class Sequences { /** - * The sequence PUBLIC.SYSTEM_SEQUENCE_70BE46BF_63D1_4F2A_B1C0_A31847E2D3F6 + * The sequence PUBLIC.SYSTEM_SEQUENCE_4433876A_B02A_44B8_947E_9C2240443B3B */ - public static final Sequence SYSTEM_SEQUENCE_70BE46BF_63D1_4F2A_B1C0_A31847E2D3F6 = new SequenceImpl("SYSTEM_SEQUENCE_70BE46BF_63D1_4F2A_B1C0_A31847E2D3F6", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT); + public static final Sequence SYSTEM_SEQUENCE_4433876A_B02A_44B8_947E_9C2240443B3B = new SequenceImpl("SYSTEM_SEQUENCE_4433876A_B02A_44B8_947E_9C2240443B3B", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT); /** - * The sequence PUBLIC.SYSTEM_SEQUENCE_7C66F721_38BD_4793_86A9_FB9269960DA2 + * The sequence PUBLIC.SYSTEM_SEQUENCE_473BBBB1_4C40_47D6_B053_C4BE16B8A6FE */ - public static final Sequence SYSTEM_SEQUENCE_7C66F721_38BD_4793_86A9_FB9269960DA2 = new SequenceImpl("SYSTEM_SEQUENCE_7C66F721_38BD_4793_86A9_FB9269960DA2", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT); + public static final Sequence SYSTEM_SEQUENCE_473BBBB1_4C40_47D6_B053_C4BE16B8A6FE = new SequenceImpl("SYSTEM_SEQUENCE_473BBBB1_4C40_47D6_B053_C4BE16B8A6FE", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT); /** - * The sequence PUBLIC.SYSTEM_SEQUENCE_CB0D4218_064F_45BC_B7EB_ACA8D001DEC2 + * The sequence PUBLIC.SYSTEM_SEQUENCE_EB7910E6_C36C_4254_83A3_810E0B29176D */ - public static final Sequence SYSTEM_SEQUENCE_CB0D4218_064F_45BC_B7EB_ACA8D001DEC2 = new SequenceImpl("SYSTEM_SEQUENCE_CB0D4218_064F_45BC_B7EB_ACA8D001DEC2", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT); + public static final Sequence SYSTEM_SEQUENCE_EB7910E6_C36C_4254_83A3_810E0B29176D = new SequenceImpl("SYSTEM_SEQUENCE_EB7910E6_C36C_4254_83A3_810E0B29176D", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT); } diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java index 198ea73e1f..493b4f4297 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java @@ -38,7 +38,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Actor extends TableImpl { - private static final long serialVersionUID = -135380361; + private static final long serialVersionUID = -671029027; /** * The reference instance of PUBLIC.ACTOR @@ -61,12 +61,12 @@ public class Actor extends TableImpl { /** * The column PUBLIC.ACTOR.FIRSTNAME. */ - public final TableField FIRSTNAME = createField("FIRSTNAME", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, ""); + public final TableField FIRSTNAME = createField("FIRSTNAME", org.jooq.impl.SQLDataType.VARCHAR(255), this, ""); /** * The column PUBLIC.ACTOR.LASTNAME. */ - public final TableField LASTNAME = createField("LASTNAME", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, ""); + public final TableField LASTNAME = createField("LASTNAME", org.jooq.impl.SQLDataType.VARCHAR(255), this, ""); /** * Create a PUBLIC.ACTOR table reference diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java index eb541222d4..ab4c6ca123 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java @@ -39,7 +39,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Film extends TableImpl { - private static final long serialVersionUID = 1608616621; + private static final long serialVersionUID = -1288618201; /** * The reference instance of PUBLIC.FILM @@ -67,7 +67,7 @@ public class Film extends TableImpl { /** * The column PUBLIC.FILM.TITLE. */ - public final TableField TITLE = createField("TITLE", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, ""); + public final TableField TITLE = createField("TITLE", org.jooq.impl.SQLDataType.VARCHAR(255), this, ""); /** * The column PUBLIC.FILM.LANGUAGE_LANGUAGEID. diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java index b9b7d286c7..677e650ffb 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java @@ -38,7 +38,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Language extends TableImpl { - private static final long serialVersionUID = 1642663592; + private static final long serialVersionUID = -302268162; /** * The reference instance of PUBLIC.LANGUAGE @@ -61,7 +61,7 @@ public class Language extends TableImpl { /** * The column PUBLIC.LANGUAGE.NAME. */ - public final TableField NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, ""); + public final TableField NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR(255), this, ""); /** * Create a PUBLIC.LANGUAGE table reference diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/ActorRecord.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/ActorRecord.java index cd4bbc4362..cd0ac580ee 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/ActorRecord.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/ActorRecord.java @@ -27,7 +27,7 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class ActorRecord extends UpdatableRecordImpl implements Record3 { - private static final long serialVersionUID = -333921387; + private static final long serialVersionUID = 1559459935; /** * Setter for PUBLIC.ACTOR.ACTORID. @@ -127,6 +127,30 @@ public class ActorRecord extends UpdatableRecordImpl implements Rec return Actor.ACTOR.LASTNAME; } + /** + * {@inheritDoc} + */ + @Override + public Integer component1() { + return getActorid(); + } + + /** + * {@inheritDoc} + */ + @Override + public String component2() { + return getFirstname(); + } + + /** + * {@inheritDoc} + */ + @Override + public String component3() { + return getLastname(); + } + /** * {@inheritDoc} */ diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmActorRecord.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmActorRecord.java index 929e08b08b..d9a7ca41d8 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmActorRecord.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmActorRecord.java @@ -26,7 +26,7 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class FilmActorRecord extends UpdatableRecordImpl implements Record2 { - private static final long serialVersionUID = -1742998881; + private static final long serialVersionUID = -1447925980; /** * Setter for PUBLIC.FILM_ACTOR.FILMS_FILMID. @@ -104,6 +104,22 @@ public class FilmActorRecord extends UpdatableRecordImpl implem return FilmActor.FILM_ACTOR.ACTORS_ACTORID; } + /** + * {@inheritDoc} + */ + @Override + public Integer component1() { + return getFilmsFilmid(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer component2() { + return getActorsActorid(); + } + /** * {@inheritDoc} */ diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmRecord.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmRecord.java index 05a2c9745b..7406e2006c 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmRecord.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmRecord.java @@ -27,7 +27,7 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class FilmRecord extends UpdatableRecordImpl implements Record5 { - private static final long serialVersionUID = -1993637920; + private static final long serialVersionUID = -1848665934; /** * Setter for PUBLIC.FILM.FILMID. @@ -171,6 +171,46 @@ public class FilmRecord extends UpdatableRecordImpl implements Recor return Film.FILM.ORIGINALLANGUAGE_LANGUAGEID; } + /** + * {@inheritDoc} + */ + @Override + public Integer component1() { + return getFilmid(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer component2() { + return getLength(); + } + + /** + * {@inheritDoc} + */ + @Override + public String component3() { + return getTitle(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer component4() { + return getLanguageLanguageid(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer component5() { + return getOriginallanguageLanguageid(); + } + /** * {@inheritDoc} */ diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/LanguageRecord.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/LanguageRecord.java index 85ee171305..8d3aed714c 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/LanguageRecord.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/LanguageRecord.java @@ -27,7 +27,7 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class LanguageRecord extends UpdatableRecordImpl implements Record2 { - private static final long serialVersionUID = -2102649953; + private static final long serialVersionUID = -1984471177; /** * Setter for PUBLIC.LANGUAGE.LANGUAGEID. @@ -105,6 +105,22 @@ public class LanguageRecord extends UpdatableRecordImpl implemen return Language.LANGUAGE.NAME; } + /** + * {@inheritDoc} + */ + @Override + public Integer component1() { + return getLanguageid(); + } + + /** + * {@inheritDoc} + */ + @Override + public String component2() { + return getName(); + } + /** * {@inheritDoc} */