github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:jOOQ/jOOQ

Browse Source
This commit is contained in:
Lukas Eder 2023-05-25 08:17:34 +02:00
commit 2c657cc784
74 changed files with 305 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
View File

@ -2255,6 +2255,8 @@ public class JavaGenerator extends AbstractGenerator {
final boolean isUDT = t.getType(r).isUDT();
final boolean isArray = t.getType(r).isArray();
final boolean isUDTArray = t.getType(r).isUDTArray();
final ArrayDefinition array = database.getArray(t.getType(r).getSchema(), t.getType(r).getQualifiedUserType());
final String indexTypeFull = array == null || array.getIndexType() == null ? null : getJavaType(array.getIndexType(resolver(out)), out);
final boolean isArrayOfUDTs = isArrayOfUDTs(t, r);
final String udtType = (isUDT || isArray)
@ -2333,15 +2335,21 @@ public class JavaGenerator extends AbstractGenerator {
else {
if (pojoArgument) {
if (isUDTArray) {
out.println("%s(value.%s() == null ? null : new %s(value.%s().stream().map(%s::new).collect(%s.toList())));",
getStrategy().getJavaSetterName(column, Mode.RECORD),
getStrategy().getJavaGetterName(column, Mode.POJO),
udtType,
generatePojosAsJavaRecordClasses()
? getStrategy().getJavaMemberName(column, Mode.POJO)
: getStrategy().getJavaGetterName(column, Mode.POJO),
udtArrayElementType,
Collectors.class);
if (indexTypeFull == null) {
out.println("%s(value.%s() == null ? null : new %s(value.%s().stream().map(%s::new).collect(%s.toList())));",
getStrategy().getJavaSetterName(column, Mode.RECORD),
getStrategy().getJavaGetterName(column, Mode.POJO),
udtType,
generatePojosAsJavaRecordClasses()
? getStrategy().getJavaMemberName(column, Mode.POJO)
: getStrategy().getJavaGetterName(column, Mode.POJO),
udtArrayElementType,
Collectors.class);
}
else {
out.println("if (true)");
out.println("throw new %s(\"Cannot use POJO constructor for POJO that references Oracle associative array yet. See https://github.com/jOOQ/jOOQ/issues/15108 for details.\");", UnsupportedOperationException.class);
}
}
else if (isArrayOfUDTs) {
final String columnTypeFull = getJavaType(t.getType(resolver(out, Mode.POJO)), out, Mode.POJO);

12
jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java
View File

@ -90,15 +90,11 @@ public class Author extends TableImpl<AuthorRecord> {
public final TableField<AuthorRecord, String> ADDRESS = createField(DSL.name("ADDRESS"), SQLDataType.VARCHAR(50), this, "");
private Author(Name alias, Table<AuthorRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Author(Name alias, Table<AuthorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Author(Name alias, Table<AuthorRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Author(Name alias, Table<AuthorRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -199,7 +195,7 @@ public class Author extends TableImpl<AuthorRecord> {
*/
@Override
public Author where(Condition condition) {
return new Author(getQualifiedName(), aliased() ? this : null, condition);
return new Author(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java
View File

@ -76,15 +76,11 @@ public class Book extends TableImpl<BookRecord> {
public final TableField<BookRecord, String> TITLE = createField(DSL.name("TITLE"), SQLDataType.VARCHAR(400).nullable(false), this, "");
private Book(Name alias, Table<BookRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Book(Name alias, Table<BookRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Book(Name alias, Table<BookRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Book(Name alias, Table<BookRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -189,7 +185,7 @@ public class Book extends TableImpl<BookRecord> {
*/
@Override
public Book where(Condition condition) {
return new Book(getQualifiedName(), aliased() ? this : null, condition);
return new Book(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java
View File

@ -75,15 +75,11 @@ public class Actor extends TableImpl<ActorRecord> {
public final TableField<ActorRecord, String> LASTNAME = createField(DSL.name("LASTNAME"), SQLDataType.VARCHAR(255), this, "");
private Actor(Name alias, Table<ActorRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Actor(Name alias, Table<ActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Actor(Name alias, Table<ActorRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Actor(Name alias, Table<ActorRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -192,7 +188,7 @@ public class Actor extends TableImpl<ActorRecord> {
*/
@Override
public Actor where(Condition condition) {
return new Actor(getQualifiedName(), aliased() ? this : null, condition);
return new Actor(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java
View File

@ -94,15 +94,11 @@ public class Film extends TableImpl<FilmRecord> {
public final TableField<FilmRecord, Integer> ORIGINALLANGUAGE_LANGUAGEID = createField(DSL.name("ORIGINALLANGUAGE_LANGUAGEID"), SQLDataType.INTEGER, this, "");
private Film(Name alias, Table<FilmRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Film(Name alias, Table<FilmRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Film(Name alias, Table<FilmRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Film(Name alias, Table<FilmRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -242,7 +238,7 @@ public class Film extends TableImpl<FilmRecord> {
*/
@Override
public Film where(Condition condition) {
return new Film(getQualifiedName(), aliased() ? this : null, condition);
return new Film(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java
View File

@ -72,15 +72,11 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
public final TableField<FilmActorRecord, Integer> ACTORS_ACTORID = createField(DSL.name("ACTORS_ACTORID"), SQLDataType.INTEGER.nullable(false), this, "");
private FilmActor(Name alias, Table<FilmActorRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -197,7 +193,7 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
*/
@Override
public FilmActor where(Condition condition) {
return new FilmActor(getQualifiedName(), aliased() ? this : null, condition);
return new FilmActor(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java
View File

@ -69,15 +69,11 @@ public class Language extends TableImpl<LanguageRecord> {
public final TableField<LanguageRecord, String> NAME = createField(DSL.name("NAME"), SQLDataType.VARCHAR(255), this, "");
private Language(Name alias, Table<LanguageRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Language(Name alias, Table<LanguageRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Language(Name alias, Table<LanguageRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Language(Name alias, Table<LanguageRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -191,7 +187,7 @@ public class Language extends TableImpl<LanguageRecord> {
*/
@Override
public Language where(Condition condition) {
return new Language(getQualifiedName(), aliased() ? this : null, condition);
return new Language(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-r2dbc-example/src/main/java/org/jooq/example/r2dbc/db/tables/Author.java
View File

@ -75,15 +75,11 @@ public class Author extends TableImpl<AuthorRecord> {
public final TableField<AuthorRecord, String> LAST_NAME = createField(DSL.name("LAST_NAME"), SQLDataType.VARCHAR(100).nullable(false), this, "");
private Author(Name alias, Table<AuthorRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Author(Name alias, Table<AuthorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Author(Name alias, Table<AuthorRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Author(Name alias, Table<AuthorRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -189,7 +185,7 @@ public class Author extends TableImpl<AuthorRecord> {
*/
@Override
public Author where(Condition condition) {
return new Author(getQualifiedName(), aliased() ? this : null, condition);
return new Author(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-r2dbc-example/src/main/java/org/jooq/example/r2dbc/db/tables/Book.java
View File

@ -77,15 +77,11 @@ public class Book extends TableImpl<BookRecord> {
public final TableField<BookRecord, String> TITLE = createField(DSL.name("TITLE"), SQLDataType.VARCHAR(100).nullable(false), this, "");
private Book(Name alias, Table<BookRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Book(Name alias, Table<BookRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Book(Name alias, Table<BookRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Book(Name alias, Table<BookRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -196,7 +192,7 @@ public class Book extends TableImpl<BookRecord> {
*/
@Override
public Book where(Condition condition) {
return new Book(getQualifiedName(), aliased() ? this : null, condition);
return new Book(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Actor.java
View File

@ -86,15 +86,11 @@ public class Actor extends TableImpl<ActorRecord> {
public final TableField<ActorRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Actor(Name alias, Table<ActorRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Actor(Name alias, Table<ActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Actor(Name alias, Table<ActorRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Actor(Name alias, Table<ActorRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -213,7 +209,7 @@ public class Actor extends TableImpl<ActorRecord> {
*/
@Override
public Actor where(Condition condition) {
return new Actor(getQualifiedName(), aliased() ? this : null, condition);
return new Actor(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

25
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/ActorInfo.java
View File

@ -72,10 +72,10 @@ public class ActorInfo extends TableImpl<ActorInfoRecord> {
public final TableField<ActorInfoRecord, String> FILM_INFO = createField(DSL.name("film_info"), SQLDataType.CLOB, this, "");
private ActorInfo(Name alias, Table<ActorInfoRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private ActorInfo(Name alias, Table<ActorInfoRecord> aliased, Field<?>[] parameters) {
private ActorInfo(Name alias, Table<ActorInfoRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "actor_info" as SELECT a.actor_id,
a.first_name,
@ -91,25 +91,6 @@ public class ActorInfo extends TableImpl<ActorInfoRecord> {
LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))
LEFT JOIN category c ON ((fc.category_id = c.category_id)))
GROUP BY a.actor_id, a.first_name, a.last_name;
"""));
}
private ActorInfo(Name alias, Table<ActorInfoRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "actor_info" as SELECT a.actor_id,
a.first_name,
a.last_name,
group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat
FROM ((film f
JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id)))
JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id)))
WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id))
GROUP BY fa_1.actor_id))) AS film_info
FROM (((actor a
LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id)))
LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))
LEFT JOIN category c ON ((fc.category_id = c.category_id)))
GROUP BY a.actor_id, a.first_name, a.last_name;
"""), where);
}
@ -183,7 +164,7 @@ public class ActorInfo extends TableImpl<ActorInfoRecord> {
*/
@Override
public ActorInfo where(Condition condition) {
return new ActorInfo(getQualifiedName(), aliased() ? this : null, condition);
return new ActorInfo(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Address.java
View File

@ -108,15 +108,11 @@ public class Address extends TableImpl<AddressRecord> {
public final TableField<AddressRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Address(Name alias, Table<AddressRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Address(Name alias, Table<AddressRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Address(Name alias, Table<AddressRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Address(Name alias, Table<AddressRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -268,7 +264,7 @@ public class Address extends TableImpl<AddressRecord> {
*/
@Override
public Address where(Condition condition) {
return new Address(getQualifiedName(), aliased() ? this : null, condition);
return new Address(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Category.java
View File

@ -77,15 +77,11 @@ public class Category extends TableImpl<CategoryRecord> {
public final TableField<CategoryRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Category(Name alias, Table<CategoryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Category(Name alias, Table<CategoryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Category(Name alias, Table<CategoryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Category(Name alias, Table<CategoryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -199,7 +195,7 @@ public class Category extends TableImpl<CategoryRecord> {
*/
@Override
public Category where(Condition condition) {
return new Category(getQualifiedName(), aliased() ? this : null, condition);
return new Category(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/City.java
View File

@ -86,15 +86,11 @@ public class City extends TableImpl<CityRecord> {
public final TableField<CityRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private City(Name alias, Table<CityRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private City(Name alias, Table<CityRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private City(Name alias, Table<CityRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private City(Name alias, Table<CityRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -222,7 +218,7 @@ public class City extends TableImpl<CityRecord> {
*/
@Override
public City where(Condition condition) {
return new City(getQualifiedName(), aliased() ? this : null, condition);
return new City(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Country.java
View File

@ -76,15 +76,11 @@ public class Country extends TableImpl<CountryRecord> {
public final TableField<CountryRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Country(Name alias, Table<CountryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Country(Name alias, Table<CountryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Country(Name alias, Table<CountryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Country(Name alias, Table<CountryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -189,7 +185,7 @@ public class Country extends TableImpl<CountryRecord> {
*/
@Override
public Country where(Condition condition) {
return new Country(getQualifiedName(), aliased() ? this : null, condition);
return new Country(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Customer.java
View File

@ -125,15 +125,11 @@ public class Customer extends TableImpl<CustomerRecord> {
public final TableField<CustomerRecord, Integer> ACTIVE = createField(DSL.name("active"), SQLDataType.INTEGER, this, "");
private Customer(Name alias, Table<CustomerRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Customer(Name alias, Table<CustomerRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Customer(Name alias, Table<CustomerRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Customer(Name alias, Table<CustomerRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -364,7 +360,7 @@ public class Customer extends TableImpl<CustomerRecord> {
*/
@Override
public Customer where(Condition condition) {
return new Customer(getQualifiedName(), aliased() ? this : null, condition);
return new Customer(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

27
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/CustomerList.java
View File

@ -97,32 +97,11 @@ public class CustomerList extends TableImpl<CustomerListRecord> {
public final TableField<CustomerListRecord, Long> SID = createField(DSL.name("sid"), SQLDataType.BIGINT, this, "");
private CustomerList(Name alias, Table<CustomerListRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private CustomerList(Name alias, Table<CustomerListRecord> aliased, Field<?>[] parameters) {
private CustomerList(Name alias, Table<CustomerListRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "customer_list" as SELECT cu.customer_id AS id,
(((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,
a.address,
a.postal_code AS "zip code",
a.phone,
city.city,
country.country,
CASE
WHEN cu.activebool THEN 'active'::text
ELSE ''::text
END AS notes,
cu.store_id AS sid
FROM (((customer cu
JOIN address a ON ((cu.address_id = a.address_id)))
JOIN city ON ((a.city_id = city.city_id)))
JOIN country ON ((city.country_id = country.country_id)));
"""));
}
private CustomerList(Name alias, Table<CustomerListRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "customer_list" as SELECT cu.customer_id AS id,
(((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,
a.address,
@ -212,7 +191,7 @@ public class CustomerList extends TableImpl<CustomerListRecord> {
*/
@Override
public CustomerList where(Condition condition) {
return new CustomerList(getQualifiedName(), aliased() ? this : null, condition);
return new CustomerList(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Film.java
View File

@ -148,15 +148,11 @@ public class Film extends TableImpl<FilmRecord> {
public final TableField<FilmRecord, Object> FULLTEXT = createField(DSL.name("fulltext"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"tsvector\"").nullable(false), this, "");
private Film(Name alias, Table<FilmRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Film(Name alias, Table<FilmRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Film(Name alias, Table<FilmRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Film(Name alias, Table<FilmRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -340,7 +336,7 @@ public class Film extends TableImpl<FilmRecord> {
*/
@Override
public Film where(Condition condition) {
return new Film(getQualifiedName(), aliased() ? this : null, condition);
return new Film(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/FilmActor.java
View File

@ -80,15 +80,11 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
public final TableField<FilmActorRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private FilmActor(Name alias, Table<FilmActorRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -210,7 +206,7 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
*/
@Override
public FilmActor where(Condition condition) {
return new FilmActor(getQualifiedName(), aliased() ? this : null, condition);
return new FilmActor(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/FilmCategory.java
View File

@ -78,15 +78,11 @@ public class FilmCategory extends TableImpl<FilmCategoryRecord> {
public final TableField<FilmCategoryRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private FilmCategory(Name alias, Table<FilmCategoryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private FilmCategory(Name alias, Table<FilmCategoryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private FilmCategory(Name alias, Table<FilmCategoryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private FilmCategory(Name alias, Table<FilmCategoryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -203,7 +199,7 @@ public class FilmCategory extends TableImpl<FilmCategoryRecord> {
*/
@Override
public FilmCategory where(Condition condition) {
return new FilmCategory(getQualifiedName(), aliased() ? this : null, condition);
return new FilmCategory(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

7
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/FilmInStock.java
View File

@ -6,6 +6,7 @@ package org.jooq.example.testcontainers.db.tables;
import java.util.function.Function;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Function1;
import org.jooq.Name;
@ -57,7 +58,11 @@ public class FilmInStock extends TableImpl<FilmInStockRecord> {
}
private FilmInStock(Name alias, Table<FilmInStockRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function());
this(alias, aliased, parameters, null);
}
private FilmInStock(Name alias, Table<FilmInStockRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function(), where);
}
/**

25
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/FilmList.java
View File

@ -94,10 +94,10 @@ public class FilmList extends TableImpl<FilmListRecord> {
public final TableField<FilmListRecord, String> ACTORS = createField(DSL.name("actors"), SQLDataType.CLOB, this, "");
private FilmList(Name alias, Table<FilmListRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private FilmList(Name alias, Table<FilmListRecord> aliased, Field<?>[] parameters) {
private FilmList(Name alias, Table<FilmListRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "film_list" as SELECT film.film_id AS fid,
film.title,
@ -113,25 +113,6 @@ public class FilmList extends TableImpl<FilmListRecord> {
JOIN film_actor ON ((film.film_id = film_actor.film_id)))
JOIN actor ON ((film_actor.actor_id = actor.actor_id)))
GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;
"""));
}
private FilmList(Name alias, Table<FilmListRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "film_list" as SELECT film.film_id AS fid,
film.title,
film.description,
category.name AS category,
film.rental_rate AS price,
film.length,
film.rating,
group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors
FROM ((((category
LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))
LEFT JOIN film ON ((film_category.film_id = film.film_id)))
JOIN film_actor ON ((film.film_id = film_actor.film_id)))
JOIN actor ON ((film_actor.actor_id = actor.actor_id)))
GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;
"""), where);
}
@ -205,7 +186,7 @@ public class FilmList extends TableImpl<FilmListRecord> {
*/
@Override
public FilmList where(Condition condition) {
return new FilmList(getQualifiedName(), aliased() ? this : null, condition);
return new FilmList(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

7
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/FilmNotInStock.java
View File

@ -6,6 +6,7 @@ package org.jooq.example.testcontainers.db.tables;
import java.util.function.Function;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Function1;
import org.jooq.Name;
@ -57,7 +58,11 @@ public class FilmNotInStock extends TableImpl<FilmNotInStockRecord> {
}
private FilmNotInStock(Name alias, Table<FilmNotInStockRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function());
this(alias, aliased, parameters, null);
}
private FilmNotInStock(Name alias, Table<FilmNotInStockRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function(), where);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Inventory.java
View File

@ -87,15 +87,11 @@ public class Inventory extends TableImpl<InventoryRecord> {
public final TableField<InventoryRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Inventory(Name alias, Table<InventoryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Inventory(Name alias, Table<InventoryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Inventory(Name alias, Table<InventoryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Inventory(Name alias, Table<InventoryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -235,7 +231,7 @@ public class Inventory extends TableImpl<InventoryRecord> {
*/
@Override
public Inventory where(Condition condition) {
return new Inventory(getQualifiedName(), aliased() ? this : null, condition);
return new Inventory(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Language.java
View File

@ -76,15 +76,11 @@ public class Language extends TableImpl<LanguageRecord> {
public final TableField<LanguageRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Language(Name alias, Table<LanguageRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Language(Name alias, Table<LanguageRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Language(Name alias, Table<LanguageRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Language(Name alias, Table<LanguageRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -203,7 +199,7 @@ public class Language extends TableImpl<LanguageRecord> {
*/
@Override
public Language where(Condition condition) {
return new Language(getQualifiedName(), aliased() ? this : null, condition);
return new Language(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

25
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/NicerButSlowerFilmList.java
View File

@ -94,10 +94,10 @@ public class NicerButSlowerFilmList extends TableImpl<NicerButSlowerFilmListReco
public final TableField<NicerButSlowerFilmListRecord, String> ACTORS = createField(DSL.name("actors"), SQLDataType.CLOB, this, "");
private NicerButSlowerFilmList(Name alias, Table<NicerButSlowerFilmListRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private NicerButSlowerFilmList(Name alias, Table<NicerButSlowerFilmListRecord> aliased, Field<?>[] parameters) {
private NicerButSlowerFilmList(Name alias, Table<NicerButSlowerFilmListRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid,
film.title,
@ -113,25 +113,6 @@ public class NicerButSlowerFilmList extends TableImpl<NicerButSlowerFilmListReco
JOIN film_actor ON ((film.film_id = film_actor.film_id)))
JOIN actor ON ((film_actor.actor_id = actor.actor_id)))
GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;
"""));
}
private NicerButSlowerFilmList(Name alias, Table<NicerButSlowerFilmListRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid,
film.title,
film.description,
category.name AS category,
film.rental_rate AS price,
film.length,
film.rating,
group_concat((((upper("substring"((actor.first_name)::text, 1, 1)) || lower("substring"((actor.first_name)::text, 2))) || upper("substring"((actor.last_name)::text, 1, 1))) || lower("substring"((actor.last_name)::text, 2)))) AS actors
FROM ((((category
LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))
LEFT JOIN film ON ((film_category.film_id = film.film_id)))
JOIN film_actor ON ((film.film_id = film_actor.film_id)))
JOIN actor ON ((film_actor.actor_id = actor.actor_id)))
GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;
"""), where);
}
@ -207,7 +188,7 @@ public class NicerButSlowerFilmList extends TableImpl<NicerButSlowerFilmListReco
*/
@Override
public NicerButSlowerFilmList where(Condition condition) {
return new NicerButSlowerFilmList(getQualifiedName(), aliased() ? this : null, condition);
return new NicerButSlowerFilmList(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Payment.java
View File

@ -98,15 +98,11 @@ public class Payment extends TableImpl<PaymentRecord> {
public final TableField<PaymentRecord, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private Payment(Name alias, Table<PaymentRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Payment(Name alias, Table<PaymentRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Payment(Name alias, Table<PaymentRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Payment(Name alias, Table<PaymentRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -245,7 +241,7 @@ public class Payment extends TableImpl<PaymentRecord> {
*/
@Override
public Payment where(Condition condition) {
return new Payment(getQualifiedName(), aliased() ? this : null, condition);
return new Payment(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/PaymentP2007_01.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_01 extends TableImpl<PaymentP2007_01Record> {
public final TableField<PaymentP2007_01Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_01(Name alias, Table<PaymentP2007_01Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_01(Name alias, Table<PaymentP2007_01Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_01(Name alias, Table<PaymentP2007_01Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_01(Name alias, Table<PaymentP2007_01Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_01 extends TableImpl<PaymentP2007_01Record> {
*/
@Override
public PaymentP2007_01 where(Condition condition) {
return new PaymentP2007_01(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_01(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/PaymentP2007_02.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_02 extends TableImpl<PaymentP2007_02Record> {
public final TableField<PaymentP2007_02Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_02(Name alias, Table<PaymentP2007_02Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_02(Name alias, Table<PaymentP2007_02Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_02(Name alias, Table<PaymentP2007_02Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_02(Name alias, Table<PaymentP2007_02Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_02 extends TableImpl<PaymentP2007_02Record> {
*/
@Override
public PaymentP2007_02 where(Condition condition) {
return new PaymentP2007_02(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_02(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/PaymentP2007_03.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_03 extends TableImpl<PaymentP2007_03Record> {
public final TableField<PaymentP2007_03Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_03(Name alias, Table<PaymentP2007_03Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_03(Name alias, Table<PaymentP2007_03Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_03(Name alias, Table<PaymentP2007_03Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_03(Name alias, Table<PaymentP2007_03Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_03 extends TableImpl<PaymentP2007_03Record> {
*/
@Override
public PaymentP2007_03 where(Condition condition) {
return new PaymentP2007_03(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_03(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/PaymentP2007_04.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_04 extends TableImpl<PaymentP2007_04Record> {
public final TableField<PaymentP2007_04Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_04(Name alias, Table<PaymentP2007_04Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_04(Name alias, Table<PaymentP2007_04Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_04(Name alias, Table<PaymentP2007_04Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_04(Name alias, Table<PaymentP2007_04Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_04 extends TableImpl<PaymentP2007_04Record> {
*/
@Override
public PaymentP2007_04 where(Condition condition) {
return new PaymentP2007_04(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_04(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/PaymentP2007_05.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_05 extends TableImpl<PaymentP2007_05Record> {
public final TableField<PaymentP2007_05Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_05(Name alias, Table<PaymentP2007_05Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_05(Name alias, Table<PaymentP2007_05Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_05(Name alias, Table<PaymentP2007_05Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_05(Name alias, Table<PaymentP2007_05Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_05 extends TableImpl<PaymentP2007_05Record> {
*/
@Override
public PaymentP2007_05 where(Condition condition) {
return new PaymentP2007_05(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_05(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/PaymentP2007_06.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_06 extends TableImpl<PaymentP2007_06Record> {
public final TableField<PaymentP2007_06Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_06(Name alias, Table<PaymentP2007_06Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_06(Name alias, Table<PaymentP2007_06Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_06(Name alias, Table<PaymentP2007_06Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_06(Name alias, Table<PaymentP2007_06Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_06 extends TableImpl<PaymentP2007_06Record> {
*/
@Override
public PaymentP2007_06 where(Condition condition) {
return new PaymentP2007_06(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_06(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Rental.java
View File

@ -109,15 +109,11 @@ public class Rental extends TableImpl<RentalRecord> {
public final TableField<RentalRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Rental(Name alias, Table<RentalRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Rental(Name alias, Table<RentalRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Rental(Name alias, Table<RentalRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Rental(Name alias, Table<RentalRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -347,7 +343,7 @@ public class Rental extends TableImpl<RentalRecord> {
*/
@Override
public Rental where(Condition condition) {
return new Rental(getQualifiedName(), aliased() ? this : null, condition);
return new Rental(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

7
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/RewardsReport.java
View File

@ -9,6 +9,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.function.Function;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Function10;
import org.jooq.Identity;
@ -106,7 +107,11 @@ public class RewardsReport extends TableImpl<CustomerRecord> {
}
private RewardsReport(Name alias, Table<CustomerRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function());
this(alias, aliased, parameters, null);
}
private RewardsReport(Name alias, Table<CustomerRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function(), where);
}
/**

21
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/SalesByFilmCategory.java
View File

@ -63,10 +63,10 @@ public class SalesByFilmCategory extends TableImpl<SalesByFilmCategoryRecord> {
public final TableField<SalesByFilmCategoryRecord, BigDecimal> TOTAL_SALES = createField(DSL.name("total_sales"), SQLDataType.NUMERIC, this, "");
private SalesByFilmCategory(Name alias, Table<SalesByFilmCategoryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private SalesByFilmCategory(Name alias, Table<SalesByFilmCategoryRecord> aliased, Field<?>[] parameters) {
private SalesByFilmCategory(Name alias, Table<SalesByFilmCategoryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "sales_by_film_category" as SELECT c.name AS category,
sum(p.amount) AS total_sales
@ -78,21 +78,6 @@ public class SalesByFilmCategory extends TableImpl<SalesByFilmCategoryRecord> {
JOIN category c ON ((fc.category_id = c.category_id)))
GROUP BY c.name
ORDER BY (sum(p.amount)) DESC;
"""));
}
private SalesByFilmCategory(Name alias, Table<SalesByFilmCategoryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "sales_by_film_category" as SELECT c.name AS category,
sum(p.amount) AS total_sales
FROM (((((payment p
JOIN rental r ON ((p.rental_id = r.rental_id)))
JOIN inventory i ON ((r.inventory_id = i.inventory_id)))
JOIN film f ON ((i.film_id = f.film_id)))
JOIN film_category fc ON ((f.film_id = fc.film_id)))
JOIN category c ON ((fc.category_id = c.category_id)))
GROUP BY c.name
ORDER BY (sum(p.amount)) DESC;
"""), where);
}
@ -168,7 +153,7 @@ public class SalesByFilmCategory extends TableImpl<SalesByFilmCategoryRecord> {
*/
@Override
public SalesByFilmCategory where(Condition condition) {
return new SalesByFilmCategory(getQualifiedName(), aliased() ? this : null, condition);
return new SalesByFilmCategory(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

24
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/SalesByStore.java
View File

@ -68,10 +68,10 @@ public class SalesByStore extends TableImpl<SalesByStoreRecord> {
public final TableField<SalesByStoreRecord, BigDecimal> TOTAL_SALES = createField(DSL.name("total_sales"), SQLDataType.NUMERIC, this, "");
private SalesByStore(Name alias, Table<SalesByStoreRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private SalesByStore(Name alias, Table<SalesByStoreRecord> aliased, Field<?>[] parameters) {
private SalesByStore(Name alias, Table<SalesByStoreRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,
(((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,
@ -86,24 +86,6 @@ public class SalesByStore extends TableImpl<SalesByStoreRecord> {
JOIN staff m ON ((s.manager_staff_id = m.staff_id)))
GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name
ORDER BY cy.country, c.city;
"""));
}
private SalesByStore(Name alias, Table<SalesByStoreRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,
(((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,
sum(p.amount) AS total_sales
FROM (((((((payment p
JOIN rental r ON ((p.rental_id = r.rental_id)))
JOIN inventory i ON ((r.inventory_id = i.inventory_id)))
JOIN store s ON ((i.store_id = s.store_id)))
JOIN address a ON ((s.address_id = a.address_id)))
JOIN city c ON ((a.city_id = c.city_id)))
JOIN country cy ON ((c.country_id = cy.country_id)))
JOIN staff m ON ((s.manager_staff_id = m.staff_id)))
GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name
ORDER BY cy.country, c.city;
"""), where);
}
@ -177,7 +159,7 @@ public class SalesByStore extends TableImpl<SalesByStoreRecord> {
*/
@Override
public SalesByStore where(Condition condition) {
return new SalesByStore(getQualifiedName(), aliased() ? this : null, condition);
return new SalesByStore(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Staff.java
View File

@ -127,15 +127,11 @@ public class Staff extends TableImpl<StaffRecord> {
public final TableField<StaffRecord, byte[]> PICTURE = createField(DSL.name("picture"), SQLDataType.BLOB, this, "");
private Staff(Name alias, Table<StaffRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Staff(Name alias, Table<StaffRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Staff(Name alias, Table<StaffRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Staff(Name alias, Table<StaffRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -361,7 +357,7 @@ public class Staff extends TableImpl<StaffRecord> {
*/
@Override
public Staff where(Condition condition) {
return new Staff(getQualifiedName(), aliased() ? this : null, condition);
return new Staff(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

23
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/StaffList.java
View File

@ -92,28 +92,11 @@ public class StaffList extends TableImpl<StaffListRecord> {
public final TableField<StaffListRecord, Long> SID = createField(DSL.name("sid"), SQLDataType.BIGINT, this, "");
private StaffList(Name alias, Table<StaffListRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private StaffList(Name alias, Table<StaffListRecord> aliased, Field<?>[] parameters) {
private StaffList(Name alias, Table<StaffListRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "staff_list" as SELECT s.staff_id AS id,
(((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,
a.address,
a.postal_code AS "zip code",
a.phone,
city.city,
country.country,
s.store_id AS sid
FROM (((staff s
JOIN address a ON ((s.address_id = a.address_id)))
JOIN city ON ((a.city_id = city.city_id)))
JOIN country ON ((city.country_id = country.country_id)));
"""));
}
private StaffList(Name alias, Table<StaffListRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "staff_list" as SELECT s.staff_id AS id,
(((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,
a.address,
@ -199,7 +182,7 @@ public class StaffList extends TableImpl<StaffListRecord> {
*/
@Override
public StaffList where(Condition condition) {
return new StaffList(getQualifiedName(), aliased() ? this : null, condition);
return new StaffList(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-example/src/main/java/org/jooq/example/testcontainers/db/tables/Store.java
View File

@ -88,15 +88,11 @@ public class Store extends TableImpl<StoreRecord> {
public final TableField<StoreRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Store(Name alias, Table<StoreRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Store(Name alias, Table<StoreRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Store(Name alias, Table<StoreRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Store(Name alias, Table<StoreRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -249,7 +245,7 @@ public class Store extends TableImpl<StoreRecord> {
*/
@Override
public Store where(Condition condition) {
return new Store(getQualifiedName(), aliased() ? this : null, condition);
return new Store(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Actor.java
View File

@ -86,15 +86,11 @@ public class Actor extends TableImpl<ActorRecord> {
public final TableField<ActorRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Actor(Name alias, Table<ActorRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Actor(Name alias, Table<ActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Actor(Name alias, Table<ActorRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Actor(Name alias, Table<ActorRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -213,7 +209,7 @@ public class Actor extends TableImpl<ActorRecord> {
*/
@Override
public Actor where(Condition condition) {
return new Actor(getQualifiedName(), aliased() ? this : null, condition);
return new Actor(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

25
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/ActorInfo.java
View File

@ -72,10 +72,10 @@ public class ActorInfo extends TableImpl<ActorInfoRecord> {
public final TableField<ActorInfoRecord, String> FILM_INFO = createField(DSL.name("film_info"), SQLDataType.CLOB, this, "");
private ActorInfo(Name alias, Table<ActorInfoRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private ActorInfo(Name alias, Table<ActorInfoRecord> aliased, Field<?>[] parameters) {
private ActorInfo(Name alias, Table<ActorInfoRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "actor_info" as SELECT a.actor_id,
a.first_name,
@ -91,25 +91,6 @@ public class ActorInfo extends TableImpl<ActorInfoRecord> {
LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))
LEFT JOIN category c ON ((fc.category_id = c.category_id)))
GROUP BY a.actor_id, a.first_name, a.last_name;
"""));
}
private ActorInfo(Name alias, Table<ActorInfoRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "actor_info" as SELECT a.actor_id,
a.first_name,
a.last_name,
group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat
FROM ((film f
JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id)))
JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id)))
WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id))
GROUP BY fa_1.actor_id))) AS film_info
FROM (((actor a
LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id)))
LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))
LEFT JOIN category c ON ((fc.category_id = c.category_id)))
GROUP BY a.actor_id, a.first_name, a.last_name;
"""), where);
}
@ -183,7 +164,7 @@ public class ActorInfo extends TableImpl<ActorInfoRecord> {
*/
@Override
public ActorInfo where(Condition condition) {
return new ActorInfo(getQualifiedName(), aliased() ? this : null, condition);
return new ActorInfo(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Address.java
View File

@ -108,15 +108,11 @@ public class Address extends TableImpl<AddressRecord> {
public final TableField<AddressRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Address(Name alias, Table<AddressRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Address(Name alias, Table<AddressRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Address(Name alias, Table<AddressRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Address(Name alias, Table<AddressRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -268,7 +264,7 @@ public class Address extends TableImpl<AddressRecord> {
*/
@Override
public Address where(Condition condition) {
return new Address(getQualifiedName(), aliased() ? this : null, condition);
return new Address(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Category.java
View File

@ -77,15 +77,11 @@ public class Category extends TableImpl<CategoryRecord> {
public final TableField<CategoryRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Category(Name alias, Table<CategoryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Category(Name alias, Table<CategoryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Category(Name alias, Table<CategoryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Category(Name alias, Table<CategoryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -199,7 +195,7 @@ public class Category extends TableImpl<CategoryRecord> {
*/
@Override
public Category where(Condition condition) {
return new Category(getQualifiedName(), aliased() ? this : null, condition);
return new Category(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/City.java
View File

@ -86,15 +86,11 @@ public class City extends TableImpl<CityRecord> {
public final TableField<CityRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private City(Name alias, Table<CityRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private City(Name alias, Table<CityRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private City(Name alias, Table<CityRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private City(Name alias, Table<CityRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -222,7 +218,7 @@ public class City extends TableImpl<CityRecord> {
*/
@Override
public City where(Condition condition) {
return new City(getQualifiedName(), aliased() ? this : null, condition);
return new City(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Country.java
View File

@ -76,15 +76,11 @@ public class Country extends TableImpl<CountryRecord> {
public final TableField<CountryRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Country(Name alias, Table<CountryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Country(Name alias, Table<CountryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Country(Name alias, Table<CountryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Country(Name alias, Table<CountryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -189,7 +185,7 @@ public class Country extends TableImpl<CountryRecord> {
*/
@Override
public Country where(Condition condition) {
return new Country(getQualifiedName(), aliased() ? this : null, condition);
return new Country(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Customer.java
View File

@ -125,15 +125,11 @@ public class Customer extends TableImpl<CustomerRecord> {
public final TableField<CustomerRecord, Integer> ACTIVE = createField(DSL.name("active"), SQLDataType.INTEGER, this, "");
private Customer(Name alias, Table<CustomerRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Customer(Name alias, Table<CustomerRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Customer(Name alias, Table<CustomerRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Customer(Name alias, Table<CustomerRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -364,7 +360,7 @@ public class Customer extends TableImpl<CustomerRecord> {
*/
@Override
public Customer where(Condition condition) {
return new Customer(getQualifiedName(), aliased() ? this : null, condition);
return new Customer(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

27
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/CustomerList.java
View File

@ -97,32 +97,11 @@ public class CustomerList extends TableImpl<CustomerListRecord> {
public final TableField<CustomerListRecord, Long> SID = createField(DSL.name("sid"), SQLDataType.BIGINT, this, "");
private CustomerList(Name alias, Table<CustomerListRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private CustomerList(Name alias, Table<CustomerListRecord> aliased, Field<?>[] parameters) {
private CustomerList(Name alias, Table<CustomerListRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "customer_list" as SELECT cu.customer_id AS id,
(((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,
a.address,
a.postal_code AS "zip code",
a.phone,
city.city,
country.country,
CASE
WHEN cu.activebool THEN 'active'::text
ELSE ''::text
END AS notes,
cu.store_id AS sid
FROM (((customer cu
JOIN address a ON ((cu.address_id = a.address_id)))
JOIN city ON ((a.city_id = city.city_id)))
JOIN country ON ((city.country_id = country.country_id)));
"""));
}
private CustomerList(Name alias, Table<CustomerListRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "customer_list" as SELECT cu.customer_id AS id,
(((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,
a.address,
@ -212,7 +191,7 @@ public class CustomerList extends TableImpl<CustomerListRecord> {
*/
@Override
public CustomerList where(Condition condition) {
return new CustomerList(getQualifiedName(), aliased() ? this : null, condition);
return new CustomerList(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Film.java
View File

@ -148,15 +148,11 @@ public class Film extends TableImpl<FilmRecord> {
public final TableField<FilmRecord, Object> FULLTEXT = createField(DSL.name("fulltext"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"pg_catalog\".\"tsvector\"").nullable(false), this, "");
private Film(Name alias, Table<FilmRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Film(Name alias, Table<FilmRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Film(Name alias, Table<FilmRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Film(Name alias, Table<FilmRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -340,7 +336,7 @@ public class Film extends TableImpl<FilmRecord> {
*/
@Override
public Film where(Condition condition) {
return new Film(getQualifiedName(), aliased() ? this : null, condition);
return new Film(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/FilmActor.java
View File

@ -80,15 +80,11 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
public final TableField<FilmActorRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private FilmActor(Name alias, Table<FilmActorRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -210,7 +206,7 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
*/
@Override
public FilmActor where(Condition condition) {
return new FilmActor(getQualifiedName(), aliased() ? this : null, condition);
return new FilmActor(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/FilmCategory.java
View File

@ -78,15 +78,11 @@ public class FilmCategory extends TableImpl<FilmCategoryRecord> {
public final TableField<FilmCategoryRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private FilmCategory(Name alias, Table<FilmCategoryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private FilmCategory(Name alias, Table<FilmCategoryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private FilmCategory(Name alias, Table<FilmCategoryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private FilmCategory(Name alias, Table<FilmCategoryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -203,7 +199,7 @@ public class FilmCategory extends TableImpl<FilmCategoryRecord> {
*/
@Override
public FilmCategory where(Condition condition) {
return new FilmCategory(getQualifiedName(), aliased() ? this : null, condition);
return new FilmCategory(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

7
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/FilmInStock.java
View File

@ -6,6 +6,7 @@ package org.jooq.example.testcontainersflyway.db.tables;
import java.util.function.Function;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Function1;
import org.jooq.Name;
@ -57,7 +58,11 @@ public class FilmInStock extends TableImpl<FilmInStockRecord> {
}
private FilmInStock(Name alias, Table<FilmInStockRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function());
this(alias, aliased, parameters, null);
}
private FilmInStock(Name alias, Table<FilmInStockRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function(), where);
}
/**

25
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/FilmList.java
View File

@ -94,10 +94,10 @@ public class FilmList extends TableImpl<FilmListRecord> {
public final TableField<FilmListRecord, String> ACTORS = createField(DSL.name("actors"), SQLDataType.CLOB, this, "");
private FilmList(Name alias, Table<FilmListRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private FilmList(Name alias, Table<FilmListRecord> aliased, Field<?>[] parameters) {
private FilmList(Name alias, Table<FilmListRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "film_list" as SELECT film.film_id AS fid,
film.title,
@ -113,25 +113,6 @@ public class FilmList extends TableImpl<FilmListRecord> {
JOIN film_actor ON ((film.film_id = film_actor.film_id)))
JOIN actor ON ((film_actor.actor_id = actor.actor_id)))
GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;
"""));
}
private FilmList(Name alias, Table<FilmListRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "film_list" as SELECT film.film_id AS fid,
film.title,
film.description,
category.name AS category,
film.rental_rate AS price,
film.length,
film.rating,
group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors
FROM ((((category
LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))
LEFT JOIN film ON ((film_category.film_id = film.film_id)))
JOIN film_actor ON ((film.film_id = film_actor.film_id)))
JOIN actor ON ((film_actor.actor_id = actor.actor_id)))
GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;
"""), where);
}
@ -205,7 +186,7 @@ public class FilmList extends TableImpl<FilmListRecord> {
*/
@Override
public FilmList where(Condition condition) {
return new FilmList(getQualifiedName(), aliased() ? this : null, condition);
return new FilmList(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

7
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/FilmNotInStock.java
View File

@ -6,6 +6,7 @@ package org.jooq.example.testcontainersflyway.db.tables;
import java.util.function.Function;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Function1;
import org.jooq.Name;
@ -57,7 +58,11 @@ public class FilmNotInStock extends TableImpl<FilmNotInStockRecord> {
}
private FilmNotInStock(Name alias, Table<FilmNotInStockRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function());
this(alias, aliased, parameters, null);
}
private FilmNotInStock(Name alias, Table<FilmNotInStockRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function(), where);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/FlywaySchemaHistory.java
View File

@ -109,15 +109,11 @@ public class FlywaySchemaHistory extends TableImpl<FlywaySchemaHistoryRecord> {
public final TableField<FlywaySchemaHistoryRecord, Boolean> SUCCESS = createField(DSL.name("success"), SQLDataType.BOOLEAN.nullable(false), this, "");
private FlywaySchemaHistory(Name alias, Table<FlywaySchemaHistoryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private FlywaySchemaHistory(Name alias, Table<FlywaySchemaHistoryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private FlywaySchemaHistory(Name alias, Table<FlywaySchemaHistoryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private FlywaySchemaHistory(Name alias, Table<FlywaySchemaHistoryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -202,7 +198,7 @@ public class FlywaySchemaHistory extends TableImpl<FlywaySchemaHistoryRecord> {
*/
@Override
public FlywaySchemaHistory where(Condition condition) {
return new FlywaySchemaHistory(getQualifiedName(), aliased() ? this : null, condition);
return new FlywaySchemaHistory(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Inventory.java
View File

@ -87,15 +87,11 @@ public class Inventory extends TableImpl<InventoryRecord> {
public final TableField<InventoryRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Inventory(Name alias, Table<InventoryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Inventory(Name alias, Table<InventoryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Inventory(Name alias, Table<InventoryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Inventory(Name alias, Table<InventoryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -235,7 +231,7 @@ public class Inventory extends TableImpl<InventoryRecord> {
*/
@Override
public Inventory where(Condition condition) {
return new Inventory(getQualifiedName(), aliased() ? this : null, condition);
return new Inventory(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Language.java
View File

@ -76,15 +76,11 @@ public class Language extends TableImpl<LanguageRecord> {
public final TableField<LanguageRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Language(Name alias, Table<LanguageRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Language(Name alias, Table<LanguageRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Language(Name alias, Table<LanguageRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Language(Name alias, Table<LanguageRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -203,7 +199,7 @@ public class Language extends TableImpl<LanguageRecord> {
*/
@Override
public Language where(Condition condition) {
return new Language(getQualifiedName(), aliased() ? this : null, condition);
return new Language(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

25
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/NicerButSlowerFilmList.java
View File

@ -94,10 +94,10 @@ public class NicerButSlowerFilmList extends TableImpl<NicerButSlowerFilmListReco
public final TableField<NicerButSlowerFilmListRecord, String> ACTORS = createField(DSL.name("actors"), SQLDataType.CLOB, this, "");
private NicerButSlowerFilmList(Name alias, Table<NicerButSlowerFilmListRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private NicerButSlowerFilmList(Name alias, Table<NicerButSlowerFilmListRecord> aliased, Field<?>[] parameters) {
private NicerButSlowerFilmList(Name alias, Table<NicerButSlowerFilmListRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid,
film.title,
@ -113,25 +113,6 @@ public class NicerButSlowerFilmList extends TableImpl<NicerButSlowerFilmListReco
JOIN film_actor ON ((film.film_id = film_actor.film_id)))
JOIN actor ON ((film_actor.actor_id = actor.actor_id)))
GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;
"""));
}
private NicerButSlowerFilmList(Name alias, Table<NicerButSlowerFilmListRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid,
film.title,
film.description,
category.name AS category,
film.rental_rate AS price,
film.length,
film.rating,
group_concat((((upper("substring"((actor.first_name)::text, 1, 1)) || lower("substring"((actor.first_name)::text, 2))) || upper("substring"((actor.last_name)::text, 1, 1))) || lower("substring"((actor.last_name)::text, 2)))) AS actors
FROM ((((category
LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))
LEFT JOIN film ON ((film_category.film_id = film.film_id)))
JOIN film_actor ON ((film.film_id = film_actor.film_id)))
JOIN actor ON ((film_actor.actor_id = actor.actor_id)))
GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;
"""), where);
}
@ -207,7 +188,7 @@ public class NicerButSlowerFilmList extends TableImpl<NicerButSlowerFilmListReco
*/
@Override
public NicerButSlowerFilmList where(Condition condition) {
return new NicerButSlowerFilmList(getQualifiedName(), aliased() ? this : null, condition);
return new NicerButSlowerFilmList(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Payment.java
View File

@ -98,15 +98,11 @@ public class Payment extends TableImpl<PaymentRecord> {
public final TableField<PaymentRecord, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private Payment(Name alias, Table<PaymentRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Payment(Name alias, Table<PaymentRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Payment(Name alias, Table<PaymentRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Payment(Name alias, Table<PaymentRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -245,7 +241,7 @@ public class Payment extends TableImpl<PaymentRecord> {
*/
@Override
public Payment where(Condition condition) {
return new Payment(getQualifiedName(), aliased() ? this : null, condition);
return new Payment(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/PaymentP2007_01.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_01 extends TableImpl<PaymentP2007_01Record> {
public final TableField<PaymentP2007_01Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_01(Name alias, Table<PaymentP2007_01Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_01(Name alias, Table<PaymentP2007_01Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_01(Name alias, Table<PaymentP2007_01Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_01(Name alias, Table<PaymentP2007_01Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_01 extends TableImpl<PaymentP2007_01Record> {
*/
@Override
public PaymentP2007_01 where(Condition condition) {
return new PaymentP2007_01(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_01(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/PaymentP2007_02.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_02 extends TableImpl<PaymentP2007_02Record> {
public final TableField<PaymentP2007_02Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_02(Name alias, Table<PaymentP2007_02Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_02(Name alias, Table<PaymentP2007_02Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_02(Name alias, Table<PaymentP2007_02Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_02(Name alias, Table<PaymentP2007_02Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_02 extends TableImpl<PaymentP2007_02Record> {
*/
@Override
public PaymentP2007_02 where(Condition condition) {
return new PaymentP2007_02(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_02(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/PaymentP2007_03.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_03 extends TableImpl<PaymentP2007_03Record> {
public final TableField<PaymentP2007_03Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_03(Name alias, Table<PaymentP2007_03Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_03(Name alias, Table<PaymentP2007_03Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_03(Name alias, Table<PaymentP2007_03Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_03(Name alias, Table<PaymentP2007_03Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_03 extends TableImpl<PaymentP2007_03Record> {
*/
@Override
public PaymentP2007_03 where(Condition condition) {
return new PaymentP2007_03(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_03(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/PaymentP2007_04.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_04 extends TableImpl<PaymentP2007_04Record> {
public final TableField<PaymentP2007_04Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_04(Name alias, Table<PaymentP2007_04Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_04(Name alias, Table<PaymentP2007_04Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_04(Name alias, Table<PaymentP2007_04Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_04(Name alias, Table<PaymentP2007_04Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_04 extends TableImpl<PaymentP2007_04Record> {
*/
@Override
public PaymentP2007_04 where(Condition condition) {
return new PaymentP2007_04(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_04(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/PaymentP2007_05.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_05 extends TableImpl<PaymentP2007_05Record> {
public final TableField<PaymentP2007_05Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_05(Name alias, Table<PaymentP2007_05Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_05(Name alias, Table<PaymentP2007_05Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_05(Name alias, Table<PaymentP2007_05Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_05(Name alias, Table<PaymentP2007_05Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_05 extends TableImpl<PaymentP2007_05Record> {
*/
@Override
public PaymentP2007_05 where(Condition condition) {
return new PaymentP2007_05(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_05(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/PaymentP2007_06.java
View File

@ -99,15 +99,11 @@ public class PaymentP2007_06 extends TableImpl<PaymentP2007_06Record> {
public final TableField<PaymentP2007_06Record, LocalDateTime> PAYMENT_DATE = createField(DSL.name("payment_date"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
private PaymentP2007_06(Name alias, Table<PaymentP2007_06Record> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private PaymentP2007_06(Name alias, Table<PaymentP2007_06Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private PaymentP2007_06(Name alias, Table<PaymentP2007_06Record> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private PaymentP2007_06(Name alias, Table<PaymentP2007_06Record> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -248,7 +244,7 @@ public class PaymentP2007_06 extends TableImpl<PaymentP2007_06Record> {
*/
@Override
public PaymentP2007_06 where(Condition condition) {
return new PaymentP2007_06(getQualifiedName(), aliased() ? this : null, condition);
return new PaymentP2007_06(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Rental.java
View File

@ -109,15 +109,11 @@ public class Rental extends TableImpl<RentalRecord> {
public final TableField<RentalRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Rental(Name alias, Table<RentalRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Rental(Name alias, Table<RentalRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Rental(Name alias, Table<RentalRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Rental(Name alias, Table<RentalRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -347,7 +343,7 @@ public class Rental extends TableImpl<RentalRecord> {
*/
@Override
public Rental where(Condition condition) {
return new Rental(getQualifiedName(), aliased() ? this : null, condition);
return new Rental(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

7
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/RewardsReport.java
View File

@ -9,6 +9,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.function.Function;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Function10;
import org.jooq.Identity;
@ -106,7 +107,11 @@ public class RewardsReport extends TableImpl<CustomerRecord> {
}
private RewardsReport(Name alias, Table<CustomerRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function());
this(alias, aliased, parameters, null);
}
private RewardsReport(Name alias, Table<CustomerRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.function(), where);
}
/**

21
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/SalesByFilmCategory.java
View File

@ -63,10 +63,10 @@ public class SalesByFilmCategory extends TableImpl<SalesByFilmCategoryRecord> {
public final TableField<SalesByFilmCategoryRecord, BigDecimal> TOTAL_SALES = createField(DSL.name("total_sales"), SQLDataType.NUMERIC, this, "");
private SalesByFilmCategory(Name alias, Table<SalesByFilmCategoryRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private SalesByFilmCategory(Name alias, Table<SalesByFilmCategoryRecord> aliased, Field<?>[] parameters) {
private SalesByFilmCategory(Name alias, Table<SalesByFilmCategoryRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "sales_by_film_category" as SELECT c.name AS category,
sum(p.amount) AS total_sales
@ -78,21 +78,6 @@ public class SalesByFilmCategory extends TableImpl<SalesByFilmCategoryRecord> {
JOIN category c ON ((fc.category_id = c.category_id)))
GROUP BY c.name
ORDER BY (sum(p.amount)) DESC;
"""));
}
private SalesByFilmCategory(Name alias, Table<SalesByFilmCategoryRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "sales_by_film_category" as SELECT c.name AS category,
sum(p.amount) AS total_sales
FROM (((((payment p
JOIN rental r ON ((p.rental_id = r.rental_id)))
JOIN inventory i ON ((r.inventory_id = i.inventory_id)))
JOIN film f ON ((i.film_id = f.film_id)))
JOIN film_category fc ON ((f.film_id = fc.film_id)))
JOIN category c ON ((fc.category_id = c.category_id)))
GROUP BY c.name
ORDER BY (sum(p.amount)) DESC;
"""), where);
}
@ -168,7 +153,7 @@ public class SalesByFilmCategory extends TableImpl<SalesByFilmCategoryRecord> {
*/
@Override
public SalesByFilmCategory where(Condition condition) {
return new SalesByFilmCategory(getQualifiedName(), aliased() ? this : null, condition);
return new SalesByFilmCategory(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

24
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/SalesByStore.java
View File

@ -68,10 +68,10 @@ public class SalesByStore extends TableImpl<SalesByStoreRecord> {
public final TableField<SalesByStoreRecord, BigDecimal> TOTAL_SALES = createField(DSL.name("total_sales"), SQLDataType.NUMERIC, this, "");
private SalesByStore(Name alias, Table<SalesByStoreRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private SalesByStore(Name alias, Table<SalesByStoreRecord> aliased, Field<?>[] parameters) {
private SalesByStore(Name alias, Table<SalesByStoreRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,
(((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,
@ -86,24 +86,6 @@ public class SalesByStore extends TableImpl<SalesByStoreRecord> {
JOIN staff m ON ((s.manager_staff_id = m.staff_id)))
GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name
ORDER BY cy.country, c.city;
"""));
}
private SalesByStore(Name alias, Table<SalesByStoreRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,
(((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,
sum(p.amount) AS total_sales
FROM (((((((payment p
JOIN rental r ON ((p.rental_id = r.rental_id)))
JOIN inventory i ON ((r.inventory_id = i.inventory_id)))
JOIN store s ON ((i.store_id = s.store_id)))
JOIN address a ON ((s.address_id = a.address_id)))
JOIN city c ON ((a.city_id = c.city_id)))
JOIN country cy ON ((c.country_id = cy.country_id)))
JOIN staff m ON ((s.manager_staff_id = m.staff_id)))
GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name
ORDER BY cy.country, c.city;
"""), where);
}
@ -177,7 +159,7 @@ public class SalesByStore extends TableImpl<SalesByStoreRecord> {
*/
@Override
public SalesByStore where(Condition condition) {
return new SalesByStore(getQualifiedName(), aliased() ? this : null, condition);
return new SalesByStore(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Staff.java
View File

@ -127,15 +127,11 @@ public class Staff extends TableImpl<StaffRecord> {
public final TableField<StaffRecord, byte[]> PICTURE = createField(DSL.name("picture"), SQLDataType.BLOB, this, "");
private Staff(Name alias, Table<StaffRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Staff(Name alias, Table<StaffRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Staff(Name alias, Table<StaffRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Staff(Name alias, Table<StaffRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -361,7 +357,7 @@ public class Staff extends TableImpl<StaffRecord> {
*/
@Override
public Staff where(Condition condition) {
return new Staff(getQualifiedName(), aliased() ? this : null, condition);
return new Staff(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

23
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/StaffList.java
View File

@ -92,28 +92,11 @@ public class StaffList extends TableImpl<StaffListRecord> {
public final TableField<StaffListRecord, Long> SID = createField(DSL.name("sid"), SQLDataType.BIGINT, this, "");
private StaffList(Name alias, Table<StaffListRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private StaffList(Name alias, Table<StaffListRecord> aliased, Field<?>[] parameters) {
private StaffList(Name alias, Table<StaffListRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "staff_list" as SELECT s.staff_id AS id,
(((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,
a.address,
a.postal_code AS "zip code",
a.phone,
city.city,
country.country,
s.store_id AS sid
FROM (((staff s
JOIN address a ON ((s.address_id = a.address_id)))
JOIN city ON ((a.city_id = city.city_id)))
JOIN country ON ((city.country_id = country.country_id)));
"""));
}
private StaffList(Name alias, Table<StaffListRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.view("""
create view "staff_list" as SELECT s.staff_id AS id,
(((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,
a.address,
@ -199,7 +182,7 @@ public class StaffList extends TableImpl<StaffListRecord> {
*/
@Override
public StaffList where(Condition condition) {
return new StaffList(getQualifiedName(), aliased() ? this : null, condition);
return new StaffList(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

12
jOOQ-examples/jOOQ-testcontainers-flyway-example/src/main/java/org/jooq/example/testcontainersflyway/db/tables/Store.java
View File

@ -88,15 +88,11 @@ public class Store extends TableImpl<StoreRecord> {
public final TableField<StoreRecord, LocalDateTime> LAST_UPDATE = createField(DSL.name("last_update"), SQLDataType.LOCALDATETIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
private Store(Name alias, Table<StoreRecord> aliased) {
this(alias, aliased, (Field<?>[]) null);
this(alias, aliased, (Field<?>[]) null, null);
}
private Store(Name alias, Table<StoreRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
private Store(Name alias, Table<StoreRecord> aliased, Condition where) {
super(alias, null, aliased, null, DSL.comment(""), TableOptions.table(), where);
private Store(Name alias, Table<StoreRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
@ -249,7 +245,7 @@ public class Store extends TableImpl<StoreRecord> {
*/
@Override
public Store where(Condition condition) {
return new Store(getQualifiedName(), aliased() ? this : null, condition);
return new Store(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**

14
jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
View File

@ -1225,11 +1225,7 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
}
}
ExecuteContext ctx2 = new DefaultExecuteContext(((DefaultExecuteContext) ctx).originalConfiguration());
ExecuteListener listener2 = ExecuteListeners.getAndStart(ctx2);
ctx2.resultSet(rs);
returnedResult = new CursorImpl<>(ctx2, listener2, returningResolvedAsterisks.toArray(EMPTY_FIELD), null, false, true).fetch();
returnedResult = new CursorImpl<>(ctx, listener, returningResolvedAsterisks.toArray(EMPTY_FIELD), null, false, true).fetch();
// [#5366] HSQLDB currently doesn't support fetching updated records in UPDATE statements.
// [#5408] Other dialects may fall through the switch above (PostgreSQL, Firebird, Oracle) and must
@ -1252,9 +1248,9 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
listener.executeStart(ctx);
int result = executeImmediate(ctx.statement()).executeUpdate();
ctx.rows(result);
ctx.resultSet(ctx.statement().getGeneratedKeys());
listener.executeEnd(ctx);
return ctx.statement().getGeneratedKeys();
return ctx.resultSet();
}
private final int executeReturningGeneratedKeysFetchAdditionalRows(ExecuteContext ctx, ExecuteListener listener) throws SQLException {
@ -1303,10 +1299,10 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
private final ResultSet executeReturningQuery(ExecuteContext ctx, ExecuteListener listener) throws SQLException {
listener.executeStart(ctx);
ResultSet rs = ctx.statement().executeQuery();
ctx.resultSet(ctx.statement().executeQuery());
listener.executeEnd(ctx);
return rs;
return ctx.resultSet();
}
/**

2
pom.xml
View File

@ -24,7 +24,7 @@
<!-- These in-memory DBs are used by jOOQ-meta-extensions and a variety of integration tests -->
<h2.version>2.1.214</h2.version>
<sqlite.version>3.39.4.1</sqlite.version>
<sqlite.version>3.42.0.0</sqlite.version>
<duckdb.version>0.7.1</duckdb.version>
<derby.version>10.14.2.0</derby.version>
<hsqldb.version>2.7.1</hsqldb.version>