diff --git a/build.gradle b/build.gradle index d2f0e02..0bd3b46 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'java' apply plugin: 'maven-publish' group = 'de.jottyfan' -version = '2024.10.24' +version = '2025.04.23' description = """COJooq""" diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/Keys.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/Keys.java index 0663ad1..ceaca72 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/Keys.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/Keys.java @@ -33,7 +33,6 @@ import de.jottyfan.camporganizer.db.jooq.tables.records.TSalesRecord; import de.jottyfan.camporganizer.db.jooq.tables.records.TSalescontentRecord; import de.jottyfan.camporganizer.db.jooq.tables.records.TSalescontenttypeRecord; -import org.jooq.ForeignKey; import org.jooq.TableField; import org.jooq.UniqueKey; import org.jooq.impl.DSL; @@ -73,26 +72,4 @@ public class Keys { public static final UniqueKey T_SALES_PKEY = Internal.createUniqueKey(TSales.T_SALES, DSL.name("t_sales_pkey"), new TableField[] { TSales.T_SALES.PK }, true); public static final UniqueKey T_SALESCONTENT_FK_SALES_FK_SALESCONTENTTYPE_KEY = Internal.createUniqueKey(TSalescontent.T_SALESCONTENT, DSL.name("t_salescontent_fk_sales_fk_salescontenttype_key"), new TableField[] { TSalescontent.T_SALESCONTENT.FK_SALES, TSalescontent.T_SALESCONTENT.FK_SALESCONTENTTYPE }, true); public static final UniqueKey T_SALESCONTENTTYPE_PKEY = Internal.createUniqueKey(TSalescontenttype.T_SALESCONTENTTYPE, DSL.name("t_salescontenttype_pkey"), new TableField[] { TSalescontenttype.T_SALESCONTENTTYPE.NAME }, true); - - // ------------------------------------------------------------------------- - // FOREIGN KEY definitions - // ------------------------------------------------------------------------- - - public static final ForeignKey T_CAMP__T_CAMP_FK_DOCUMENT_FKEY = Internal.createForeignKey(TCamp.T_CAMP, DSL.name("t_camp_fk_document_fkey"), new TableField[] { TCamp.T_CAMP.FK_DOCUMENT }, Keys.T_DOCUMENT_PKEY, new TableField[] { TDocument.T_DOCUMENT.PK }, true); - public static final ForeignKey T_CAMP__T_CAMP_FK_LOCATION_FKEY = Internal.createForeignKey(TCamp.T_CAMP, DSL.name("t_camp_fk_location_fkey"), new TableField[] { TCamp.T_CAMP.FK_LOCATION }, Keys.T_LOCATION_PKEY, new TableField[] { TLocation.T_LOCATION.PK }, true); - public static final ForeignKey T_CAMP__T_CAMP_FK_PROFILE_FKEY = Internal.createForeignKey(TCamp.T_CAMP, DSL.name("t_camp_fk_profile_fkey"), new TableField[] { TCamp.T_CAMP.FK_PROFILE }, Keys.T_PROFILE_PKEY, new TableField[] { TProfile.T_PROFILE.PK }, true); - public static final ForeignKey T_CAMPDOCUMENT__T_CAMPDOCUMENT_FK_CAMP_FKEY = Internal.createForeignKey(TCampdocument.T_CAMPDOCUMENT, DSL.name("t_campdocument_fk_camp_fkey"), new TableField[] { TCampdocument.T_CAMPDOCUMENT.FK_CAMP }, Keys.T_CAMP_PKEY, new TableField[] { TCamp.T_CAMP.PK }, true); - public static final ForeignKey T_CAMPDOCUMENT__T_CAMPDOCUMENT_FK_DOCUMENT_FKEY = Internal.createForeignKey(TCampdocument.T_CAMPDOCUMENT, DSL.name("t_campdocument_fk_document_fkey"), new TableField[] { TCampdocument.T_CAMPDOCUMENT.FK_DOCUMENT }, Keys.T_DOCUMENT_PKEY, new TableField[] { TDocument.T_DOCUMENT.PK }, true); - public static final ForeignKey T_CAMPPROFILE__T_CAMPPROFILE_FK_CAMP_FKEY = Internal.createForeignKey(TCampprofile.T_CAMPPROFILE, DSL.name("t_campprofile_fk_camp_fkey"), new TableField[] { TCampprofile.T_CAMPPROFILE.FK_CAMP }, Keys.T_CAMP_PKEY, new TableField[] { TCamp.T_CAMP.PK }, true); - public static final ForeignKey T_CAMPPROFILE__T_CAMPPROFILE_FK_PROFILE_FKEY = Internal.createForeignKey(TCampprofile.T_CAMPPROFILE, DSL.name("t_campprofile_fk_profile_fkey"), new TableField[] { TCampprofile.T_CAMPPROFILE.FK_PROFILE }, Keys.T_PROFILE_PKEY, new TableField[] { TProfile.T_PROFILE.PK }, true); - public static final ForeignKey T_DOCUMENTROLE__T_DOCUMENTROLE_FK_DOCUMENT_FKEY = Internal.createForeignKey(TDocumentrole.T_DOCUMENTROLE, DSL.name("t_documentrole_fk_document_fkey"), new TableField[] { TDocumentrole.T_DOCUMENTROLE.FK_DOCUMENT }, Keys.T_DOCUMENT_PKEY, new TableField[] { TDocument.T_DOCUMENT.PK }, true); - public static final ForeignKey T_LOCATION__T_LOCATION_FK_DOCUMENT_FKEY = Internal.createForeignKey(TLocation.T_LOCATION, DSL.name("t_location_fk_document_fkey"), new TableField[] { TLocation.T_LOCATION.FK_DOCUMENT }, Keys.T_DOCUMENT_PKEY, new TableField[] { TDocument.T_DOCUMENT.PK }, true); - public static final ForeignKey T_PERSON__T_PERSON_FK_CAMP_FKEY = Internal.createForeignKey(TPerson.T_PERSON, DSL.name("t_person_fk_camp_fkey"), new TableField[] { TPerson.T_PERSON.FK_CAMP }, Keys.T_CAMP_PKEY, new TableField[] { TCamp.T_CAMP.PK }, true); - public static final ForeignKey T_PERSON__T_PERSON_FK_PROFILE_FKEY = Internal.createForeignKey(TPerson.T_PERSON, DSL.name("t_person_fk_profile_fkey"), new TableField[] { TPerson.T_PERSON.FK_PROFILE }, Keys.T_PROFILE_PKEY, new TableField[] { TProfile.T_PROFILE.PK }, true); - public static final ForeignKey T_PERSON__T_PERSON_FK_REGISTRATOR_FKEY = Internal.createForeignKey(TPerson.T_PERSON, DSL.name("t_person_fk_registrator_fkey"), new TableField[] { TPerson.T_PERSON.FK_REGISTRATOR }, Keys.T_PROFILE_PKEY, new TableField[] { TProfile.T_PROFILE.PK }, true); - public static final ForeignKey T_PERSONDOCUMENT__T_PERSONDOCUMENT_FK_PERSON_FKEY = Internal.createForeignKey(TPersondocument.T_PERSONDOCUMENT, DSL.name("t_persondocument_fk_person_fkey"), new TableField[] { TPersondocument.T_PERSONDOCUMENT.FK_PERSON }, Keys.T_PERSON_PKEY, new TableField[] { TPerson.T_PERSON.PK }, true); - public static final ForeignKey T_PROFILEROLE__T_PROFILEROLE_FK_PROFILE_FKEY = Internal.createForeignKey(TProfilerole.T_PROFILEROLE, DSL.name("t_profilerole_fk_profile_fkey"), new TableField[] { TProfilerole.T_PROFILEROLE.FK_PROFILE }, Keys.T_PROFILE_PKEY, new TableField[] { TProfile.T_PROFILE.PK }, true); - public static final ForeignKey T_SALES__T_SALES_FK_CAMP_FKEY = Internal.createForeignKey(TSales.T_SALES, DSL.name("t_sales_fk_camp_fkey"), new TableField[] { TSales.T_SALES.FK_CAMP }, Keys.T_CAMP_PKEY, new TableField[] { TCamp.T_CAMP.PK }, true); - public static final ForeignKey T_SALESCONTENT__T_SALESCONTENT_FK_SALES_FKEY = Internal.createForeignKey(TSalescontent.T_SALESCONTENT, DSL.name("t_salescontent_fk_sales_fkey"), new TableField[] { TSalescontent.T_SALESCONTENT.FK_SALES }, Keys.T_SALES_PKEY, new TableField[] { TSales.T_SALES.PK }, true); - public static final ForeignKey T_SALESCONTENT__T_SALESCONTENT_FK_SALESCONTENTTYPE_FKEY = Internal.createForeignKey(TSalescontent.T_SALESCONTENT, DSL.name("t_salescontent_fk_salescontenttype_fkey"), new TableField[] { TSalescontent.T_SALESCONTENT.FK_SALESCONTENTTYPE }, Keys.T_SALESCONTENTTYPE_PKEY, new TableField[] { TSalescontenttype.T_SALESCONTENTTYPE.NAME }, true); } diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/Public.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/Public.java index f75a346..c50c9ee 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/Public.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/Public.java @@ -26,6 +26,7 @@ import de.jottyfan.camporganizer.db.jooq.tables.VCampBudgetYear; import de.jottyfan.camporganizer.db.jooq.tables.VCampdocument; import de.jottyfan.camporganizer.db.jooq.tables.VCamprole; import de.jottyfan.camporganizer.db.jooq.tables.VDocument; +import de.jottyfan.camporganizer.db.jooq.tables.VDsgvoDeleteCandidate; import de.jottyfan.camporganizer.db.jooq.tables.VFeeder; import de.jottyfan.camporganizer.db.jooq.tables.VProfile; import de.jottyfan.camporganizer.db.jooq.tables.VRegistration; @@ -164,6 +165,11 @@ public class Public extends SchemaImpl { */ public final VDocument V_DOCUMENT = VDocument.V_DOCUMENT; + /** + * The table public.v_dsgvo_delete_candidate. + */ + public final VDsgvoDeleteCandidate V_DSGVO_DELETE_CANDIDATE = VDsgvoDeleteCandidate.V_DSGVO_DELETE_CANDIDATE; + /** * The table public.v_feeder. */ @@ -232,6 +238,7 @@ public class Public extends SchemaImpl { VCampdocument.V_CAMPDOCUMENT, VCamprole.V_CAMPROLE, VDocument.V_DOCUMENT, + VDsgvoDeleteCandidate.V_DSGVO_DELETE_CANDIDATE, VFeeder.V_FEEDER, VProfile.V_PROFILE, VRegistration.V_REGISTRATION, diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/Tables.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/Tables.java index 6bbf4e2..615e019 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/Tables.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/Tables.java @@ -26,6 +26,7 @@ import de.jottyfan.camporganizer.db.jooq.tables.VCampBudgetYear; import de.jottyfan.camporganizer.db.jooq.tables.VCampdocument; import de.jottyfan.camporganizer.db.jooq.tables.VCamprole; import de.jottyfan.camporganizer.db.jooq.tables.VDocument; +import de.jottyfan.camporganizer.db.jooq.tables.VDsgvoDeleteCandidate; import de.jottyfan.camporganizer.db.jooq.tables.VFeeder; import de.jottyfan.camporganizer.db.jooq.tables.VProfile; import de.jottyfan.camporganizer.db.jooq.tables.VRegistration; @@ -150,6 +151,11 @@ public class Tables { */ public static final VDocument V_DOCUMENT = VDocument.V_DOCUMENT; + /** + * The table public.v_dsgvo_delete_candidate. + */ + public static final VDsgvoDeleteCandidate V_DSGVO_DELETE_CANDIDATE = VDsgvoDeleteCandidate.V_DSGVO_DELETE_CANDIDATE; + /** * The table public.v_feeder. */ diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCamp.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCamp.java deleted file mode 100644 index eaf99bc..0000000 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCamp.java +++ /dev/null @@ -1,444 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.camporganizer.db.jooq.tables; - - -import de.jottyfan.camporganizer.db.jooq.Keys; -import de.jottyfan.camporganizer.db.jooq.Public; -import de.jottyfan.camporganizer.db.jooq.tables.TCampdocument.TCampdocumentPath; -import de.jottyfan.camporganizer.db.jooq.tables.TCampprofile.TCampprofilePath; -import de.jottyfan.camporganizer.db.jooq.tables.TDocument.TDocumentPath; -import de.jottyfan.camporganizer.db.jooq.tables.TLocation.TLocationPath; -import de.jottyfan.camporganizer.db.jooq.tables.TPerson.TPersonPath; -import de.jottyfan.camporganizer.db.jooq.tables.TProfile.TProfilePath; -import de.jottyfan.camporganizer.db.jooq.tables.TSales.TSalesPath; -import de.jottyfan.camporganizer.db.jooq.tables.records.TCampRecord; - -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import org.jooq.Condition; -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Identity; -import org.jooq.InverseForeignKey; -import org.jooq.Name; -import org.jooq.Path; -import org.jooq.PlainSQL; -import org.jooq.QueryPart; -import org.jooq.Record; -import org.jooq.SQL; -import org.jooq.Schema; -import org.jooq.Select; -import org.jooq.Stringly; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.TableOptions; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.SQLDataType; -import org.jooq.impl.TableImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class TCamp extends TableImpl { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of public.t_camp - */ - public static final TCamp T_CAMP = new TCamp(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return TCampRecord.class; - } - - /** - * The column public.t_camp.pk. - */ - public final TableField PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, ""); - - /** - * The column public.t_camp.name. - */ - public final TableField NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, ""); - - /** - * The column public.t_camp.arrive. - */ - public final TableField ARRIVE = createField(DSL.name("arrive"), SQLDataType.LOCALDATETIME(6).nullable(false), this, ""); - - /** - * The column public.t_camp.depart. - */ - public final TableField DEPART = createField(DSL.name("depart"), SQLDataType.LOCALDATETIME(6).nullable(false), this, ""); - - /** - * The column public.t_camp.fk_location. - */ - public final TableField FK_LOCATION = createField(DSL.name("fk_location"), SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column public.t_camp.min_age. - */ - public final TableField MIN_AGE = createField(DSL.name("min_age"), SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column public.t_camp.max_age. - */ - public final TableField MAX_AGE = createField(DSL.name("max_age"), SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column public.t_camp.price. - */ - public final TableField PRICE = createField(DSL.name("price"), SQLDataType.CLOB, this, ""); - - /** - * The column public.t_camp.countries. - */ - public final TableField COUNTRIES = createField(DSL.name("countries"), SQLDataType.CLOB, this, ""); - - /** - * The column public.t_camp.fk_document. - */ - public final TableField FK_DOCUMENT = createField(DSL.name("fk_document"), SQLDataType.INTEGER, this, ""); - - /** - * The column public.t_camp.lock_sales. - */ - public final TableField LOCK_SALES = createField(DSL.name("lock_sales"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, ""); - - /** - * The column public.t_camp.fk_profile. - */ - public final TableField FK_PROFILE = createField(DSL.name("fk_profile"), SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column public.t_camp.beds_male. - */ - public final TableField BEDS_MALE = createField(DSL.name("beds_male"), SQLDataType.INTEGER.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.INTEGER)), this, ""); - - /** - * The column public.t_camp.beds_female. - */ - public final TableField BEDS_FEMALE = createField(DSL.name("beds_female"), SQLDataType.INTEGER.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.INTEGER)), this, ""); - - /** - * The column public.t_camp.blocked_beds_female. - */ - public final TableField BLOCKED_BEDS_FEMALE = createField(DSL.name("blocked_beds_female"), SQLDataType.INTEGER.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.INTEGER)), this, ""); - - /** - * The column public.t_camp.blocked_beds_male. - */ - public final TableField BLOCKED_BEDS_MALE = createField(DSL.name("blocked_beds_male"), SQLDataType.INTEGER.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.INTEGER)), this, ""); - - /** - * The column public.t_camp.start_booking. - */ - public final TableField START_BOOKING = createField(DSL.name("start_booking"), SQLDataType.LOCALDATETIME(6).nullable(false), this, ""); - - private TCamp(Name alias, Table aliased) { - this(alias, aliased, (Field[]) null, null); - } - - private TCamp(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); - } - - /** - * Create an aliased public.t_camp table reference - */ - public TCamp(String alias) { - this(DSL.name(alias), T_CAMP); - } - - /** - * Create an aliased public.t_camp table reference - */ - public TCamp(Name alias) { - this(alias, T_CAMP); - } - - /** - * Create a public.t_camp table reference - */ - public TCamp() { - this(DSL.name("t_camp"), null); - } - - public TCamp(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_CAMP); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TCampPath extends TCamp implements Path { - - private static final long serialVersionUID = 1L; - public TCampPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TCampPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TCampPath as(String alias) { - return new TCampPath(DSL.name(alias), this); - } - - @Override - public TCampPath as(Name alias) { - return new TCampPath(alias, this); - } - - @Override - public TCampPath as(Table alias) { - return new TCampPath(alias.getQualifiedName(), this); - } - } - - @Override - public Schema getSchema() { - return aliased() ? null : Public.PUBLIC; - } - - @Override - public Identity getIdentity() { - return (Identity) super.getIdentity(); - } - - @Override - public UniqueKey getPrimaryKey() { - return Keys.T_CAMP_PKEY; - } - - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_CAMP__T_CAMP_FK_DOCUMENT_FKEY, Keys.T_CAMP__T_CAMP_FK_LOCATION_FKEY, Keys.T_CAMP__T_CAMP_FK_PROFILE_FKEY); - } - - private transient TDocumentPath _tDocument; - - /** - * Get the implicit join path to the public.t_document table. - */ - public TDocumentPath tDocument() { - if (_tDocument == null) - _tDocument = new TDocumentPath(this, Keys.T_CAMP__T_CAMP_FK_DOCUMENT_FKEY, null); - - return _tDocument; - } - - private transient TLocationPath _tLocation; - - /** - * Get the implicit join path to the public.t_location table. - */ - public TLocationPath tLocation() { - if (_tLocation == null) - _tLocation = new TLocationPath(this, Keys.T_CAMP__T_CAMP_FK_LOCATION_FKEY, null); - - return _tLocation; - } - - private transient TProfilePath _tProfile; - - /** - * Get the implicit join path to the public.t_profile table. - */ - public TProfilePath tProfile() { - if (_tProfile == null) - _tProfile = new TProfilePath(this, Keys.T_CAMP__T_CAMP_FK_PROFILE_FKEY, null); - - return _tProfile; - } - - private transient TCampdocumentPath _tCampdocument; - - /** - * Get the implicit to-many join path to the - * public.t_campdocument table - */ - public TCampdocumentPath tCampdocument() { - if (_tCampdocument == null) - _tCampdocument = new TCampdocumentPath(this, null, Keys.T_CAMPDOCUMENT__T_CAMPDOCUMENT_FK_CAMP_FKEY.getInverseKey()); - - return _tCampdocument; - } - - private transient TCampprofilePath _tCampprofile; - - /** - * Get the implicit to-many join path to the - * public.t_campprofile table - */ - public TCampprofilePath tCampprofile() { - if (_tCampprofile == null) - _tCampprofile = new TCampprofilePath(this, null, Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_CAMP_FKEY.getInverseKey()); - - return _tCampprofile; - } - - private transient TPersonPath _tPerson; - - /** - * Get the implicit to-many join path to the public.t_person - * table - */ - public TPersonPath tPerson() { - if (_tPerson == null) - _tPerson = new TPersonPath(this, null, Keys.T_PERSON__T_PERSON_FK_CAMP_FKEY.getInverseKey()); - - return _tPerson; - } - - private transient TSalesPath _tSales; - - /** - * Get the implicit to-many join path to the public.t_sales - * table - */ - public TSalesPath tSales() { - if (_tSales == null) - _tSales = new TSalesPath(this, null, Keys.T_SALES__T_SALES_FK_CAMP_FKEY.getInverseKey()); - - return _tSales; - } - - @Override - public TCamp as(String alias) { - return new TCamp(DSL.name(alias), this); - } - - @Override - public TCamp as(Name alias) { - return new TCamp(alias, this); - } - - @Override - public TCamp as(Table alias) { - return new TCamp(alias.getQualifiedName(), this); - } - - /** - * Rename this table - */ - @Override - public TCamp rename(String name) { - return new TCamp(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public TCamp rename(Name name) { - return new TCamp(name, null); - } - - /** - * Rename this table - */ - @Override - public TCamp rename(Table name) { - return new TCamp(name.getQualifiedName(), null); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TCamp where(Condition condition) { - return new TCamp(getQualifiedName(), aliased() ? this : null, null, condition); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TCamp where(Collection conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TCamp where(Condition... conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TCamp where(Field condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TCamp where(SQL condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TCamp where(@Stringly.SQL String condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TCamp where(@Stringly.SQL String condition, Object... binds) { - return where(DSL.condition(condition, binds)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TCamp where(@Stringly.SQL String condition, QueryPart... parts) { - return where(DSL.condition(condition, parts)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TCamp whereExists(Select select) { - return where(DSL.exists(select)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TCamp whereNotExists(Select select) { - return where(DSL.notExists(select)); - } -} diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCampdocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCampdocument.java index 395d5f0..a1ff0cd 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCampdocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCampdocument.java @@ -6,8 +6,6 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; -import de.jottyfan.camporganizer.db.jooq.tables.TCamp.TCampPath; -import de.jottyfan.camporganizer.db.jooq.tables.TDocument.TDocumentPath; import de.jottyfan.camporganizer.db.jooq.tables.records.TCampdocumentRecord; import java.util.Arrays; @@ -16,14 +14,10 @@ import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -102,39 +96,6 @@ public class TCampdocument extends TableImpl { this(DSL.name("t_campdocument"), null); } - public TCampdocument(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_CAMPDOCUMENT); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TCampdocumentPath extends TCampdocument implements Path { - - private static final long serialVersionUID = 1L; - public TCampdocumentPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TCampdocumentPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TCampdocumentPath as(String alias) { - return new TCampdocumentPath(DSL.name(alias), this); - } - - @Override - public TCampdocumentPath as(Name alias) { - return new TCampdocumentPath(alias, this); - } - - @Override - public TCampdocumentPath as(Table alias) { - return new TCampdocumentPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -155,35 +116,6 @@ public class TCampdocument extends TableImpl { return Arrays.asList(Keys.T_CAMPDOCUMENT_FK_CAMP_FK_DOCUMENT_KEY); } - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_CAMPDOCUMENT__T_CAMPDOCUMENT_FK_CAMP_FKEY, Keys.T_CAMPDOCUMENT__T_CAMPDOCUMENT_FK_DOCUMENT_FKEY); - } - - private transient TCampPath _tCamp; - - /** - * Get the implicit join path to the public.t_camp table. - */ - public TCampPath tCamp() { - if (_tCamp == null) - _tCamp = new TCampPath(this, Keys.T_CAMPDOCUMENT__T_CAMPDOCUMENT_FK_CAMP_FKEY, null); - - return _tCamp; - } - - private transient TDocumentPath _tDocument; - - /** - * Get the implicit join path to the public.t_document table. - */ - public TDocumentPath tDocument() { - if (_tDocument == null) - _tDocument = new TDocumentPath(this, Keys.T_CAMPDOCUMENT__T_CAMPDOCUMENT_FK_DOCUMENT_FKEY, null); - - return _tDocument; - } - @Override public TCampdocument as(String alias) { return new TCampdocument(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCampprofile.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCampprofile.java index dbea25d..a31a703 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCampprofile.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCampprofile.java @@ -7,8 +7,6 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; import de.jottyfan.camporganizer.db.jooq.enums.EnumModule; -import de.jottyfan.camporganizer.db.jooq.tables.TCamp.TCampPath; -import de.jottyfan.camporganizer.db.jooq.tables.TProfile.TProfilePath; import de.jottyfan.camporganizer.db.jooq.tables.records.TCampprofileRecord; import java.util.Arrays; @@ -17,14 +15,10 @@ import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -108,39 +102,6 @@ public class TCampprofile extends TableImpl { this(DSL.name("t_campprofile"), null); } - public TCampprofile(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_CAMPPROFILE); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TCampprofilePath extends TCampprofile implements Path { - - private static final long serialVersionUID = 1L; - public TCampprofilePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TCampprofilePath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TCampprofilePath as(String alias) { - return new TCampprofilePath(DSL.name(alias), this); - } - - @Override - public TCampprofilePath as(Name alias) { - return new TCampprofilePath(alias, this); - } - - @Override - public TCampprofilePath as(Table alias) { - return new TCampprofilePath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -161,35 +122,6 @@ public class TCampprofile extends TableImpl { return Arrays.asList(Keys.T_CAMPPROFILE_FK_PROFILE_FK_CAMP_MODULE_KEY); } - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_CAMP_FKEY, Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_PROFILE_FKEY); - } - - private transient TCampPath _tCamp; - - /** - * Get the implicit join path to the public.t_camp table. - */ - public TCampPath tCamp() { - if (_tCamp == null) - _tCamp = new TCampPath(this, Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_CAMP_FKEY, null); - - return _tCamp; - } - - private transient TProfilePath _tProfile; - - /** - * Get the implicit join path to the public.t_profile table. - */ - public TProfilePath tProfile() { - if (_tProfile == null) - _tProfile = new TProfilePath(this, Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_PROFILE_FKEY, null); - - return _tProfile; - } - @Override public TCampprofile as(String alias) { return new TCampprofile(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TDocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TDocument.java index d4e4d10..9e2fc9e 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TDocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TDocument.java @@ -8,10 +8,6 @@ import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; import de.jottyfan.camporganizer.db.jooq.enums.EnumDocument; import de.jottyfan.camporganizer.db.jooq.enums.EnumFiletype; -import de.jottyfan.camporganizer.db.jooq.tables.TCamp.TCampPath; -import de.jottyfan.camporganizer.db.jooq.tables.TCampdocument.TCampdocumentPath; -import de.jottyfan.camporganizer.db.jooq.tables.TDocumentrole.TDocumentrolePath; -import de.jottyfan.camporganizer.db.jooq.tables.TLocation.TLocationPath; import de.jottyfan.camporganizer.db.jooq.tables.records.TDocumentRecord; import java.util.Arrays; @@ -20,14 +16,10 @@ import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -116,39 +108,6 @@ public class TDocument extends TableImpl { this(DSL.name("t_document"), null); } - public TDocument(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_DOCUMENT); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TDocumentPath extends TDocument implements Path { - - private static final long serialVersionUID = 1L; - public TDocumentPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TDocumentPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TDocumentPath as(String alias) { - return new TDocumentPath(DSL.name(alias), this); - } - - @Override - public TDocumentPath as(Name alias) { - return new TDocumentPath(alias, this); - } - - @Override - public TDocumentPath as(Table alias) { - return new TDocumentPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -169,58 +128,6 @@ public class TDocument extends TableImpl { return Arrays.asList(Keys.T_DOCUMENT_NAME_KEY); } - private transient TCampPath _tCamp; - - /** - * Get the implicit to-many join path to the public.t_camp - * table - */ - public TCampPath tCamp() { - if (_tCamp == null) - _tCamp = new TCampPath(this, null, Keys.T_CAMP__T_CAMP_FK_DOCUMENT_FKEY.getInverseKey()); - - return _tCamp; - } - - private transient TCampdocumentPath _tCampdocument; - - /** - * Get the implicit to-many join path to the - * public.t_campdocument table - */ - public TCampdocumentPath tCampdocument() { - if (_tCampdocument == null) - _tCampdocument = new TCampdocumentPath(this, null, Keys.T_CAMPDOCUMENT__T_CAMPDOCUMENT_FK_DOCUMENT_FKEY.getInverseKey()); - - return _tCampdocument; - } - - private transient TDocumentrolePath _tDocumentrole; - - /** - * Get the implicit to-many join path to the - * public.t_documentrole table - */ - public TDocumentrolePath tDocumentrole() { - if (_tDocumentrole == null) - _tDocumentrole = new TDocumentrolePath(this, null, Keys.T_DOCUMENTROLE__T_DOCUMENTROLE_FK_DOCUMENT_FKEY.getInverseKey()); - - return _tDocumentrole; - } - - private transient TLocationPath _tLocation; - - /** - * Get the implicit to-many join path to the public.t_location - * table - */ - public TLocationPath tLocation() { - if (_tLocation == null) - _tLocation = new TLocationPath(this, null, Keys.T_LOCATION__T_LOCATION_FK_DOCUMENT_FKEY.getInverseKey()); - - return _tLocation; - } - @Override public TDocument as(String alias) { return new TDocument(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TDocumentrole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TDocumentrole.java index 8ed23d1..9f636d3 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TDocumentrole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TDocumentrole.java @@ -7,7 +7,6 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; import de.jottyfan.camporganizer.db.jooq.enums.EnumCamprole; -import de.jottyfan.camporganizer.db.jooq.tables.TDocument.TDocumentPath; import de.jottyfan.camporganizer.db.jooq.tables.records.TDocumentroleRecord; import java.util.Arrays; @@ -16,14 +15,10 @@ import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -102,39 +97,6 @@ public class TDocumentrole extends TableImpl { this(DSL.name("t_documentrole"), null); } - public TDocumentrole(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_DOCUMENTROLE); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TDocumentrolePath extends TDocumentrole implements Path { - - private static final long serialVersionUID = 1L; - public TDocumentrolePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TDocumentrolePath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TDocumentrolePath as(String alias) { - return new TDocumentrolePath(DSL.name(alias), this); - } - - @Override - public TDocumentrolePath as(Name alias) { - return new TDocumentrolePath(alias, this); - } - - @Override - public TDocumentrolePath as(Table alias) { - return new TDocumentrolePath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -155,23 +117,6 @@ public class TDocumentrole extends TableImpl { return Arrays.asList(Keys.T_DOCUMENTROLE_FK_DOCUMENT_CAMPROLE_KEY); } - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_DOCUMENTROLE__T_DOCUMENTROLE_FK_DOCUMENT_FKEY); - } - - private transient TDocumentPath _tDocument; - - /** - * Get the implicit join path to the public.t_document table. - */ - public TDocumentPath tDocument() { - if (_tDocument == null) - _tDocument = new TDocumentPath(this, Keys.T_DOCUMENTROLE__T_DOCUMENTROLE_FK_DOCUMENT_FKEY, null); - - return _tDocument; - } - @Override public TDocumentrole as(String alias) { return new TDocumentrole(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TLocation.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TLocation.java index 46995a6..0e6407a 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TLocation.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TLocation.java @@ -6,24 +6,16 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; -import de.jottyfan.camporganizer.db.jooq.tables.TCamp.TCampPath; -import de.jottyfan.camporganizer.db.jooq.tables.TDocument.TDocumentPath; import de.jottyfan.camporganizer.db.jooq.tables.records.TLocationRecord; -import java.util.Arrays; import java.util.Collection; -import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -107,39 +99,6 @@ public class TLocation extends TableImpl { this(DSL.name("t_location"), null); } - public TLocation(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_LOCATION); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TLocationPath extends TLocation implements Path { - - private static final long serialVersionUID = 1L; - public TLocationPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TLocationPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TLocationPath as(String alias) { - return new TLocationPath(DSL.name(alias), this); - } - - @Override - public TLocationPath as(Name alias) { - return new TLocationPath(alias, this); - } - - @Override - public TLocationPath as(Table alias) { - return new TLocationPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -155,36 +114,6 @@ public class TLocation extends TableImpl { return Keys.T_LOCATION_PKEY; } - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_LOCATION__T_LOCATION_FK_DOCUMENT_FKEY); - } - - private transient TDocumentPath _tDocument; - - /** - * Get the implicit join path to the public.t_document table. - */ - public TDocumentPath tDocument() { - if (_tDocument == null) - _tDocument = new TDocumentPath(this, Keys.T_LOCATION__T_LOCATION_FK_DOCUMENT_FKEY, null); - - return _tDocument; - } - - private transient TCampPath _tCamp; - - /** - * Get the implicit to-many join path to the public.t_camp - * table - */ - public TCampPath tCamp() { - if (_tCamp == null) - _tCamp = new TCampPath(this, null, Keys.T_CAMP__T_CAMP_FK_LOCATION_FKEY.getInverseKey()); - - return _tCamp; - } - @Override public TLocation as(String alias) { return new TLocation(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPerson.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPerson.java index 3879ec6..5f7ce03 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPerson.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPerson.java @@ -9,9 +9,6 @@ import de.jottyfan.camporganizer.db.jooq.Public; import de.jottyfan.camporganizer.db.jooq.enums.EnumCamprole; import de.jottyfan.camporganizer.db.jooq.enums.EnumProgress; import de.jottyfan.camporganizer.db.jooq.enums.EnumSex; -import de.jottyfan.camporganizer.db.jooq.tables.TCamp.TCampPath; -import de.jottyfan.camporganizer.db.jooq.tables.TPersondocument.TPersondocumentPath; -import de.jottyfan.camporganizer.db.jooq.tables.TProfile.TProfilePath; import de.jottyfan.camporganizer.db.jooq.tables.records.TPersonRecord; import java.math.BigDecimal; @@ -23,14 +20,10 @@ import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -125,6 +118,16 @@ public class TPerson extends TableImpl { */ public final TableField FK_PROFILE = createField(DSL.name("fk_profile"), SQLDataType.INTEGER, this, ""); + /** + * The column public.t_person.accept. + */ + public final TableField ACCEPT = createField(DSL.name("accept"), SQLDataType.BOOLEAN, this, ""); + + /** + * The column public.t_person.progress. + */ + public final TableField PROGRESS = createField(DSL.name("progress"), SQLDataType.VARCHAR.defaultValue(DSL.field(DSL.raw("'requested'::enum_progress"), SQLDataType.VARCHAR)).asEnumDataType(EnumProgress.class), this, ""); + /** * The column public.t_person.created. */ @@ -160,11 +163,6 @@ public class TPerson extends TableImpl { */ public final TableField REQUIRED_PRICE = createField(DSL.name("required_price"), SQLDataType.NUMERIC(7, 2), this, ""); - /** - * The column public.t_person.progress. - */ - public final TableField PROGRESS = createField(DSL.name("progress"), SQLDataType.VARCHAR.defaultValue(DSL.field(DSL.raw("'requested'::enum_progress"), SQLDataType.VARCHAR)).asEnumDataType(EnumProgress.class), this, ""); - private TPerson(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } @@ -194,39 +192,6 @@ public class TPerson extends TableImpl { this(DSL.name("t_person"), null); } - public TPerson(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_PERSON); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TPersonPath extends TPerson implements Path { - - private static final long serialVersionUID = 1L; - public TPersonPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TPersonPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TPersonPath as(String alias) { - return new TPersonPath(DSL.name(alias), this); - } - - @Override - public TPersonPath as(Name alias) { - return new TPersonPath(alias, this); - } - - @Override - public TPersonPath as(Table alias) { - return new TPersonPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -247,62 +212,6 @@ public class TPerson extends TableImpl { return Arrays.asList(Keys.T_PERSON_FORENAME_SURNAME_BIRTHDATE_FK_CAMP_KEY); } - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_PERSON__T_PERSON_FK_CAMP_FKEY, Keys.T_PERSON__T_PERSON_FK_PROFILE_FKEY, Keys.T_PERSON__T_PERSON_FK_REGISTRATOR_FKEY); - } - - private transient TCampPath _tCamp; - - /** - * Get the implicit join path to the public.t_camp table. - */ - public TCampPath tCamp() { - if (_tCamp == null) - _tCamp = new TCampPath(this, Keys.T_PERSON__T_PERSON_FK_CAMP_FKEY, null); - - return _tCamp; - } - - private transient TProfilePath _tPersonFkProfileFkey; - - /** - * Get the implicit join path to the public.t_profile table, - * via the t_person_fk_profile_fkey key. - */ - public TProfilePath tPersonFkProfileFkey() { - if (_tPersonFkProfileFkey == null) - _tPersonFkProfileFkey = new TProfilePath(this, Keys.T_PERSON__T_PERSON_FK_PROFILE_FKEY, null); - - return _tPersonFkProfileFkey; - } - - private transient TProfilePath _tPersonFkRegistratorFkey; - - /** - * Get the implicit join path to the public.t_profile table, - * via the t_person_fk_registrator_fkey key. - */ - public TProfilePath tPersonFkRegistratorFkey() { - if (_tPersonFkRegistratorFkey == null) - _tPersonFkRegistratorFkey = new TProfilePath(this, Keys.T_PERSON__T_PERSON_FK_REGISTRATOR_FKEY, null); - - return _tPersonFkRegistratorFkey; - } - - private transient TPersondocumentPath _tPersondocument; - - /** - * Get the implicit to-many join path to the - * public.t_persondocument table - */ - public TPersondocumentPath tPersondocument() { - if (_tPersondocument == null) - _tPersondocument = new TPersondocumentPath(this, null, Keys.T_PERSONDOCUMENT__T_PERSONDOCUMENT_FK_PERSON_FKEY.getInverseKey()); - - return _tPersondocument; - } - @Override public TPerson as(String alias) { return new TPerson(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPersondocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPersondocument.java index 3a45978..6542dea 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPersondocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPersondocument.java @@ -7,7 +7,6 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; import de.jottyfan.camporganizer.db.jooq.enums.EnumFiletype; -import de.jottyfan.camporganizer.db.jooq.tables.TPerson.TPersonPath; import de.jottyfan.camporganizer.db.jooq.tables.records.TPersondocumentRecord; import java.util.Arrays; @@ -16,14 +15,10 @@ import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -112,39 +107,6 @@ public class TPersondocument extends TableImpl { this(DSL.name("t_persondocument"), null); } - public TPersondocument(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_PERSONDOCUMENT); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TPersondocumentPath extends TPersondocument implements Path { - - private static final long serialVersionUID = 1L; - public TPersondocumentPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TPersondocumentPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TPersondocumentPath as(String alias) { - return new TPersondocumentPath(DSL.name(alias), this); - } - - @Override - public TPersondocumentPath as(Name alias) { - return new TPersondocumentPath(alias, this); - } - - @Override - public TPersondocumentPath as(Table alias) { - return new TPersondocumentPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -165,23 +127,6 @@ public class TPersondocument extends TableImpl { return Arrays.asList(Keys.T_PERSONDOCUMENT_FK_PERSON_NAME_KEY); } - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_PERSONDOCUMENT__T_PERSONDOCUMENT_FK_PERSON_FKEY); - } - - private transient TPersonPath _tPerson; - - /** - * Get the implicit join path to the public.t_person table. - */ - public TPersonPath tPerson() { - if (_tPerson == null) - _tPerson = new TPersonPath(this, Keys.T_PERSONDOCUMENT__T_PERSONDOCUMENT_FK_PERSON_FKEY, null); - - return _tPerson; - } - @Override public TPersondocument as(String alias) { return new TPersondocument(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TProfile.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TProfile.java index c11d74f..50db9e6 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TProfile.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TProfile.java @@ -6,10 +6,6 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; -import de.jottyfan.camporganizer.db.jooq.tables.TCamp.TCampPath; -import de.jottyfan.camporganizer.db.jooq.tables.TCampprofile.TCampprofilePath; -import de.jottyfan.camporganizer.db.jooq.tables.TPerson.TPersonPath; -import de.jottyfan.camporganizer.db.jooq.tables.TProfilerole.TProfilerolePath; import de.jottyfan.camporganizer.db.jooq.tables.records.TProfileRecord; import java.time.LocalDateTime; @@ -19,14 +15,10 @@ import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -125,39 +117,6 @@ public class TProfile extends TableImpl { this(DSL.name("t_profile"), null); } - public TProfile(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_PROFILE); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TProfilePath extends TProfile implements Path { - - private static final long serialVersionUID = 1L; - public TProfilePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TProfilePath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TProfilePath as(String alias) { - return new TProfilePath(DSL.name(alias), this); - } - - @Override - public TProfilePath as(Name alias) { - return new TProfilePath(alias, this); - } - - @Override - public TProfilePath as(Table alias) { - return new TProfilePath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -178,71 +137,6 @@ public class TProfile extends TableImpl { return Arrays.asList(Keys.T_PROFILE_USERNAME_KEY, Keys.T_PROFILE_UUID_KEY); } - private transient TCampPath _tCamp; - - /** - * Get the implicit to-many join path to the public.t_camp - * table - */ - public TCampPath tCamp() { - if (_tCamp == null) - _tCamp = new TCampPath(this, null, Keys.T_CAMP__T_CAMP_FK_PROFILE_FKEY.getInverseKey()); - - return _tCamp; - } - - private transient TCampprofilePath _tCampprofile; - - /** - * Get the implicit to-many join path to the - * public.t_campprofile table - */ - public TCampprofilePath tCampprofile() { - if (_tCampprofile == null) - _tCampprofile = new TCampprofilePath(this, null, Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_PROFILE_FKEY.getInverseKey()); - - return _tCampprofile; - } - - private transient TPersonPath _tPersonFkProfileFkey; - - /** - * Get the implicit to-many join path to the public.t_person - * table, via the t_person_fk_profile_fkey key - */ - public TPersonPath tPersonFkProfileFkey() { - if (_tPersonFkProfileFkey == null) - _tPersonFkProfileFkey = new TPersonPath(this, null, Keys.T_PERSON__T_PERSON_FK_PROFILE_FKEY.getInverseKey()); - - return _tPersonFkProfileFkey; - } - - private transient TPersonPath _tPersonFkRegistratorFkey; - - /** - * Get the implicit to-many join path to the public.t_person - * table, via the t_person_fk_registrator_fkey key - */ - public TPersonPath tPersonFkRegistratorFkey() { - if (_tPersonFkRegistratorFkey == null) - _tPersonFkRegistratorFkey = new TPersonPath(this, null, Keys.T_PERSON__T_PERSON_FK_REGISTRATOR_FKEY.getInverseKey()); - - return _tPersonFkRegistratorFkey; - } - - private transient TProfilerolePath _tProfilerole; - - /** - * Get the implicit to-many join path to the - * public.t_profilerole table - */ - public TProfilerolePath tProfilerole() { - if (_tProfilerole == null) - _tProfilerole = new TProfilerolePath(this, null, Keys.T_PROFILEROLE__T_PROFILEROLE_FK_PROFILE_FKEY.getInverseKey()); - - return _tProfilerole; - } - @Override public TProfile as(String alias) { return new TProfile(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TProfilerole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TProfilerole.java index 81fec47..4514c25 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TProfilerole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TProfilerole.java @@ -7,7 +7,6 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; import de.jottyfan.camporganizer.db.jooq.enums.EnumRole; -import de.jottyfan.camporganizer.db.jooq.tables.TProfile.TProfilePath; import de.jottyfan.camporganizer.db.jooq.tables.records.TProfileroleRecord; import java.util.Arrays; @@ -16,13 +15,9 @@ import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -96,39 +91,6 @@ public class TProfilerole extends TableImpl { this(DSL.name("t_profilerole"), null); } - public TProfilerole(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_PROFILEROLE); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TProfilerolePath extends TProfilerole implements Path { - - private static final long serialVersionUID = 1L; - public TProfilerolePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TProfilerolePath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TProfilerolePath as(String alias) { - return new TProfilerolePath(DSL.name(alias), this); - } - - @Override - public TProfilerolePath as(Name alias) { - return new TProfilerolePath(alias, this); - } - - @Override - public TProfilerolePath as(Table alias) { - return new TProfilerolePath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -139,23 +101,6 @@ public class TProfilerole extends TableImpl { return Arrays.asList(Keys.T_PROFILEROLE_FK_PROFILE_ROLE_KEY); } - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_PROFILEROLE__T_PROFILEROLE_FK_PROFILE_FKEY); - } - - private transient TProfilePath _tProfile; - - /** - * Get the implicit join path to the public.t_profile table. - */ - public TProfilePath tProfile() { - if (_tProfile == null) - _tProfile = new TProfilePath(this, Keys.T_PROFILEROLE__T_PROFILEROLE_FK_PROFILE_FKEY, null); - - return _tProfile; - } - @Override public TProfilerole as(String alias) { return new TProfilerole(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSales.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSales.java index 255af02..abfbb63 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSales.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSales.java @@ -6,27 +6,18 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; -import de.jottyfan.camporganizer.db.jooq.tables.TCamp.TCampPath; -import de.jottyfan.camporganizer.db.jooq.tables.TSalescontent.TSalescontentPath; -import de.jottyfan.camporganizer.db.jooq.tables.TSalescontenttype.TSalescontenttypePath; import de.jottyfan.camporganizer.db.jooq.tables.records.TSalesRecord; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.Collection; -import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -145,39 +136,6 @@ public class TSales extends TableImpl { this(DSL.name("t_sales"), null); } - public TSales(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_SALES); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TSalesPath extends TSales implements Path { - - private static final long serialVersionUID = 1L; - public TSalesPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TSalesPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TSalesPath as(String alias) { - return new TSalesPath(DSL.name(alias), this); - } - - @Override - public TSalesPath as(Name alias) { - return new TSalesPath(alias, this); - } - - @Override - public TSalesPath as(Table alias) { - return new TSalesPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -193,44 +151,6 @@ public class TSales extends TableImpl { return Keys.T_SALES_PKEY; } - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_SALES__T_SALES_FK_CAMP_FKEY); - } - - private transient TCampPath _tCamp; - - /** - * Get the implicit join path to the public.t_camp table. - */ - public TCampPath tCamp() { - if (_tCamp == null) - _tCamp = new TCampPath(this, Keys.T_SALES__T_SALES_FK_CAMP_FKEY, null); - - return _tCamp; - } - - private transient TSalescontentPath _tSalescontent; - - /** - * Get the implicit to-many join path to the - * public.t_salescontent table - */ - public TSalescontentPath tSalescontent() { - if (_tSalescontent == null) - _tSalescontent = new TSalescontentPath(this, null, Keys.T_SALESCONTENT__T_SALESCONTENT_FK_SALES_FKEY.getInverseKey()); - - return _tSalescontent; - } - - /** - * Get the implicit many-to-many join path to the - * public.t_salescontenttype table - */ - public TSalescontenttypePath tSalescontenttype() { - return tSalescontent().tSalescontenttype(); - } - @Override public TSales as(String alias) { return new TSales(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSalescontent.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSalescontent.java index 648d1f7..5ca4887 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSalescontent.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSalescontent.java @@ -6,8 +6,6 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; -import de.jottyfan.camporganizer.db.jooq.tables.TSales.TSalesPath; -import de.jottyfan.camporganizer.db.jooq.tables.TSalescontenttype.TSalescontenttypePath; import de.jottyfan.camporganizer.db.jooq.tables.records.TSalescontentRecord; import java.util.Arrays; @@ -16,13 +14,9 @@ import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -96,39 +90,6 @@ public class TSalescontent extends TableImpl { this(DSL.name("t_salescontent"), null); } - public TSalescontent(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_SALESCONTENT); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TSalescontentPath extends TSalescontent implements Path { - - private static final long serialVersionUID = 1L; - public TSalescontentPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TSalescontentPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TSalescontentPath as(String alias) { - return new TSalescontentPath(DSL.name(alias), this); - } - - @Override - public TSalescontentPath as(Name alias) { - return new TSalescontentPath(alias, this); - } - - @Override - public TSalescontentPath as(Table alias) { - return new TSalescontentPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -139,36 +100,6 @@ public class TSalescontent extends TableImpl { return Arrays.asList(Keys.T_SALESCONTENT_FK_SALES_FK_SALESCONTENTTYPE_KEY); } - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_SALESCONTENT__T_SALESCONTENT_FK_SALES_FKEY, Keys.T_SALESCONTENT__T_SALESCONTENT_FK_SALESCONTENTTYPE_FKEY); - } - - private transient TSalesPath _tSales; - - /** - * Get the implicit join path to the public.t_sales table. - */ - public TSalesPath tSales() { - if (_tSales == null) - _tSales = new TSalesPath(this, Keys.T_SALESCONTENT__T_SALESCONTENT_FK_SALES_FKEY, null); - - return _tSales; - } - - private transient TSalescontenttypePath _tSalescontenttype; - - /** - * Get the implicit join path to the public.t_salescontenttype - * table. - */ - public TSalescontenttypePath tSalescontenttype() { - if (_tSalescontenttype == null) - _tSalescontenttype = new TSalescontenttypePath(this, Keys.T_SALESCONTENT__T_SALESCONTENT_FK_SALESCONTENTTYPE_FKEY, null); - - return _tSalescontenttype; - } - @Override public TSalescontent as(String alias) { return new TSalescontent(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSalescontenttype.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSalescontenttype.java index b294898..14329b5 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSalescontenttype.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TSalescontenttype.java @@ -6,21 +6,15 @@ package de.jottyfan.camporganizer.db.jooq.tables; import de.jottyfan.camporganizer.db.jooq.Keys; import de.jottyfan.camporganizer.db.jooq.Public; -import de.jottyfan.camporganizer.db.jooq.tables.TSales.TSalesPath; -import de.jottyfan.camporganizer.db.jooq.tables.TSalescontent.TSalescontentPath; import de.jottyfan.camporganizer.db.jooq.tables.records.TSalescontenttypeRecord; import java.util.Collection; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -89,39 +83,6 @@ public class TSalescontenttype extends TableImpl { this(DSL.name("t_salescontenttype"), null); } - public TSalescontenttype(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_SALESCONTENTTYPE); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TSalescontenttypePath extends TSalescontenttype implements Path { - - private static final long serialVersionUID = 1L; - public TSalescontenttypePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TSalescontenttypePath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TSalescontenttypePath as(String alias) { - return new TSalescontenttypePath(DSL.name(alias), this); - } - - @Override - public TSalescontenttypePath as(Name alias) { - return new TSalescontenttypePath(alias, this); - } - - @Override - public TSalescontenttypePath as(Table alias) { - return new TSalescontenttypePath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : Public.PUBLIC; @@ -132,27 +93,6 @@ public class TSalescontenttype extends TableImpl { return Keys.T_SALESCONTENTTYPE_PKEY; } - private transient TSalescontentPath _tSalescontent; - - /** - * Get the implicit to-many join path to the - * public.t_salescontent table - */ - public TSalescontentPath tSalescontent() { - if (_tSalescontent == null) - _tSalescontent = new TSalescontentPath(this, null, Keys.T_SALESCONTENT__T_SALESCONTENT_FK_SALESCONTENTTYPE_FKEY.getInverseKey()); - - return _tSalescontent; - } - - /** - * Get the implicit many-to-many join path to the - * public.t_sales table - */ - public TSalesPath tSales() { - return tSalescontent().tSales(); - } - @Override public TSalescontenttype as(String alias) { return new TSalescontenttype(DSL.name(alias), this); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VAdult.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VAdult.java index f69c365..a336a78 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VAdult.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VAdult.java @@ -80,11 +80,11 @@ public class VAdult extends TableImpl { private VAdult(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_adult" as SELECT age((birthdate)::timestamp with time zone) AS age, - forename, - surname, - camprole, - (age((birthdate)::timestamp with time zone) > '18 years'::interval) AS adult + create view "v_adult" as SELECT age((t_person.birthdate)::timestamp with time zone) AS age, + t_person.forename, + t_person.surname, + t_person.camprole, + (age((t_person.birthdate)::timestamp with time zone) > '18 years'::interval) AS adult FROM t_person; """), where); } diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VBudget.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VBudget.java index 9887312..e8ba39a 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VBudget.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VBudget.java @@ -79,13 +79,13 @@ public class VBudget extends TableImpl { private VBudget(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_budget" as SELECT sum(cash) AS budget, - fk_camp, - name, - location, - year + create view "v_budget" as SELECT sum(v_sales.cash) AS budget, + v_sales.fk_camp, + v_sales.name, + v_sales.location, + v_sales.year FROM v_sales - GROUP BY fk_camp, name, location, year; + GROUP BY v_sales.fk_camp, v_sales.name, v_sales.location, v_sales.year; """), where); } diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCamp.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCamp.java index ae6ea9e..488cb97 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCamp.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCamp.java @@ -93,6 +93,11 @@ public class VCamp extends TableImpl { */ public final TableField MAX_AGE = createField(DSL.name("max_age"), SQLDataType.INTEGER, this, ""); + /** + * The column public.v_camp.min_teacherage. + */ + public final TableField MIN_TEACHERAGE = createField(DSL.name("min_teacherage"), SQLDataType.INTEGER, this, ""); + /** * The column public.v_camp.url. */ @@ -181,6 +186,7 @@ public class VCamp extends TableImpl { l.name AS location_name, c.min_age, c.max_age, + COALESCE(c.min_teacherage, (c.max_age + 2)) AS min_teacherage, l.url, c.price, c.countries, diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampBudgetYear.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampBudgetYear.java index f497891..89eddb7 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampBudgetYear.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampBudgetYear.java @@ -64,11 +64,11 @@ public class VCampBudgetYear extends TableImpl { private VCampBudgetYear(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_camp_budget_year" as SELECT sum(budget) AS sum, - year + create view "v_camp_budget_year" as SELECT sum(v_camp_budget.budget) AS sum, + v_camp_budget.year FROM v_camp_budget - GROUP BY year - ORDER BY year; + GROUP BY v_camp_budget.year + ORDER BY v_camp_budget.year; """), where); } diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VDsgvoDeleteCandidate.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VDsgvoDeleteCandidate.java new file mode 100644 index 0000000..fc958a8 --- /dev/null +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VDsgvoDeleteCandidate.java @@ -0,0 +1,268 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.camporganizer.db.jooq.tables; + + +import de.jottyfan.camporganizer.db.jooq.Public; +import de.jottyfan.camporganizer.db.jooq.enums.EnumCamprole; +import de.jottyfan.camporganizer.db.jooq.tables.records.VDsgvoDeleteCandidateRecord; + +import java.util.Collection; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) +public class VDsgvoDeleteCandidate extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of public.v_dsgvo_delete_candidate + */ + public static final VDsgvoDeleteCandidate V_DSGVO_DELETE_CANDIDATE = new VDsgvoDeleteCandidate(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VDsgvoDeleteCandidateRecord.class; + } + + /** + * The column public.v_dsgvo_delete_candidate.fk_person. + */ + public final TableField FK_PERSON = createField(DSL.name("fk_person"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.v_dsgvo_delete_candidate.forename. + */ + public final TableField FORENAME = createField(DSL.name("forename"), SQLDataType.CLOB, this, ""); + + /** + * The column public.v_dsgvo_delete_candidate.surname. + */ + public final TableField SURNAME = createField(DSL.name("surname"), SQLDataType.CLOB, this, ""); + + /** + * The column public.v_dsgvo_delete_candidate.fk_camp. + */ + public final TableField FK_CAMP = createField(DSL.name("fk_camp"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.v_dsgvo_delete_candidate.age. + */ + public final TableField AGE = createField(DSL.name("age"), SQLDataType.INTERVAL, this, ""); + + /** + * The column public.v_dsgvo_delete_candidate.camprole. + */ + public final TableField CAMPROLE = createField(DSL.name("camprole"), SQLDataType.VARCHAR.asEnumDataType(EnumCamprole.class), this, ""); + + /** + * The column public.v_dsgvo_delete_candidate.name. + */ + public final TableField NAME = createField(DSL.name("name"), SQLDataType.CLOB, this, ""); + + /** + * The column public.v_dsgvo_delete_candidate.year. + */ + public final TableField YEAR = createField(DSL.name("year"), SQLDataType.DOUBLE, this, ""); + + /** + * The column public.v_dsgvo_delete_candidate.is_over. + */ + public final TableField IS_OVER = createField(DSL.name("is_over"), SQLDataType.BOOLEAN, this, ""); + + private VDsgvoDeleteCandidate(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private VDsgvoDeleteCandidate(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" + create view "v_dsgvo_delete_candidate" as SELECT p.pk AS fk_person, + p.forename, + p.surname, + p.fk_camp, + age((p.birthdate)::timestamp with time zone) AS age, + p.camprole, + c.name, + c.year, + c.is_over + FROM (t_person p + LEFT JOIN v_camp c ON ((c.pk = p.fk_camp))) + WHERE (age((p.birthdate)::timestamp with time zone) > '21 years'::interval); + """), where); + } + + /** + * Create an aliased public.v_dsgvo_delete_candidate table + * reference + */ + public VDsgvoDeleteCandidate(String alias) { + this(DSL.name(alias), V_DSGVO_DELETE_CANDIDATE); + } + + /** + * Create an aliased public.v_dsgvo_delete_candidate table + * reference + */ + public VDsgvoDeleteCandidate(Name alias) { + this(alias, V_DSGVO_DELETE_CANDIDATE); + } + + /** + * Create a public.v_dsgvo_delete_candidate table reference + */ + public VDsgvoDeleteCandidate() { + this(DSL.name("v_dsgvo_delete_candidate"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Public.PUBLIC; + } + + @Override + public VDsgvoDeleteCandidate as(String alias) { + return new VDsgvoDeleteCandidate(DSL.name(alias), this); + } + + @Override + public VDsgvoDeleteCandidate as(Name alias) { + return new VDsgvoDeleteCandidate(alias, this); + } + + @Override + public VDsgvoDeleteCandidate as(Table alias) { + return new VDsgvoDeleteCandidate(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public VDsgvoDeleteCandidate rename(String name) { + return new VDsgvoDeleteCandidate(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VDsgvoDeleteCandidate rename(Name name) { + return new VDsgvoDeleteCandidate(name, null); + } + + /** + * Rename this table + */ + @Override + public VDsgvoDeleteCandidate rename(Table name) { + return new VDsgvoDeleteCandidate(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public VDsgvoDeleteCandidate where(Condition condition) { + return new VDsgvoDeleteCandidate(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public VDsgvoDeleteCandidate where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public VDsgvoDeleteCandidate where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public VDsgvoDeleteCandidate where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public VDsgvoDeleteCandidate where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public VDsgvoDeleteCandidate where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public VDsgvoDeleteCandidate where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public VDsgvoDeleteCandidate where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public VDsgvoDeleteCandidate whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public VDsgvoDeleteCandidate whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VVersion.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VVersion.java index 3880225..0921b6a 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VVersion.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VVersion.java @@ -58,7 +58,7 @@ public class VVersion extends TableImpl { private VVersion(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_version" as SELECT '2024.03.16'::text AS version; + create view "v_version" as SELECT '2025-04-23'::text AS version; """), where); } diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCamp.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCamp.java index ecb73c8..95ccd97 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCamp.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCamp.java @@ -30,9 +30,10 @@ public class TCamp implements Serializable { private final Integer fkProfile; private final Integer bedsMale; private final Integer bedsFemale; - private final Integer blockedBedsFemale; private final Integer blockedBedsMale; + private final Integer blockedBedsFemale; private final LocalDateTime startBooking; + private final Integer minTeacherage; public TCamp(TCamp value) { this.pk = value.pk; @@ -49,9 +50,10 @@ public class TCamp implements Serializable { this.fkProfile = value.fkProfile; this.bedsMale = value.bedsMale; this.bedsFemale = value.bedsFemale; - this.blockedBedsFemale = value.blockedBedsFemale; this.blockedBedsMale = value.blockedBedsMale; + this.blockedBedsFemale = value.blockedBedsFemale; this.startBooking = value.startBooking; + this.minTeacherage = value.minTeacherage; } public TCamp( @@ -69,9 +71,10 @@ public class TCamp implements Serializable { Integer fkProfile, Integer bedsMale, Integer bedsFemale, - Integer blockedBedsFemale, Integer blockedBedsMale, - LocalDateTime startBooking + Integer blockedBedsFemale, + LocalDateTime startBooking, + Integer minTeacherage ) { this.pk = pk; this.name = name; @@ -87,9 +90,10 @@ public class TCamp implements Serializable { this.fkProfile = fkProfile; this.bedsMale = bedsMale; this.bedsFemale = bedsFemale; - this.blockedBedsFemale = blockedBedsFemale; this.blockedBedsMale = blockedBedsMale; + this.blockedBedsFemale = blockedBedsFemale; this.startBooking = startBooking; + this.minTeacherage = minTeacherage; } /** @@ -190,13 +194,6 @@ public class TCamp implements Serializable { return this.bedsFemale; } - /** - * Getter for public.t_camp.blocked_beds_female. - */ - public Integer getBlockedBedsFemale() { - return this.blockedBedsFemale; - } - /** * Getter for public.t_camp.blocked_beds_male. */ @@ -204,6 +201,13 @@ public class TCamp implements Serializable { return this.blockedBedsMale; } + /** + * Getter for public.t_camp.blocked_beds_female. + */ + public Integer getBlockedBedsFemale() { + return this.blockedBedsFemale; + } + /** * Getter for public.t_camp.start_booking. */ @@ -211,6 +215,13 @@ public class TCamp implements Serializable { return this.startBooking; } + /** + * Getter for public.t_camp.min_teacherage. + */ + public Integer getMinTeacherage() { + return this.minTeacherage; + } + @Override public boolean equals(Object obj) { if (this == obj) @@ -304,24 +315,30 @@ public class TCamp implements Serializable { } else if (!this.bedsFemale.equals(other.bedsFemale)) return false; - if (this.blockedBedsFemale == null) { - if (other.blockedBedsFemale != null) - return false; - } - else if (!this.blockedBedsFemale.equals(other.blockedBedsFemale)) - return false; if (this.blockedBedsMale == null) { if (other.blockedBedsMale != null) return false; } else if (!this.blockedBedsMale.equals(other.blockedBedsMale)) return false; + if (this.blockedBedsFemale == null) { + if (other.blockedBedsFemale != null) + return false; + } + else if (!this.blockedBedsFemale.equals(other.blockedBedsFemale)) + return false; if (this.startBooking == null) { if (other.startBooking != null) return false; } else if (!this.startBooking.equals(other.startBooking)) return false; + if (this.minTeacherage == null) { + if (other.minTeacherage != null) + return false; + } + else if (!this.minTeacherage.equals(other.minTeacherage)) + return false; return true; } @@ -343,9 +360,10 @@ public class TCamp implements Serializable { result = prime * result + ((this.fkProfile == null) ? 0 : this.fkProfile.hashCode()); result = prime * result + ((this.bedsMale == null) ? 0 : this.bedsMale.hashCode()); result = prime * result + ((this.bedsFemale == null) ? 0 : this.bedsFemale.hashCode()); - result = prime * result + ((this.blockedBedsFemale == null) ? 0 : this.blockedBedsFemale.hashCode()); result = prime * result + ((this.blockedBedsMale == null) ? 0 : this.blockedBedsMale.hashCode()); + result = prime * result + ((this.blockedBedsFemale == null) ? 0 : this.blockedBedsFemale.hashCode()); result = prime * result + ((this.startBooking == null) ? 0 : this.startBooking.hashCode()); + result = prime * result + ((this.minTeacherage == null) ? 0 : this.minTeacherage.hashCode()); return result; } @@ -367,9 +385,10 @@ public class TCamp implements Serializable { sb.append(", ").append(fkProfile); sb.append(", ").append(bedsMale); sb.append(", ").append(bedsFemale); - sb.append(", ").append(blockedBedsFemale); sb.append(", ").append(blockedBedsMale); + sb.append(", ").append(blockedBedsFemale); sb.append(", ").append(startBooking); + sb.append(", ").append(minTeacherage); sb.append(")"); return sb.toString(); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPerson.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPerson.java index 9ebcb1c..62e4aa9 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPerson.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPerson.java @@ -34,6 +34,8 @@ public class TPerson implements Serializable { private final String email; private final Integer fkCamp; private final Integer fkProfile; + private final Boolean accept; + private final EnumProgress progress; private final LocalDateTime created; private final EnumSex sex; private final Integer fkRegistrator; @@ -41,7 +43,6 @@ public class TPerson implements Serializable { private final String comment; private final Boolean consentCatalogPhoto; private final BigDecimal requiredPrice; - private final EnumProgress progress; public TPerson(TPerson value) { this.pk = value.pk; @@ -56,6 +57,8 @@ public class TPerson implements Serializable { this.email = value.email; this.fkCamp = value.fkCamp; this.fkProfile = value.fkProfile; + this.accept = value.accept; + this.progress = value.progress; this.created = value.created; this.sex = value.sex; this.fkRegistrator = value.fkRegistrator; @@ -63,7 +66,6 @@ public class TPerson implements Serializable { this.comment = value.comment; this.consentCatalogPhoto = value.consentCatalogPhoto; this.requiredPrice = value.requiredPrice; - this.progress = value.progress; } public TPerson( @@ -79,14 +81,15 @@ public class TPerson implements Serializable { String email, Integer fkCamp, Integer fkProfile, + Boolean accept, + EnumProgress progress, LocalDateTime created, EnumSex sex, Integer fkRegistrator, BigDecimal paid, String comment, Boolean consentCatalogPhoto, - BigDecimal requiredPrice, - EnumProgress progress + BigDecimal requiredPrice ) { this.pk = pk; this.forename = forename; @@ -100,6 +103,8 @@ public class TPerson implements Serializable { this.email = email; this.fkCamp = fkCamp; this.fkProfile = fkProfile; + this.accept = accept; + this.progress = progress; this.created = created; this.sex = sex; this.fkRegistrator = fkRegistrator; @@ -107,7 +112,6 @@ public class TPerson implements Serializable { this.comment = comment; this.consentCatalogPhoto = consentCatalogPhoto; this.requiredPrice = requiredPrice; - this.progress = progress; } /** @@ -194,6 +198,20 @@ public class TPerson implements Serializable { return this.fkProfile; } + /** + * Getter for public.t_person.accept. + */ + public Boolean getAccept() { + return this.accept; + } + + /** + * Getter for public.t_person.progress. + */ + public EnumProgress getProgress() { + return this.progress; + } + /** * Getter for public.t_person.created. */ @@ -243,13 +261,6 @@ public class TPerson implements Serializable { return this.requiredPrice; } - /** - * Getter for public.t_person.progress. - */ - public EnumProgress getProgress() { - return this.progress; - } - @Override public boolean equals(Object obj) { if (this == obj) @@ -331,6 +342,18 @@ public class TPerson implements Serializable { } else if (!this.fkProfile.equals(other.fkProfile)) return false; + if (this.accept == null) { + if (other.accept != null) + return false; + } + else if (!this.accept.equals(other.accept)) + return false; + if (this.progress == null) { + if (other.progress != null) + return false; + } + else if (!this.progress.equals(other.progress)) + return false; if (this.created == null) { if (other.created != null) return false; @@ -373,12 +396,6 @@ public class TPerson implements Serializable { } else if (!this.requiredPrice.equals(other.requiredPrice)) return false; - if (this.progress == null) { - if (other.progress != null) - return false; - } - else if (!this.progress.equals(other.progress)) - return false; return true; } @@ -398,6 +415,8 @@ public class TPerson implements Serializable { result = prime * result + ((this.email == null) ? 0 : this.email.hashCode()); result = prime * result + ((this.fkCamp == null) ? 0 : this.fkCamp.hashCode()); result = prime * result + ((this.fkProfile == null) ? 0 : this.fkProfile.hashCode()); + result = prime * result + ((this.accept == null) ? 0 : this.accept.hashCode()); + result = prime * result + ((this.progress == null) ? 0 : this.progress.hashCode()); result = prime * result + ((this.created == null) ? 0 : this.created.hashCode()); result = prime * result + ((this.sex == null) ? 0 : this.sex.hashCode()); result = prime * result + ((this.fkRegistrator == null) ? 0 : this.fkRegistrator.hashCode()); @@ -405,7 +424,6 @@ public class TPerson implements Serializable { result = prime * result + ((this.comment == null) ? 0 : this.comment.hashCode()); result = prime * result + ((this.consentCatalogPhoto == null) ? 0 : this.consentCatalogPhoto.hashCode()); result = prime * result + ((this.requiredPrice == null) ? 0 : this.requiredPrice.hashCode()); - result = prime * result + ((this.progress == null) ? 0 : this.progress.hashCode()); return result; } @@ -425,6 +443,8 @@ public class TPerson implements Serializable { sb.append(", ").append(email); sb.append(", ").append(fkCamp); sb.append(", ").append(fkProfile); + sb.append(", ").append(accept); + sb.append(", ").append(progress); sb.append(", ").append(created); sb.append(", ").append(sex); sb.append(", ").append(fkRegistrator); @@ -432,7 +452,6 @@ public class TPerson implements Serializable { sb.append(", ").append(comment); sb.append(", ").append(consentCatalogPhoto); sb.append(", ").append(requiredPrice); - sb.append(", ").append(progress); sb.append(")"); return sb.toString(); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCamp.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCamp.java index 4bed2a5..f05f12c 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCamp.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCamp.java @@ -25,6 +25,7 @@ public class VCamp implements Serializable { private final String locationName; private final Integer minAge; private final Integer maxAge; + private final Integer minTeacherage; private final String url; private final String price; private final String countries; @@ -48,6 +49,7 @@ public class VCamp implements Serializable { this.locationName = value.locationName; this.minAge = value.minAge; this.maxAge = value.maxAge; + this.minTeacherage = value.minTeacherage; this.url = value.url; this.price = value.price; this.countries = value.countries; @@ -72,6 +74,7 @@ public class VCamp implements Serializable { String locationName, Integer minAge, Integer maxAge, + Integer minTeacherage, String url, String price, String countries, @@ -94,6 +97,7 @@ public class VCamp implements Serializable { this.locationName = locationName; this.minAge = minAge; this.maxAge = maxAge; + this.minTeacherage = minTeacherage; this.url = url; this.price = price; this.countries = countries; @@ -171,6 +175,13 @@ public class VCamp implements Serializable { return this.maxAge; } + /** + * Getter for public.v_camp.min_teacherage. + */ + public Integer getMinTeacherage() { + return this.minTeacherage; + } + /** * Getter for public.v_camp.url. */ @@ -318,6 +329,12 @@ public class VCamp implements Serializable { } else if (!this.maxAge.equals(other.maxAge)) return false; + if (this.minTeacherage == null) { + if (other.minTeacherage != null) + return false; + } + else if (!this.minTeacherage.equals(other.minTeacherage)) + return false; if (this.url == null) { if (other.url != null) return false; @@ -406,6 +423,7 @@ public class VCamp implements Serializable { result = prime * result + ((this.locationName == null) ? 0 : this.locationName.hashCode()); result = prime * result + ((this.minAge == null) ? 0 : this.minAge.hashCode()); result = prime * result + ((this.maxAge == null) ? 0 : this.maxAge.hashCode()); + result = prime * result + ((this.minTeacherage == null) ? 0 : this.minTeacherage.hashCode()); result = prime * result + ((this.url == null) ? 0 : this.url.hashCode()); result = prime * result + ((this.price == null) ? 0 : this.price.hashCode()); result = prime * result + ((this.countries == null) ? 0 : this.countries.hashCode()); @@ -434,6 +452,7 @@ public class VCamp implements Serializable { sb.append(", ").append(locationName); sb.append(", ").append(minAge); sb.append(", ").append(maxAge); + sb.append(", ").append(minTeacherage); sb.append(", ").append(url); sb.append(", ").append(price); sb.append(", ").append(countries); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VDsgvoDeleteCandidate.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VDsgvoDeleteCandidate.java new file mode 100644 index 0000000..7d568ee --- /dev/null +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VDsgvoDeleteCandidate.java @@ -0,0 +1,228 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.camporganizer.db.jooq.tables.pojos; + + +import de.jottyfan.camporganizer.db.jooq.enums.EnumCamprole; + +import java.io.Serializable; + +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) +public class VDsgvoDeleteCandidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private final Integer fkPerson; + private final String forename; + private final String surname; + private final Integer fkCamp; + private final YearToSecond age; + private final EnumCamprole camprole; + private final String name; + private final Double year; + private final Boolean isOver; + + public VDsgvoDeleteCandidate(VDsgvoDeleteCandidate value) { + this.fkPerson = value.fkPerson; + this.forename = value.forename; + this.surname = value.surname; + this.fkCamp = value.fkCamp; + this.age = value.age; + this.camprole = value.camprole; + this.name = value.name; + this.year = value.year; + this.isOver = value.isOver; + } + + public VDsgvoDeleteCandidate( + Integer fkPerson, + String forename, + String surname, + Integer fkCamp, + YearToSecond age, + EnumCamprole camprole, + String name, + Double year, + Boolean isOver + ) { + this.fkPerson = fkPerson; + this.forename = forename; + this.surname = surname; + this.fkCamp = fkCamp; + this.age = age; + this.camprole = camprole; + this.name = name; + this.year = year; + this.isOver = isOver; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.fk_person. + */ + public Integer getFkPerson() { + return this.fkPerson; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.forename. + */ + public String getForename() { + return this.forename; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.surname. + */ + public String getSurname() { + return this.surname; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.fk_camp. + */ + public Integer getFkCamp() { + return this.fkCamp; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.age. + */ + public YearToSecond getAge() { + return this.age; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.camprole. + */ + public EnumCamprole getCamprole() { + return this.camprole; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.name. + */ + public String getName() { + return this.name; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.year. + */ + public Double getYear() { + return this.year; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.is_over. + */ + public Boolean getIsOver() { + return this.isOver; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final VDsgvoDeleteCandidate other = (VDsgvoDeleteCandidate) obj; + if (this.fkPerson == null) { + if (other.fkPerson != null) + return false; + } + else if (!this.fkPerson.equals(other.fkPerson)) + return false; + if (this.forename == null) { + if (other.forename != null) + return false; + } + else if (!this.forename.equals(other.forename)) + return false; + if (this.surname == null) { + if (other.surname != null) + return false; + } + else if (!this.surname.equals(other.surname)) + return false; + if (this.fkCamp == null) { + if (other.fkCamp != null) + return false; + } + else if (!this.fkCamp.equals(other.fkCamp)) + return false; + if (this.age == null) { + if (other.age != null) + return false; + } + else if (!this.age.equals(other.age)) + return false; + if (this.camprole == null) { + if (other.camprole != null) + return false; + } + else if (!this.camprole.equals(other.camprole)) + return false; + if (this.name == null) { + if (other.name != null) + return false; + } + else if (!this.name.equals(other.name)) + return false; + if (this.year == null) { + if (other.year != null) + return false; + } + else if (!this.year.equals(other.year)) + return false; + if (this.isOver == null) { + if (other.isOver != null) + return false; + } + else if (!this.isOver.equals(other.isOver)) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((this.fkPerson == null) ? 0 : this.fkPerson.hashCode()); + result = prime * result + ((this.forename == null) ? 0 : this.forename.hashCode()); + result = prime * result + ((this.surname == null) ? 0 : this.surname.hashCode()); + result = prime * result + ((this.fkCamp == null) ? 0 : this.fkCamp.hashCode()); + result = prime * result + ((this.age == null) ? 0 : this.age.hashCode()); + result = prime * result + ((this.camprole == null) ? 0 : this.camprole.hashCode()); + result = prime * result + ((this.name == null) ? 0 : this.name.hashCode()); + result = prime * result + ((this.year == null) ? 0 : this.year.hashCode()); + result = prime * result + ((this.isOver == null) ? 0 : this.isOver.hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("VDsgvoDeleteCandidate ("); + + sb.append(fkPerson); + sb.append(", ").append(forename); + sb.append(", ").append(surname); + sb.append(", ").append(fkCamp); + sb.append(", ").append(age); + sb.append(", ").append(camprole); + sb.append(", ").append(name); + sb.append(", ").append(year); + sb.append(", ").append(isOver); + + sb.append(")"); + return sb.toString(); + } +} diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampRecord.java index 52f3182..0c7664f 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampRecord.java @@ -230,26 +230,11 @@ public class TCampRecord extends UpdatableRecordImpl { return (Integer) get(13); } - /** - * Setter for public.t_camp.blocked_beds_female. - */ - public TCampRecord setBlockedBedsFemale(Integer value) { - set(14, value); - return this; - } - - /** - * Getter for public.t_camp.blocked_beds_female. - */ - public Integer getBlockedBedsFemale() { - return (Integer) get(14); - } - /** * Setter for public.t_camp.blocked_beds_male. */ public TCampRecord setBlockedBedsMale(Integer value) { - set(15, value); + set(14, value); return this; } @@ -257,6 +242,21 @@ public class TCampRecord extends UpdatableRecordImpl { * Getter for public.t_camp.blocked_beds_male. */ public Integer getBlockedBedsMale() { + return (Integer) get(14); + } + + /** + * Setter for public.t_camp.blocked_beds_female. + */ + public TCampRecord setBlockedBedsFemale(Integer value) { + set(15, value); + return this; + } + + /** + * Getter for public.t_camp.blocked_beds_female. + */ + public Integer getBlockedBedsFemale() { return (Integer) get(15); } @@ -275,6 +275,21 @@ public class TCampRecord extends UpdatableRecordImpl { return (LocalDateTime) get(16); } + /** + * Setter for public.t_camp.min_teacherage. + */ + public TCampRecord setMinTeacherage(Integer value) { + set(17, value); + return this; + } + + /** + * Getter for public.t_camp.min_teacherage. + */ + public Integer getMinTeacherage() { + return (Integer) get(17); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -298,7 +313,7 @@ public class TCampRecord extends UpdatableRecordImpl { /** * Create a detached, initialised TCampRecord */ - public TCampRecord(Integer pk, String name, LocalDateTime arrive, LocalDateTime depart, Integer fkLocation, Integer minAge, Integer maxAge, String price, String countries, Integer fkDocument, Boolean lockSales, Integer fkProfile, Integer bedsMale, Integer bedsFemale, Integer blockedBedsFemale, Integer blockedBedsMale, LocalDateTime startBooking) { + public TCampRecord(Integer pk, String name, LocalDateTime arrive, LocalDateTime depart, Integer fkLocation, Integer minAge, Integer maxAge, String price, String countries, Integer fkDocument, Boolean lockSales, Integer fkProfile, Integer bedsMale, Integer bedsFemale, Integer blockedBedsMale, Integer blockedBedsFemale, LocalDateTime startBooking, Integer minTeacherage) { super(TCamp.T_CAMP); setPk(pk); @@ -315,9 +330,10 @@ public class TCampRecord extends UpdatableRecordImpl { setFkProfile(fkProfile); setBedsMale(bedsMale); setBedsFemale(bedsFemale); - setBlockedBedsFemale(blockedBedsFemale); setBlockedBedsMale(blockedBedsMale); + setBlockedBedsFemale(blockedBedsFemale); setStartBooking(startBooking); + setMinTeacherage(minTeacherage); resetChangedOnNotNull(); } @@ -342,9 +358,10 @@ public class TCampRecord extends UpdatableRecordImpl { setFkProfile(value.getFkProfile()); setBedsMale(value.getBedsMale()); setBedsFemale(value.getBedsFemale()); - setBlockedBedsFemale(value.getBlockedBedsFemale()); setBlockedBedsMale(value.getBlockedBedsMale()); + setBlockedBedsFemale(value.getBlockedBedsFemale()); setStartBooking(value.getStartBooking()); + setMinTeacherage(value.getMinTeacherage()); resetChangedOnNotNull(); } } diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersonRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersonRecord.java index 7e32fde..7f7c478 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersonRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersonRecord.java @@ -206,115 +206,25 @@ public class TPersonRecord extends UpdatableRecordImpl { } /** - * Setter for public.t_person.created. + * Setter for public.t_person.accept. */ - public TPersonRecord setCreated(LocalDateTime value) { + public TPersonRecord setAccept(Boolean value) { set(12, value); return this; } /** - * Getter for public.t_person.created. + * Getter for public.t_person.accept. */ - public LocalDateTime getCreated() { - return (LocalDateTime) get(12); - } - - /** - * Setter for public.t_person.sex. - */ - public TPersonRecord setSex(EnumSex value) { - set(13, value); - return this; - } - - /** - * Getter for public.t_person.sex. - */ - public EnumSex getSex() { - return (EnumSex) get(13); - } - - /** - * Setter for public.t_person.fk_registrator. - */ - public TPersonRecord setFkRegistrator(Integer value) { - set(14, value); - return this; - } - - /** - * Getter for public.t_person.fk_registrator. - */ - public Integer getFkRegistrator() { - return (Integer) get(14); - } - - /** - * Setter for public.t_person.paid. - */ - public TPersonRecord setPaid(BigDecimal value) { - set(15, value); - return this; - } - - /** - * Getter for public.t_person.paid. - */ - public BigDecimal getPaid() { - return (BigDecimal) get(15); - } - - /** - * Setter for public.t_person.comment. - */ - public TPersonRecord setComment(String value) { - set(16, value); - return this; - } - - /** - * Getter for public.t_person.comment. - */ - public String getComment() { - return (String) get(16); - } - - /** - * Setter for public.t_person.consent_catalog_photo. - */ - public TPersonRecord setConsentCatalogPhoto(Boolean value) { - set(17, value); - return this; - } - - /** - * Getter for public.t_person.consent_catalog_photo. - */ - public Boolean getConsentCatalogPhoto() { - return (Boolean) get(17); - } - - /** - * Setter for public.t_person.required_price. - */ - public TPersonRecord setRequiredPrice(BigDecimal value) { - set(18, value); - return this; - } - - /** - * Getter for public.t_person.required_price. - */ - public BigDecimal getRequiredPrice() { - return (BigDecimal) get(18); + public Boolean getAccept() { + return (Boolean) get(12); } /** * Setter for public.t_person.progress. */ public TPersonRecord setProgress(EnumProgress value) { - set(19, value); + set(13, value); return this; } @@ -322,7 +232,112 @@ public class TPersonRecord extends UpdatableRecordImpl { * Getter for public.t_person.progress. */ public EnumProgress getProgress() { - return (EnumProgress) get(19); + return (EnumProgress) get(13); + } + + /** + * Setter for public.t_person.created. + */ + public TPersonRecord setCreated(LocalDateTime value) { + set(14, value); + return this; + } + + /** + * Getter for public.t_person.created. + */ + public LocalDateTime getCreated() { + return (LocalDateTime) get(14); + } + + /** + * Setter for public.t_person.sex. + */ + public TPersonRecord setSex(EnumSex value) { + set(15, value); + return this; + } + + /** + * Getter for public.t_person.sex. + */ + public EnumSex getSex() { + return (EnumSex) get(15); + } + + /** + * Setter for public.t_person.fk_registrator. + */ + public TPersonRecord setFkRegistrator(Integer value) { + set(16, value); + return this; + } + + /** + * Getter for public.t_person.fk_registrator. + */ + public Integer getFkRegistrator() { + return (Integer) get(16); + } + + /** + * Setter for public.t_person.paid. + */ + public TPersonRecord setPaid(BigDecimal value) { + set(17, value); + return this; + } + + /** + * Getter for public.t_person.paid. + */ + public BigDecimal getPaid() { + return (BigDecimal) get(17); + } + + /** + * Setter for public.t_person.comment. + */ + public TPersonRecord setComment(String value) { + set(18, value); + return this; + } + + /** + * Getter for public.t_person.comment. + */ + public String getComment() { + return (String) get(18); + } + + /** + * Setter for public.t_person.consent_catalog_photo. + */ + public TPersonRecord setConsentCatalogPhoto(Boolean value) { + set(19, value); + return this; + } + + /** + * Getter for public.t_person.consent_catalog_photo. + */ + public Boolean getConsentCatalogPhoto() { + return (Boolean) get(19); + } + + /** + * Setter for public.t_person.required_price. + */ + public TPersonRecord setRequiredPrice(BigDecimal value) { + set(20, value); + return this; + } + + /** + * Getter for public.t_person.required_price. + */ + public BigDecimal getRequiredPrice() { + return (BigDecimal) get(20); } // ------------------------------------------------------------------------- @@ -348,7 +363,7 @@ public class TPersonRecord extends UpdatableRecordImpl { /** * Create a detached, initialised TPersonRecord */ - public TPersonRecord(Integer pk, String forename, String surname, String street, String zip, String city, String phone, LocalDate birthdate, EnumCamprole camprole, String email, Integer fkCamp, Integer fkProfile, LocalDateTime created, EnumSex sex, Integer fkRegistrator, BigDecimal paid, String comment, Boolean consentCatalogPhoto, BigDecimal requiredPrice, EnumProgress progress) { + public TPersonRecord(Integer pk, String forename, String surname, String street, String zip, String city, String phone, LocalDate birthdate, EnumCamprole camprole, String email, Integer fkCamp, Integer fkProfile, Boolean accept, EnumProgress progress, LocalDateTime created, EnumSex sex, Integer fkRegistrator, BigDecimal paid, String comment, Boolean consentCatalogPhoto, BigDecimal requiredPrice) { super(TPerson.T_PERSON); setPk(pk); @@ -363,6 +378,8 @@ public class TPersonRecord extends UpdatableRecordImpl { setEmail(email); setFkCamp(fkCamp); setFkProfile(fkProfile); + setAccept(accept); + setProgress(progress); setCreated(created); setSex(sex); setFkRegistrator(fkRegistrator); @@ -370,7 +387,6 @@ public class TPersonRecord extends UpdatableRecordImpl { setComment(comment); setConsentCatalogPhoto(consentCatalogPhoto); setRequiredPrice(requiredPrice); - setProgress(progress); resetChangedOnNotNull(); } @@ -393,6 +409,8 @@ public class TPersonRecord extends UpdatableRecordImpl { setEmail(value.getEmail()); setFkCamp(value.getFkCamp()); setFkProfile(value.getFkProfile()); + setAccept(value.getAccept()); + setProgress(value.getProgress()); setCreated(value.getCreated()); setSex(value.getSex()); setFkRegistrator(value.getFkRegistrator()); @@ -400,7 +418,6 @@ public class TPersonRecord extends UpdatableRecordImpl { setComment(value.getComment()); setConsentCatalogPhoto(value.getConsentCatalogPhoto()); setRequiredPrice(value.getRequiredPrice()); - setProgress(value.getProgress()); resetChangedOnNotNull(); } } diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampRecord.java index 05ea24d..d9565e8 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampRecord.java @@ -154,11 +154,26 @@ public class VCampRecord extends TableRecordImpl { return (Integer) get(8); } + /** + * Setter for public.v_camp.min_teacherage. + */ + public VCampRecord setMinTeacherage(Integer value) { + set(9, value); + return this; + } + + /** + * Getter for public.v_camp.min_teacherage. + */ + public Integer getMinTeacherage() { + return (Integer) get(9); + } + /** * Setter for public.v_camp.url. */ public VCampRecord setUrl(String value) { - set(9, value); + set(10, value); return this; } @@ -166,14 +181,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.url. */ public String getUrl() { - return (String) get(9); + return (String) get(10); } /** * Setter for public.v_camp.price. */ public VCampRecord setPrice(String value) { - set(10, value); + set(11, value); return this; } @@ -181,14 +196,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.price. */ public String getPrice() { - return (String) get(10); + return (String) get(11); } /** * Setter for public.v_camp.countries. */ public VCampRecord setCountries(String value) { - set(11, value); + set(12, value); return this; } @@ -196,14 +211,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.countries. */ public String getCountries() { - return (String) get(11); + return (String) get(12); } /** * Setter for public.v_camp.fk_document. */ public VCampRecord setFkDocument(Integer value) { - set(12, value); + set(13, value); return this; } @@ -211,14 +226,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.fk_document. */ public Integer getFkDocument() { - return (Integer) get(12); + return (Integer) get(13); } /** * Setter for public.v_camp.beds_female. */ public VCampRecord setBedsFemale(Integer value) { - set(13, value); + set(14, value); return this; } @@ -226,14 +241,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.beds_female. */ public Integer getBedsFemale() { - return (Integer) get(13); + return (Integer) get(14); } /** * Setter for public.v_camp.beds_male. */ public VCampRecord setBedsMale(Integer value) { - set(14, value); + set(15, value); return this; } @@ -241,14 +256,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.beds_male. */ public Integer getBedsMale() { - return (Integer) get(14); + return (Integer) get(15); } /** * Setter for public.v_camp.blocked_beds_female. */ public VCampRecord setBlockedBedsFemale(Integer value) { - set(15, value); + set(16, value); return this; } @@ -256,14 +271,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.blocked_beds_female. */ public Integer getBlockedBedsFemale() { - return (Integer) get(15); + return (Integer) get(16); } /** * Setter for public.v_camp.blocked_beds_male. */ public VCampRecord setBlockedBedsMale(Integer value) { - set(16, value); + set(17, value); return this; } @@ -271,14 +286,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.blocked_beds_male. */ public Integer getBlockedBedsMale() { - return (Integer) get(16); + return (Integer) get(17); } /** * Setter for public.v_camp.used_beds_male. */ public VCampRecord setUsedBedsMale(Long value) { - set(17, value); + set(18, value); return this; } @@ -286,14 +301,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.used_beds_male. */ public Long getUsedBedsMale() { - return (Long) get(17); + return (Long) get(18); } /** * Setter for public.v_camp.used_beds_female. */ public VCampRecord setUsedBedsFemale(Long value) { - set(18, value); + set(19, value); return this; } @@ -301,14 +316,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.used_beds_female. */ public Long getUsedBedsFemale() { - return (Long) get(18); + return (Long) get(19); } /** * Setter for public.v_camp.start_booking. */ public VCampRecord setStartBooking(LocalDateTime value) { - set(19, value); + set(20, value); return this; } @@ -316,14 +331,14 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.start_booking. */ public LocalDateTime getStartBooking() { - return (LocalDateTime) get(19); + return (LocalDateTime) get(20); } /** * Setter for public.v_camp.booking_has_started. */ public VCampRecord setBookingHasStarted(Boolean value) { - set(20, value); + set(21, value); return this; } @@ -331,7 +346,7 @@ public class VCampRecord extends TableRecordImpl { * Getter for public.v_camp.booking_has_started. */ public Boolean getBookingHasStarted() { - return (Boolean) get(20); + return (Boolean) get(21); } // ------------------------------------------------------------------------- @@ -348,7 +363,7 @@ public class VCampRecord extends TableRecordImpl { /** * Create a detached, initialised VCampRecord */ - public VCampRecord(Integer pk, Boolean isOver, String name, LocalDateTime arrive, LocalDateTime depart, Double year, String locationName, Integer minAge, Integer maxAge, String url, String price, String countries, Integer fkDocument, Integer bedsFemale, Integer bedsMale, Integer blockedBedsFemale, Integer blockedBedsMale, Long usedBedsMale, Long usedBedsFemale, LocalDateTime startBooking, Boolean bookingHasStarted) { + public VCampRecord(Integer pk, Boolean isOver, String name, LocalDateTime arrive, LocalDateTime depart, Double year, String locationName, Integer minAge, Integer maxAge, Integer minTeacherage, String url, String price, String countries, Integer fkDocument, Integer bedsFemale, Integer bedsMale, Integer blockedBedsFemale, Integer blockedBedsMale, Long usedBedsMale, Long usedBedsFemale, LocalDateTime startBooking, Boolean bookingHasStarted) { super(VCamp.V_CAMP); setPk(pk); @@ -360,6 +375,7 @@ public class VCampRecord extends TableRecordImpl { setLocationName(locationName); setMinAge(minAge); setMaxAge(maxAge); + setMinTeacherage(minTeacherage); setUrl(url); setPrice(price); setCountries(countries); @@ -391,6 +407,7 @@ public class VCampRecord extends TableRecordImpl { setLocationName(value.getLocationName()); setMinAge(value.getMinAge()); setMaxAge(value.getMaxAge()); + setMinTeacherage(value.getMinTeacherage()); setUrl(value.getUrl()); setPrice(value.getPrice()); setCountries(value.getCountries()); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VDsgvoDeleteCandidateRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VDsgvoDeleteCandidateRecord.java new file mode 100644 index 0000000..6bcbb6e --- /dev/null +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VDsgvoDeleteCandidateRecord.java @@ -0,0 +1,205 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.camporganizer.db.jooq.tables.records; + + +import de.jottyfan.camporganizer.db.jooq.enums.EnumCamprole; +import de.jottyfan.camporganizer.db.jooq.tables.VDsgvoDeleteCandidate; + +import org.jooq.impl.TableRecordImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) +public class VDsgvoDeleteCandidateRecord extends TableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for public.v_dsgvo_delete_candidate.fk_person. + */ + public VDsgvoDeleteCandidateRecord setFkPerson(Integer value) { + set(0, value); + return this; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.fk_person. + */ + public Integer getFkPerson() { + return (Integer) get(0); + } + + /** + * Setter for public.v_dsgvo_delete_candidate.forename. + */ + public VDsgvoDeleteCandidateRecord setForename(String value) { + set(1, value); + return this; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.forename. + */ + public String getForename() { + return (String) get(1); + } + + /** + * Setter for public.v_dsgvo_delete_candidate.surname. + */ + public VDsgvoDeleteCandidateRecord setSurname(String value) { + set(2, value); + return this; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.surname. + */ + public String getSurname() { + return (String) get(2); + } + + /** + * Setter for public.v_dsgvo_delete_candidate.fk_camp. + */ + public VDsgvoDeleteCandidateRecord setFkCamp(Integer value) { + set(3, value); + return this; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.fk_camp. + */ + public Integer getFkCamp() { + return (Integer) get(3); + } + + /** + * Setter for public.v_dsgvo_delete_candidate.age. + */ + public VDsgvoDeleteCandidateRecord setAge(YearToSecond value) { + set(4, value); + return this; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.age. + */ + public YearToSecond getAge() { + return (YearToSecond) get(4); + } + + /** + * Setter for public.v_dsgvo_delete_candidate.camprole. + */ + public VDsgvoDeleteCandidateRecord setCamprole(EnumCamprole value) { + set(5, value); + return this; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.camprole. + */ + public EnumCamprole getCamprole() { + return (EnumCamprole) get(5); + } + + /** + * Setter for public.v_dsgvo_delete_candidate.name. + */ + public VDsgvoDeleteCandidateRecord setName(String value) { + set(6, value); + return this; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.name. + */ + public String getName() { + return (String) get(6); + } + + /** + * Setter for public.v_dsgvo_delete_candidate.year. + */ + public VDsgvoDeleteCandidateRecord setYear(Double value) { + set(7, value); + return this; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.year. + */ + public Double getYear() { + return (Double) get(7); + } + + /** + * Setter for public.v_dsgvo_delete_candidate.is_over. + */ + public VDsgvoDeleteCandidateRecord setIsOver(Boolean value) { + set(8, value); + return this; + } + + /** + * Getter for public.v_dsgvo_delete_candidate.is_over. + */ + public Boolean getIsOver() { + return (Boolean) get(8); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VDsgvoDeleteCandidateRecord + */ + public VDsgvoDeleteCandidateRecord() { + super(VDsgvoDeleteCandidate.V_DSGVO_DELETE_CANDIDATE); + } + + /** + * Create a detached, initialised VDsgvoDeleteCandidateRecord + */ + public VDsgvoDeleteCandidateRecord(Integer fkPerson, String forename, String surname, Integer fkCamp, YearToSecond age, EnumCamprole camprole, String name, Double year, Boolean isOver) { + super(VDsgvoDeleteCandidate.V_DSGVO_DELETE_CANDIDATE); + + setFkPerson(fkPerson); + setForename(forename); + setSurname(surname); + setFkCamp(fkCamp); + setAge(age); + setCamprole(camprole); + setName(name); + setYear(year); + setIsOver(isOver); + resetChangedOnNotNull(); + } + + /** + * Create a detached, initialised VDsgvoDeleteCandidateRecord + */ + public VDsgvoDeleteCandidateRecord(de.jottyfan.camporganizer.db.jooq.tables.pojos.VDsgvoDeleteCandidate value) { + super(VDsgvoDeleteCandidate.V_DSGVO_DELETE_CANDIDATE); + + if (value != null) { + setFkPerson(value.getFkPerson()); + setForename(value.getForename()); + setSurname(value.getSurname()); + setFkCamp(value.getFkCamp()); + setAge(value.getAge()); + setCamprole(value.getCamprole()); + setName(value.getName()); + setYear(value.getYear()); + setIsOver(value.getIsOver()); + resetChangedOnNotNull(); + } + } +} diff --git a/src/main/resources/tables/camp.sql b/src/main/resources/tables/camp.sql index 26237d9..ae46b83 100644 --- a/src/main/resources/tables/camp.sql +++ b/src/main/resources/tables/camp.sql @@ -6,6 +6,7 @@ create table public.t_camp ( fk_location integer not null references public.t_location(pk), min_age integer not null, max_age integer not null, + min_teacherage integer, price text, countries text, fk_document integer references public.t_document(pk), diff --git a/src/main/resources/upgrade_2025-04-23.sql b/src/main/resources/upgrade_2025-04-23.sql new file mode 100644 index 0000000..26fb7a9 --- /dev/null +++ b/src/main/resources/upgrade_2025-04-23.sql @@ -0,0 +1,11 @@ +begin; + drop view public.v_dsgvo_delete_candidate; + drop view public.v_camp; + + alter table t_camp add column min_teacherage integer; + + \i views/camp.sql + \i views/dsgvo_delete_candidate.sql + \i views/version.sql + +commit; diff --git a/src/main/resources/views/camp.sql b/src/main/resources/views/camp.sql index 6ace84c..d42e62d 100644 --- a/src/main/resources/views/camp.sql +++ b/src/main/resources/views/camp.sql @@ -22,6 +22,7 @@ with female(used, fk_camp) as ( l.name as location_name, c.min_age, c.max_age, + coalesce(c.min_teacherage, c.max_age + 2) as min_teacherage, l.url, c.price, c.countries, diff --git a/src/main/resources/views/version.sql b/src/main/resources/views/version.sql index b805d54..7edd3f1 100644 --- a/src/main/resources/views/version.sql +++ b/src/main/resources/views/version.sql @@ -1,2 +1,2 @@ create or replace view public.v_version as - select '2024.10.24'::text as version; + select '2025-04-23'::text as version;