From d1c8460adadde40001e23e19a40955fb6d36125e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 4 Sep 2019 11:52:11 +0200 Subject: [PATCH] Regenerated code --- .../flyway/ddl/db/h2/DefaultCatalog.java | 2 +- .../example/flyway/ddl/db/h2/FlywayTest.java | 2 +- .../flyway/ddl/db/h2/tables/Author.java | 2 +- .../example/flyway/ddl/db/h2/tables/Book.java | 2 +- .../db/h2/tables/records/AuthorRecord.java | 2 +- .../ddl/db/h2/tables/records/BookRecord.java | 2 +- .../jooq/example/jpa/jooq/DefaultCatalog.java | 8 +- .../org/jooq/example/jpa/jooq/Indexes.java | 2 +- .../java/org/jooq/example/jpa/jooq/Keys.java | 2 +- .../org/jooq/example/jpa/jooq/Public.java | 80 ------------------- .../org/jooq/example/jpa/jooq/Tables.java | 10 +-- .../jooq/example/jpa/jooq/tables/Actor.java | 20 ++--- .../jooq/example/jpa/jooq/tables/Film.java | 26 +++--- .../example/jpa/jooq/tables/FilmActor.java | 18 ++--- .../example/jpa/jooq/tables/Language.java | 18 ++--- .../jpa/jooq/tables/records/ActorRecord.java | 14 ++-- .../jooq/tables/records/FilmActorRecord.java | 10 +-- .../jpa/jooq/tables/records/FilmRecord.java | 26 +++--- .../jooq/tables/records/LanguageRecord.java | 10 +-- 19 files changed, 88 insertions(+), 168 deletions(-) delete mode 100644 jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java index 7be07a0e27..2c3a9827ef 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java @@ -27,7 +27,7 @@ import org.jooq.impl.CatalogImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = -846185862; + private static final long serialVersionUID = 1549802009; /** * The reference instance of diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java index ecf77cd04c..21a7879eed 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java @@ -31,7 +31,7 @@ import org.jooq.impl.SchemaImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class FlywayTest extends SchemaImpl { - private static final long serialVersionUID = -520771476; + private static final long serialVersionUID = -464060435; /** * The reference instance of FLYWAY_TEST diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java index 43fcb65ed6..49db80e4fa 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java @@ -41,7 +41,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Author extends TableImpl { - private static final long serialVersionUID = 1689383333; + private static final long serialVersionUID = 576523140; /** * The reference instance of FLYWAY_TEST.AUTHOR diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java index d53e4cea4a..d9024d3bec 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Book extends TableImpl { - private static final long serialVersionUID = 353140781; + private static final long serialVersionUID = -2007055378; /** * The reference instance of FLYWAY_TEST.BOOK diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/AuthorRecord.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/AuthorRecord.java index 7351e854d7..20a7309a27 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/AuthorRecord.java +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/AuthorRecord.java @@ -29,7 +29,7 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AuthorRecord extends UpdatableRecordImpl implements Record6 { - private static final long serialVersionUID = -850705131; + private static final long serialVersionUID = 1547569460; /** * Setter for FLYWAY_TEST.AUTHOR.ID. diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/BookRecord.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/BookRecord.java index 8a7c6a7f41..0ff57f6b53 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/BookRecord.java +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/BookRecord.java @@ -27,7 +27,7 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BookRecord extends UpdatableRecordImpl implements Record3 { - private static final long serialVersionUID = 789103786; + private static final long serialVersionUID = 1683462763; /** * Setter for FLYWAY_TEST.BOOK.ID. diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java index b836e44d1a..3435ea1eff 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java @@ -18,7 +18,7 @@ import org.jooq.impl.CatalogImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = -1668972142; + private static final long serialVersionUID = -379550258; /** * The reference instance of @@ -26,9 +26,9 @@ public class DefaultCatalog extends CatalogImpl { public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog(); /** - * The schema PUBLIC. + * The schema . */ - public final Public PUBLIC = org.jooq.example.jpa.jooq.Public.PUBLIC; + public final DefaultSchema DEFAULT_SCHEMA = org.jooq.example.jpa.jooq.DefaultSchema.DEFAULT_SCHEMA; /** * No further instances allowed @@ -46,6 +46,6 @@ public class DefaultCatalog extends CatalogImpl { private final List getSchemas0() { return Arrays.asList( - Public.PUBLIC); + DefaultSchema.DEFAULT_SCHEMA); } } diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java index a2203b2bfd..c0cf5d1cb7 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java @@ -14,7 +14,7 @@ import org.jooq.impl.Internal; /** - * A class modelling indexes of tables of the PUBLIC schema. + * A class modelling indexes of tables of the schema. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Indexes { diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java index ddd243f483..5dca946e25 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java @@ -20,7 +20,7 @@ import org.jooq.impl.Internal; /** * A class modelling foreign key relationships and constraints of tables of - * the PUBLIC schema. + * the schema. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Keys { 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 deleted file mode 100644 index 98ef242eca..0000000000 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package org.jooq.example.jpa.jooq; - - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.jooq.Catalog; -import org.jooq.Table; -import org.jooq.example.jpa.jooq.tables.Actor; -import org.jooq.example.jpa.jooq.tables.Film; -import org.jooq.example.jpa.jooq.tables.FilmActor; -import org.jooq.example.jpa.jooq.tables.Language; -import org.jooq.impl.SchemaImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Public extends SchemaImpl { - - private static final long serialVersionUID = -1878258063; - - /** - * The reference instance of PUBLIC - */ - public static final Public PUBLIC = new Public(); - - /** - * The table PUBLIC.ACTOR. - */ - public final Actor ACTOR = org.jooq.example.jpa.jooq.tables.Actor.ACTOR; - - /** - * The table PUBLIC.FILM. - */ - public final Film FILM = org.jooq.example.jpa.jooq.tables.Film.FILM; - - /** - * The table PUBLIC.FILM_ACTOR. - */ - public final FilmActor FILM_ACTOR = org.jooq.example.jpa.jooq.tables.FilmActor.FILM_ACTOR; - - /** - * The table PUBLIC.LANGUAGE. - */ - public final Language LANGUAGE = org.jooq.example.jpa.jooq.tables.Language.LANGUAGE; - - /** - * No further instances allowed - */ - private Public() { - super("PUBLIC", null); - } - - - @Override - public Catalog getCatalog() { - return DefaultCatalog.DEFAULT_CATALOG; - } - - @Override - public final List> getTables() { - List result = new ArrayList(); - result.addAll(getTables0()); - return result; - } - - private final List> getTables0() { - return Arrays.>asList( - Actor.ACTOR, - Film.FILM, - FilmActor.FILM_ACTOR, - Language.LANGUAGE); - } -} diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Tables.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Tables.java index bedab597f3..d479b8453b 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Tables.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Tables.java @@ -11,28 +11,28 @@ import org.jooq.example.jpa.jooq.tables.Language; /** - * Convenience access to all tables in PUBLIC + * Convenience access to all tables in */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { /** - * The table PUBLIC.ACTOR. + * The table ACTOR. */ public static final Actor ACTOR = Actor.ACTOR; /** - * The table PUBLIC.FILM. + * The table FILM. */ public static final Film FILM = Film.FILM; /** - * The table PUBLIC.FILM_ACTOR. + * The table FILM_ACTOR. */ public static final FilmActor FILM_ACTOR = FilmActor.FILM_ACTOR; /** - * The table PUBLIC.LANGUAGE. + * The table LANGUAGE. */ public static final Language LANGUAGE = Language.LANGUAGE; } 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 fcabe2deea..3b3e14eeb4 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 @@ -18,9 +18,9 @@ import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.UniqueKey; +import org.jooq.example.jpa.jooq.DefaultSchema; import org.jooq.example.jpa.jooq.Indexes; import org.jooq.example.jpa.jooq.Keys; -import org.jooq.example.jpa.jooq.Public; import org.jooq.example.jpa.jooq.tables.records.ActorRecord; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; @@ -32,10 +32,10 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Actor extends TableImpl { - private static final long serialVersionUID = 14087797; + private static final long serialVersionUID = 99932436; /** - * The reference instance of PUBLIC.ACTOR + * The reference instance of ACTOR */ public static final Actor ACTOR = new Actor(); @@ -48,36 +48,36 @@ public class Actor extends TableImpl { } /** - * The column PUBLIC.ACTOR.ACTORID. + * The column ACTOR.ACTORID. */ public final TableField ACTORID = createField(DSL.name("ACTORID"), org.jooq.impl.SQLDataType.INTEGER.nullable(false).identity(true), this, ""); /** - * The column PUBLIC.ACTOR.FIRSTNAME. + * The column ACTOR.FIRSTNAME. */ public final TableField FIRSTNAME = createField(DSL.name("FIRSTNAME"), org.jooq.impl.SQLDataType.VARCHAR(255), this, ""); /** - * The column PUBLIC.ACTOR.LASTNAME. + * The column ACTOR.LASTNAME. */ public final TableField LASTNAME = createField(DSL.name("LASTNAME"), org.jooq.impl.SQLDataType.VARCHAR(255), this, ""); /** - * Create a PUBLIC.ACTOR table reference + * Create a ACTOR table reference */ public Actor() { this(DSL.name("ACTOR"), null); } /** - * Create an aliased PUBLIC.ACTOR table reference + * Create an aliased ACTOR table reference */ public Actor(String alias) { this(DSL.name(alias), ACTOR); } /** - * Create an aliased PUBLIC.ACTOR table reference + * Create an aliased ACTOR table reference */ public Actor(Name alias) { this(alias, ACTOR); @@ -97,7 +97,7 @@ public class Actor extends TableImpl { @Override public Schema getSchema() { - return Public.PUBLIC; + return DefaultSchema.DEFAULT_SCHEMA; } @Override 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 3d3060c396..12213b3c6c 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 @@ -19,9 +19,9 @@ import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.UniqueKey; +import org.jooq.example.jpa.jooq.DefaultSchema; import org.jooq.example.jpa.jooq.Indexes; import org.jooq.example.jpa.jooq.Keys; -import org.jooq.example.jpa.jooq.Public; import org.jooq.example.jpa.jooq.tables.records.FilmRecord; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; @@ -33,10 +33,10 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Film extends TableImpl { - private static final long serialVersionUID = -694610440; + private static final long serialVersionUID = -1815407288; /** - * The reference instance of PUBLIC.FILM + * The reference instance of FILM */ public static final Film FILM = new Film(); @@ -49,51 +49,51 @@ public class Film extends TableImpl { } /** - * The column PUBLIC.FILM.FILMID. + * The column FILM.FILMID. */ public final TableField FILMID = createField(DSL.name("FILMID"), org.jooq.impl.SQLDataType.INTEGER.nullable(false).identity(true), this, ""); /** - * The column PUBLIC.FILM.LENGTH. + * The column FILM.LENGTH. */ public final TableField LENGTH = createField(DSL.name("LENGTH"), org.jooq.impl.SQLDataType.INTEGER, this, ""); /** - * The column PUBLIC.FILM.RELEASE_YEAR. + * The column FILM.RELEASE_YEAR. */ public final TableField RELEASE_YEAR = createField(DSL.name("RELEASE_YEAR"), org.jooq.impl.SQLDataType.INTEGER, this, "", new org.jooq.impl.JPAConverter(org.jooq.example.jpa.converters.YearConverter.class)); /** - * The column PUBLIC.FILM.TITLE. + * The column FILM.TITLE. */ public final TableField TITLE = createField(DSL.name("TITLE"), org.jooq.impl.SQLDataType.VARCHAR(255), this, ""); /** - * The column PUBLIC.FILM.LANGUAGE_LANGUAGEID. + * The column FILM.LANGUAGE_LANGUAGEID. */ public final TableField LANGUAGE_LANGUAGEID = createField(DSL.name("LANGUAGE_LANGUAGEID"), org.jooq.impl.SQLDataType.INTEGER, this, ""); /** - * The column PUBLIC.FILM.ORIGINALLANGUAGE_LANGUAGEID. + * The column FILM.ORIGINALLANGUAGE_LANGUAGEID. */ public final TableField ORIGINALLANGUAGE_LANGUAGEID = createField(DSL.name("ORIGINALLANGUAGE_LANGUAGEID"), org.jooq.impl.SQLDataType.INTEGER, this, ""); /** - * Create a PUBLIC.FILM table reference + * Create a FILM table reference */ public Film() { this(DSL.name("FILM"), null); } /** - * Create an aliased PUBLIC.FILM table reference + * Create an aliased FILM table reference */ public Film(String alias) { this(DSL.name(alias), FILM); } /** - * Create an aliased PUBLIC.FILM table reference + * Create an aliased FILM table reference */ public Film(Name alias) { this(alias, FILM); @@ -113,7 +113,7 @@ public class Film extends TableImpl { @Override public Schema getSchema() { - return Public.PUBLIC; + return DefaultSchema.DEFAULT_SCHEMA; } @Override diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java index a602de5e93..6d8d86b1a9 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java @@ -17,9 +17,9 @@ import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.UniqueKey; +import org.jooq.example.jpa.jooq.DefaultSchema; import org.jooq.example.jpa.jooq.Indexes; import org.jooq.example.jpa.jooq.Keys; -import org.jooq.example.jpa.jooq.Public; import org.jooq.example.jpa.jooq.tables.records.FilmActorRecord; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; @@ -31,10 +31,10 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class FilmActor extends TableImpl { - private static final long serialVersionUID = -705857387; + private static final long serialVersionUID = -1106860955; /** - * The reference instance of PUBLIC.FILM_ACTOR + * The reference instance of FILM_ACTOR */ public static final FilmActor FILM_ACTOR = new FilmActor(); @@ -47,31 +47,31 @@ public class FilmActor extends TableImpl { } /** - * The column PUBLIC.FILM_ACTOR.FILMS_FILMID. + * The column FILM_ACTOR.FILMS_FILMID. */ public final TableField FILMS_FILMID = createField(DSL.name("FILMS_FILMID"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** - * The column PUBLIC.FILM_ACTOR.ACTORS_ACTORID. + * The column FILM_ACTOR.ACTORS_ACTORID. */ public final TableField ACTORS_ACTORID = createField(DSL.name("ACTORS_ACTORID"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** - * Create a PUBLIC.FILM_ACTOR table reference + * Create a FILM_ACTOR table reference */ public FilmActor() { this(DSL.name("FILM_ACTOR"), null); } /** - * Create an aliased PUBLIC.FILM_ACTOR table reference + * Create an aliased FILM_ACTOR table reference */ public FilmActor(String alias) { this(DSL.name(alias), FILM_ACTOR); } /** - * Create an aliased PUBLIC.FILM_ACTOR table reference + * Create an aliased FILM_ACTOR table reference */ public FilmActor(Name alias) { this(alias, FILM_ACTOR); @@ -91,7 +91,7 @@ public class FilmActor extends TableImpl { @Override public Schema getSchema() { - return Public.PUBLIC; + return DefaultSchema.DEFAULT_SCHEMA; } @Override 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 856030d525..01ed159a3f 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 @@ -18,9 +18,9 @@ import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.UniqueKey; +import org.jooq.example.jpa.jooq.DefaultSchema; import org.jooq.example.jpa.jooq.Indexes; import org.jooq.example.jpa.jooq.Keys; -import org.jooq.example.jpa.jooq.Public; import org.jooq.example.jpa.jooq.tables.records.LanguageRecord; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; @@ -32,10 +32,10 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Language extends TableImpl { - private static final long serialVersionUID = 462156551; + private static final long serialVersionUID = -823519981; /** - * The reference instance of PUBLIC.LANGUAGE + * The reference instance of LANGUAGE */ public static final Language LANGUAGE = new Language(); @@ -48,31 +48,31 @@ public class Language extends TableImpl { } /** - * The column PUBLIC.LANGUAGE.LANGUAGEID. + * The column LANGUAGE.LANGUAGEID. */ public final TableField LANGUAGEID = createField(DSL.name("LANGUAGEID"), org.jooq.impl.SQLDataType.INTEGER.nullable(false).identity(true), this, ""); /** - * The column PUBLIC.LANGUAGE.NAME. + * The column LANGUAGE.NAME. */ public final TableField NAME = createField(DSL.name("NAME"), org.jooq.impl.SQLDataType.VARCHAR(255), this, ""); /** - * Create a PUBLIC.LANGUAGE table reference + * Create a LANGUAGE table reference */ public Language() { this(DSL.name("LANGUAGE"), null); } /** - * Create an aliased PUBLIC.LANGUAGE table reference + * Create an aliased LANGUAGE table reference */ public Language(String alias) { this(DSL.name(alias), LANGUAGE); } /** - * Create an aliased PUBLIC.LANGUAGE table reference + * Create an aliased LANGUAGE table reference */ public Language(Name alias) { this(alias, LANGUAGE); @@ -92,7 +92,7 @@ public class Language extends TableImpl { @Override public Schema getSchema() { - return Public.PUBLIC; + return DefaultSchema.DEFAULT_SCHEMA; } @Override 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 a48aed9f88..8c36acd065 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 @@ -18,45 +18,45 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class ActorRecord extends UpdatableRecordImpl implements Record3 { - private static final long serialVersionUID = 1456506232; + private static final long serialVersionUID = 642455114; /** - * Setter for PUBLIC.ACTOR.ACTORID. + * Setter for ACTOR.ACTORID. */ public void setActorid(Integer value) { set(0, value); } /** - * Getter for PUBLIC.ACTOR.ACTORID. + * Getter for ACTOR.ACTORID. */ public Integer getActorid() { return (Integer) get(0); } /** - * Setter for PUBLIC.ACTOR.FIRSTNAME. + * Setter for ACTOR.FIRSTNAME. */ public void setFirstname(String value) { set(1, value); } /** - * Getter for PUBLIC.ACTOR.FIRSTNAME. + * Getter for ACTOR.FIRSTNAME. */ public String getFirstname() { return (String) get(1); } /** - * Setter for PUBLIC.ACTOR.LASTNAME. + * Setter for ACTOR.LASTNAME. */ public void setLastname(String value) { set(2, value); } /** - * Getter for PUBLIC.ACTOR.LASTNAME. + * Getter for ACTOR.LASTNAME. */ public String getLastname() { return (String) get(2); 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 d1de540176..ef4554e750 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 @@ -17,31 +17,31 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class FilmActorRecord extends UpdatableRecordImpl implements Record2 { - private static final long serialVersionUID = -674253481; + private static final long serialVersionUID = 146002269; /** - * Setter for PUBLIC.FILM_ACTOR.FILMS_FILMID. + * Setter for FILM_ACTOR.FILMS_FILMID. */ public void setFilmsFilmid(Integer value) { set(0, value); } /** - * Getter for PUBLIC.FILM_ACTOR.FILMS_FILMID. + * Getter for FILM_ACTOR.FILMS_FILMID. */ public Integer getFilmsFilmid() { return (Integer) get(0); } /** - * Setter for PUBLIC.FILM_ACTOR.ACTORS_ACTORID. + * Setter for FILM_ACTOR.ACTORS_ACTORID. */ public void setActorsActorid(Integer value) { set(1, value); } /** - * Getter for PUBLIC.FILM_ACTOR.ACTORS_ACTORID. + * Getter for FILM_ACTOR.ACTORS_ACTORID. */ public Integer getActorsActorid() { return (Integer) get(1); 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 710926fa85..8df2dc2df7 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 @@ -20,87 +20,87 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class FilmRecord extends UpdatableRecordImpl implements Record6 { - private static final long serialVersionUID = -1504094455; + private static final long serialVersionUID = 1764461771; /** - * Setter for PUBLIC.FILM.FILMID. + * Setter for FILM.FILMID. */ public void setFilmid(Integer value) { set(0, value); } /** - * Getter for PUBLIC.FILM.FILMID. + * Getter for FILM.FILMID. */ public Integer getFilmid() { return (Integer) get(0); } /** - * Setter for PUBLIC.FILM.LENGTH. + * Setter for FILM.LENGTH. */ public void setLength(Integer value) { set(1, value); } /** - * Getter for PUBLIC.FILM.LENGTH. + * Getter for FILM.LENGTH. */ public Integer getLength() { return (Integer) get(1); } /** - * Setter for PUBLIC.FILM.RELEASE_YEAR. + * Setter for FILM.RELEASE_YEAR. */ public void setReleaseYear(Year value) { set(2, value); } /** - * Getter for PUBLIC.FILM.RELEASE_YEAR. + * Getter for FILM.RELEASE_YEAR. */ public Year getReleaseYear() { return (Year) get(2); } /** - * Setter for PUBLIC.FILM.TITLE. + * Setter for FILM.TITLE. */ public void setTitle(String value) { set(3, value); } /** - * Getter for PUBLIC.FILM.TITLE. + * Getter for FILM.TITLE. */ public String getTitle() { return (String) get(3); } /** - * Setter for PUBLIC.FILM.LANGUAGE_LANGUAGEID. + * Setter for FILM.LANGUAGE_LANGUAGEID. */ public void setLanguageLanguageid(Integer value) { set(4, value); } /** - * Getter for PUBLIC.FILM.LANGUAGE_LANGUAGEID. + * Getter for FILM.LANGUAGE_LANGUAGEID. */ public Integer getLanguageLanguageid() { return (Integer) get(4); } /** - * Setter for PUBLIC.FILM.ORIGINALLANGUAGE_LANGUAGEID. + * Setter for FILM.ORIGINALLANGUAGE_LANGUAGEID. */ public void setOriginallanguageLanguageid(Integer value) { set(5, value); } /** - * Getter for PUBLIC.FILM.ORIGINALLANGUAGE_LANGUAGEID. + * Getter for FILM.ORIGINALLANGUAGE_LANGUAGEID. */ public Integer getOriginallanguageLanguageid() { return (Integer) get(5); 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 b64f0efced..03ea26517f 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 @@ -18,31 +18,31 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class LanguageRecord extends UpdatableRecordImpl implements Record2 { - private static final long serialVersionUID = -850822280; + private static final long serialVersionUID = -1228948270; /** - * Setter for PUBLIC.LANGUAGE.LANGUAGEID. + * Setter for LANGUAGE.LANGUAGEID. */ public void setLanguageid(Integer value) { set(0, value); } /** - * Getter for PUBLIC.LANGUAGE.LANGUAGEID. + * Getter for LANGUAGE.LANGUAGEID. */ public Integer getLanguageid() { return (Integer) get(0); } /** - * Setter for PUBLIC.LANGUAGE.NAME. + * Setter for LANGUAGE.NAME. */ public void setName(String value) { set(1, value); } /** - * Getter for PUBLIC.LANGUAGE.NAME. + * Getter for LANGUAGE.NAME. */ public String getName() { return (String) get(1);