diff --git a/.gradle/7.3/checksums/checksums.lock b/.gradle/7.3/checksums/checksums.lock deleted file mode 100644 index 029697c..0000000 Binary files a/.gradle/7.3/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/7.3/checksums/md5-checksums.bin b/.gradle/7.3/checksums/md5-checksums.bin deleted file mode 100644 index ab296f1..0000000 Binary files a/.gradle/7.3/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/7.3/checksums/sha1-checksums.bin b/.gradle/7.3/checksums/sha1-checksums.bin deleted file mode 100644 index 5917779..0000000 Binary files a/.gradle/7.3/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/7.3/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.3/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index 1606748..0000000 Binary files a/.gradle/7.3/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/.gradle/7.3/dependencies-accessors/gc.properties b/.gradle/7.3/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/7.3/executionHistory/executionHistory.bin b/.gradle/7.3/executionHistory/executionHistory.bin deleted file mode 100644 index 02a8ce2..0000000 Binary files a/.gradle/7.3/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/7.3/executionHistory/executionHistory.lock b/.gradle/7.3/executionHistory/executionHistory.lock deleted file mode 100644 index 0658bbe..0000000 Binary files a/.gradle/7.3/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/7.3/fileChanges/last-build.bin b/.gradle/7.3/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/7.3/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/7.3/fileHashes/fileHashes.bin b/.gradle/7.3/fileHashes/fileHashes.bin deleted file mode 100644 index 480331a..0000000 Binary files a/.gradle/7.3/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/7.3/fileHashes/fileHashes.lock b/.gradle/7.3/fileHashes/fileHashes.lock deleted file mode 100644 index 559cd50..0000000 Binary files a/.gradle/7.3/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/7.3/gc.properties b/.gradle/7.3/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index c9d4924..7ccad6e 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index e7a357a..73d7c25 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Thu Jun 30 21:33:48 CEST 2022 -gradle.version=7.3 +#Wed Oct 23 21:32:16 CEST 2024 +gradle.version=8.10.2 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index b50821b..0000000 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock deleted file mode 100644 index 690e993..0000000 Binary files a/.gradle/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/configuration-cache/gc.properties b/.gradle/configuration-cache/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe deleted file mode 100644 index 7492e7c..0000000 Binary files a/.gradle/file-system.probe and /dev/null differ diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 626e0e1..e613e89 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,28 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error diff --git a/.settings/org.eclipse.jdt.launching.prefs b/.settings/org.eclipse.jdt.launching.prefs new file mode 100644 index 0000000..f8a131b --- /dev/null +++ b/.settings/org.eclipse.jdt.launching.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning +org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning diff --git a/build.gradle b/build.gradle index be5a5cb..c81d311 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'java' apply plugin: 'maven-publish' group = 'de.jottyfan' -version = '2024.03.16c' +version = '2024.10.23' description = """COJooq""" @@ -47,7 +47,7 @@ dependencies { import org.jooq.meta.jaxb.Logging jooq { - version = '3.19.6' + version = '3.19.14' edition = nu.studer.gradle.jooq.JooqEdition.OSS configurations { camporganizer { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fbce071..18330fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/DefaultCatalog.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/DefaultCatalog.java index 9a2605a..65c455d 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/DefaultCatalog.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/DefaultCatalog.java @@ -15,7 +15,7 @@ import org.jooq.impl.CatalogImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class DefaultCatalog extends CatalogImpl { private static final long serialVersionUID = 1L; 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 1855e74..0663ad1 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/Keys.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/Keys.java @@ -44,7 +44,7 @@ import org.jooq.impl.Internal; * A class modelling foreign key relationships and constraints of tables in * public. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class Keys { // ------------------------------------------------------------------------- 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 2f4e67f..5782bc1 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/Public.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/Public.java @@ -20,13 +20,11 @@ import de.jottyfan.camporganizer.db.jooq.tables.TSalescontent; import de.jottyfan.camporganizer.db.jooq.tables.TSalescontenttype; import de.jottyfan.camporganizer.db.jooq.tables.VAdult; import de.jottyfan.camporganizer.db.jooq.tables.VBudget; -import de.jottyfan.camporganizer.db.jooq.tables.VCamp; import de.jottyfan.camporganizer.db.jooq.tables.VCampBudget; 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; @@ -45,7 +43,7 @@ import org.jooq.impl.SchemaImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class Public extends SchemaImpl { private static final long serialVersionUID = 1L; @@ -135,11 +133,6 @@ public class Public extends SchemaImpl { */ public final VBudget V_BUDGET = VBudget.V_BUDGET; - /** - * The table public.v_camp. - */ - public final VCamp V_CAMP = VCamp.V_CAMP; - /** * The table public.v_camp_budget. */ @@ -165,11 +158,6 @@ 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,13 +220,11 @@ public class Public extends SchemaImpl { TSalescontenttype.T_SALESCONTENTTYPE, VAdult.V_ADULT, VBudget.V_BUDGET, - VCamp.V_CAMP, VCampBudget.V_CAMP_BUDGET, VCampBudgetYear.V_CAMP_BUDGET_YEAR, 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 2a115ac..cfcab25 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/Tables.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/Tables.java @@ -20,13 +20,11 @@ import de.jottyfan.camporganizer.db.jooq.tables.TSalescontent; import de.jottyfan.camporganizer.db.jooq.tables.TSalescontenttype; import de.jottyfan.camporganizer.db.jooq.tables.VAdult; import de.jottyfan.camporganizer.db.jooq.tables.VBudget; -import de.jottyfan.camporganizer.db.jooq.tables.VCamp; import de.jottyfan.camporganizer.db.jooq.tables.VCampBudget; 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; @@ -38,7 +36,7 @@ import de.jottyfan.camporganizer.db.jooq.tables.VVersion; /** * Convenience access to all tables in public. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class Tables { /** @@ -121,11 +119,6 @@ public class Tables { */ public static final VBudget V_BUDGET = VBudget.V_BUDGET; - /** - * The table public.v_camp. - */ - public static final VCamp V_CAMP = VCamp.V_CAMP; - /** * The table public.v_camp_budget. */ @@ -151,11 +144,6 @@ 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/enums/EnumCamprole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumCamprole.java index 58ffb96..f53a80c 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumCamprole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumCamprole.java @@ -14,7 +14,7 @@ import org.jooq.Schema; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public enum EnumCamprole implements EnumType { student("student"), diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumDocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumDocument.java index 44af647..5813b12 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumDocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumDocument.java @@ -14,7 +14,7 @@ import org.jooq.Schema; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public enum EnumDocument implements EnumType { camppass("camppass"), diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumFiletype.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumFiletype.java index c4101e5..5ca5cd8 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumFiletype.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumFiletype.java @@ -14,7 +14,7 @@ import org.jooq.Schema; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public enum EnumFiletype implements EnumType { pdf("pdf"), diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumModule.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumModule.java index d99c9c2..d16308a 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumModule.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumModule.java @@ -14,7 +14,7 @@ import org.jooq.Schema; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public enum EnumModule implements EnumType { registration("registration"), diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumProgress.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumProgress.java new file mode 100644 index 0000000..f4af64e --- /dev/null +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumProgress.java @@ -0,0 +1,62 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.camporganizer.db.jooq.enums; + + +import de.jottyfan.camporganizer.db.jooq.Public; + +import org.jooq.Catalog; +import org.jooq.EnumType; +import org.jooq.Schema; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) +public enum EnumProgress implements EnumType { + + requested("requested"), + + approved("approved"), + + rejected("rejected"), + + revoked("revoked"); + + private final String literal; + + private EnumProgress(String literal) { + this.literal = literal; + } + + @Override + public Catalog getCatalog() { + return getSchema().getCatalog(); + } + + @Override + public Schema getSchema() { + return Public.PUBLIC; + } + + @Override + public String getName() { + return "enum_progress"; + } + + @Override + public String getLiteral() { + return literal; + } + + /** + * Lookup a value of this EnumType by its literal. Returns + * null, if no such value could be found, see {@link + * EnumType#lookupLiteral(Class, String)}. + */ + public static EnumProgress lookupLiteral(String literal) { + return EnumType.lookupLiteral(EnumProgress.class, literal); + } +} diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumRole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumRole.java index 4c19535..d1c38b6 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumRole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumRole.java @@ -14,7 +14,7 @@ import org.jooq.Schema; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public enum EnumRole implements EnumType { subscriber("subscriber"), diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumSex.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumSex.java index d3770f3..090906b 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumSex.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumSex.java @@ -14,7 +14,7 @@ import org.jooq.Schema; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public enum EnumSex implements EnumType { male("male"), 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 index 0ea9d68..eaf99bc 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCamp.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TCamp.java @@ -46,7 +46,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TCamp extends TableImpl { private static final long serialVersionUID = 1L; @@ -228,19 +228,7 @@ public class TCamp extends TableImpl { @Override public List> getReferences() { - return Arrays.asList(Keys.T_CAMP__T_CAMP_FK_LOCATION_FKEY, Keys.T_CAMP__T_CAMP_FK_DOCUMENT_FKEY, Keys.T_CAMP__T_CAMP_FK_PROFILE_FKEY); - } - - 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; + 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; @@ -255,6 +243,18 @@ public class TCamp extends TableImpl { 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; /** 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 56b2a84..395d5f0 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 @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TCampdocument extends TableImpl { private static final long serialVersionUID = 1L; 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 3f3c636..dbea25d 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 @@ -41,7 +41,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TCampprofile extends TableImpl { private static final long serialVersionUID = 1L; @@ -163,19 +163,7 @@ public class TCampprofile extends TableImpl { @Override public List> getReferences() { - return Arrays.asList(Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_PROFILE_FKEY, Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_CAMP_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_CAMPPROFILE__T_CAMPPROFILE_FK_PROFILE_FKEY, null); - - return _tProfile; + return Arrays.asList(Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_CAMP_FKEY, Keys.T_CAMPPROFILE__T_CAMPPROFILE_FK_PROFILE_FKEY); } private transient TCampPath _tCamp; @@ -190,6 +178,18 @@ public class TCampprofile extends TableImpl { 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 c915959..d4e4d10 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 @@ -44,7 +44,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TDocument extends TableImpl { private static final long serialVersionUID = 1L; 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 2ac5616..8ed23d1 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 @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TDocumentrole extends TableImpl { private static final long serialVersionUID = 1L; 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 bfd32a2..46995a6 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 @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TLocation extends TableImpl { private static final long serialVersionUID = 1L; 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 9604844..3879ec6 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 @@ -7,6 +7,7 @@ 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.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; @@ -46,7 +47,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TPerson extends TableImpl { private static final long serialVersionUID = 1L; @@ -124,11 +125,6 @@ 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.created. */ @@ -164,6 +160,11 @@ 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); } 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 c4cb495..3a45978 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 @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TPersondocument extends TableImpl { private static final long serialVersionUID = 1L; 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 ad7c9e6..c11d74f 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 @@ -43,7 +43,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TProfile extends TableImpl { private static final long serialVersionUID = 1L; 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 dfecb3a..81fec47 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 @@ -39,7 +39,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TProfilerole extends TableImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TRss.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TRss.java index ed3c08f..bd1368b 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TRss.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TRss.java @@ -33,7 +33,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TRss extends TableImpl { private static final long serialVersionUID = 1L; 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 1d4e3c9..255af02 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 @@ -43,7 +43,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TSales extends TableImpl { private static final long serialVersionUID = 1L; 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 3f54a33..648d1f7 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 @@ -39,7 +39,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TSalescontent extends TableImpl { private static final long serialVersionUID = 1L; 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 f1e2548..b294898 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 @@ -37,7 +37,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TSalescontenttype extends TableImpl { private static final long serialVersionUID = 1L; 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 22051c2..f69c365 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 @@ -31,7 +31,7 @@ import org.jooq.types.YearToSecond; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VAdult extends TableImpl { private static final long serialVersionUID = 1L; 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 48c90fc..9887312 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 @@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VBudget extends TableImpl { private static final long serialVersionUID = 1L; 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 deleted file mode 100644 index 1bb62d6..0000000 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCamp.java +++ /dev/null @@ -1,351 +0,0 @@ -/* - * 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.tables.records.VCampRecord; - -import java.time.LocalDateTime; -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; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class VCamp extends TableImpl { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of public.v_camp - */ - public static final VCamp V_CAMP = new VCamp(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return VCampRecord.class; - } - - /** - * The column public.v_camp.pk. - */ - public final TableField PK = createField(DSL.name("pk"), SQLDataType.INTEGER, this, ""); - - /** - * The column public.v_camp.is_over. - */ - public final TableField IS_OVER = createField(DSL.name("is_over"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column public.v_camp.name. - */ - public final TableField NAME = createField(DSL.name("name"), SQLDataType.CLOB, this, ""); - - /** - * The column public.v_camp.arrive. - */ - public final TableField ARRIVE = createField(DSL.name("arrive"), SQLDataType.LOCALDATETIME(6), this, ""); - - /** - * The column public.v_camp.depart. - */ - public final TableField DEPART = createField(DSL.name("depart"), SQLDataType.LOCALDATETIME(6), this, ""); - - /** - * The column public.v_camp.year. - */ - public final TableField YEAR = createField(DSL.name("year"), SQLDataType.DOUBLE, this, ""); - - /** - * The column public.v_camp.location_name. - */ - public final TableField LOCATION_NAME = createField(DSL.name("location_name"), SQLDataType.CLOB, this, ""); - - /** - * The column public.v_camp.min_age. - */ - public final TableField MIN_AGE = createField(DSL.name("min_age"), SQLDataType.INTEGER, this, ""); - - /** - * The column public.v_camp.max_age. - */ - public final TableField MAX_AGE = createField(DSL.name("max_age"), SQLDataType.INTEGER, this, ""); - - /** - * The column public.v_camp.url. - */ - public final TableField URL = createField(DSL.name("url"), SQLDataType.CLOB, this, ""); - - /** - * The column public.v_camp.price. - */ - public final TableField PRICE = createField(DSL.name("price"), SQLDataType.CLOB, this, ""); - - /** - * The column public.v_camp.countries. - */ - public final TableField COUNTRIES = createField(DSL.name("countries"), SQLDataType.CLOB, this, ""); - - /** - * The column public.v_camp.fk_document. - */ - public final TableField FK_DOCUMENT = createField(DSL.name("fk_document"), SQLDataType.INTEGER, this, ""); - - /** - * The column public.v_camp.beds_female. - */ - public final TableField BEDS_FEMALE = createField(DSL.name("beds_female"), SQLDataType.INTEGER, this, ""); - - /** - * The column public.v_camp.beds_male. - */ - public final TableField BEDS_MALE = createField(DSL.name("beds_male"), SQLDataType.INTEGER, this, ""); - - /** - * The column public.v_camp.blocked_beds_female. - */ - public final TableField BLOCKED_BEDS_FEMALE = createField(DSL.name("blocked_beds_female"), SQLDataType.INTEGER, this, ""); - - /** - * The column public.v_camp.blocked_beds_male. - */ - public final TableField BLOCKED_BEDS_MALE = createField(DSL.name("blocked_beds_male"), SQLDataType.INTEGER, this, ""); - - /** - * The column public.v_camp.used_beds_male. - */ - public final TableField USED_BEDS_MALE = createField(DSL.name("used_beds_male"), SQLDataType.BIGINT, this, ""); - - /** - * The column public.v_camp.used_beds_female. - */ - public final TableField USED_BEDS_FEMALE = createField(DSL.name("used_beds_female"), SQLDataType.BIGINT, this, ""); - - /** - * The column public.v_camp.start_booking. - */ - public final TableField START_BOOKING = createField(DSL.name("start_booking"), SQLDataType.LOCALDATETIME(6), this, ""); - - /** - * The column public.v_camp.booking_has_started. - */ - public final TableField BOOKING_HAS_STARTED = createField(DSL.name("booking_has_started"), SQLDataType.BOOLEAN, this, ""); - - private VCamp(Name alias, Table aliased) { - this(alias, aliased, (Field[]) null, null); - } - - private VCamp(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_camp" as WITH female(used, fk_camp) AS ( - SELECT count(1) AS count, - t_person.fk_camp - FROM t_person - WHERE ((t_person.accept = true) AND (t_person.sex = 'female'::enum_sex) AND (t_person.camprole = 'student'::enum_camprole)) - GROUP BY t_person.fk_camp - ), male(used, fk_camp) AS ( - SELECT count(1) AS count, - t_person.fk_camp - FROM t_person - WHERE ((t_person.accept = true) AND (t_person.sex = 'male'::enum_sex) AND (t_person.camprole = 'student'::enum_camprole)) - GROUP BY t_person.fk_camp - ) - SELECT c.pk, - (c.depart < now()) AS is_over, - c.name, - c.arrive, - c.depart, - date_part('isoyear'::text, c.arrive) AS year, - l.name AS location_name, - c.min_age, - c.max_age, - l.url, - c.price, - c.countries, - c.fk_document, - c.beds_female, - c.beds_male, - c.blocked_beds_female, - c.blocked_beds_male, - COALESCE(male.used, (0)::bigint) AS used_beds_male, - COALESCE(female.used, (0)::bigint) AS used_beds_female, - c.start_booking, - (c.start_booking < now()) AS booking_has_started - FROM (((t_camp c - LEFT JOIN t_location l ON ((c.fk_location = l.pk))) - LEFT JOIN male ON ((male.fk_camp = c.pk))) - LEFT JOIN female ON ((female.fk_camp = c.pk))); - """), where); - } - - /** - * Create an aliased public.v_camp table reference - */ - public VCamp(String alias) { - this(DSL.name(alias), V_CAMP); - } - - /** - * Create an aliased public.v_camp table reference - */ - public VCamp(Name alias) { - this(alias, V_CAMP); - } - - /** - * Create a public.v_camp table reference - */ - public VCamp() { - this(DSL.name("v_camp"), null); - } - - @Override - public Schema getSchema() { - return aliased() ? null : Public.PUBLIC; - } - - @Override - public VCamp as(String alias) { - return new VCamp(DSL.name(alias), this); - } - - @Override - public VCamp as(Name alias) { - return new VCamp(alias, this); - } - - @Override - public VCamp as(Table alias) { - return new VCamp(alias.getQualifiedName(), this); - } - - /** - * Rename this table - */ - @Override - public VCamp rename(String name) { - return new VCamp(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public VCamp rename(Name name) { - return new VCamp(name, null); - } - - /** - * Rename this table - */ - @Override - public VCamp rename(Table name) { - return new VCamp(name.getQualifiedName(), null); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VCamp where(Condition condition) { - return new VCamp(getQualifiedName(), aliased() ? this : null, null, condition); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VCamp where(Collection conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VCamp where(Condition... conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VCamp where(Field condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VCamp where(SQL condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VCamp where(@Stringly.SQL String condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VCamp where(@Stringly.SQL String condition, Object... binds) { - return where(DSL.condition(condition, binds)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VCamp where(@Stringly.SQL String condition, QueryPart... parts) { - return where(DSL.condition(condition, parts)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VCamp whereExists(Select select) { - return where(DSL.exists(select)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VCamp whereNotExists(Select select) { - return where(DSL.notExists(select)); - } -} diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampBudget.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampBudget.java index 3bcd653..2064d42 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampBudget.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampBudget.java @@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCampBudget extends TableImpl { private static final long serialVersionUID = 1L; 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 1288a79..f497891 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 @@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCampBudgetYear extends TableImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampdocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampdocument.java index 2ececd7..8023b8f 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampdocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCampdocument.java @@ -32,7 +32,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCampdocument extends TableImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCamprole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCamprole.java index 8c3d16d..4da6ef4 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCamprole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VCamprole.java @@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCamprole extends TableImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VDocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VDocument.java index 520824d..6fa9f27 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VDocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VDocument.java @@ -31,7 +31,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VDocument extends TableImpl { private static final long serialVersionUID = 1L; 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 deleted file mode 100644 index f2cf758..0000000 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VDsgvoDeleteCandidate.java +++ /dev/null @@ -1,268 +0,0 @@ -/* - * 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" }) -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/VFeeder.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VFeeder.java index ad81122..153da80 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VFeeder.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VFeeder.java @@ -31,7 +31,7 @@ import org.jooq.types.YearToSecond; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VFeeder extends TableImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VProfile.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VProfile.java index a961e60..624deb0 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VProfile.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VProfile.java @@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VProfile extends TableImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VRegistration.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VRegistration.java index 996c61c..455e41c 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VRegistration.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VRegistration.java @@ -31,7 +31,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VRegistration extends TableImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VRole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VRole.java index 7a8e8fe..c1a0068 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VRole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VRole.java @@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VRole extends TableImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VSales.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VSales.java index 082600e..fb0869c 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VSales.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/VSales.java @@ -31,7 +31,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VSales extends TableImpl { private static final long serialVersionUID = 1L; 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 926d708..3880225 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 @@ -29,7 +29,7 @@ import org.jooq.impl.TableImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VVersion extends TableImpl { private static final long serialVersionUID = 1L; 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 8956ea6..ecb73c8 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 @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TCamp implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCampdocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCampdocument.java index caad4ad..f0d90bd 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCampdocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCampdocument.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TCampdocument implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCampprofile.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCampprofile.java index 316fffb..4d8b23d 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCampprofile.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TCampprofile.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TCampprofile implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TDocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TDocument.java index 13b077e..cc797c1 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TDocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TDocument.java @@ -13,7 +13,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TDocument implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TDocumentrole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TDocumentrole.java index 039582c..c14f0a1 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TDocumentrole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TDocumentrole.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TDocumentrole implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TLocation.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TLocation.java index aaaf0c3..536a313 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TLocation.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TLocation.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TLocation implements Serializable { private static final long serialVersionUID = 1L; 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 0c04cc8..9ebcb1c 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 @@ -5,6 +5,7 @@ package de.jottyfan.camporganizer.db.jooq.tables.pojos; 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 java.io.Serializable; @@ -16,7 +17,7 @@ import java.time.LocalDateTime; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TPerson implements Serializable { private static final long serialVersionUID = 1L; @@ -33,7 +34,6 @@ public class TPerson implements Serializable { private final String email; private final Integer fkCamp; private final Integer fkProfile; - private final Boolean accept; private final LocalDateTime created; private final EnumSex sex; private final Integer fkRegistrator; @@ -41,6 +41,7 @@ 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; @@ -55,7 +56,6 @@ public class TPerson implements Serializable { this.email = value.email; this.fkCamp = value.fkCamp; this.fkProfile = value.fkProfile; - this.accept = value.accept; this.created = value.created; this.sex = value.sex; this.fkRegistrator = value.fkRegistrator; @@ -63,6 +63,7 @@ public class TPerson implements Serializable { this.comment = value.comment; this.consentCatalogPhoto = value.consentCatalogPhoto; this.requiredPrice = value.requiredPrice; + this.progress = value.progress; } public TPerson( @@ -78,14 +79,14 @@ public class TPerson implements Serializable { String email, Integer fkCamp, Integer fkProfile, - Boolean accept, LocalDateTime created, EnumSex sex, Integer fkRegistrator, BigDecimal paid, String comment, Boolean consentCatalogPhoto, - BigDecimal requiredPrice + BigDecimal requiredPrice, + EnumProgress progress ) { this.pk = pk; this.forename = forename; @@ -99,7 +100,6 @@ public class TPerson implements Serializable { this.email = email; this.fkCamp = fkCamp; this.fkProfile = fkProfile; - this.accept = accept; this.created = created; this.sex = sex; this.fkRegistrator = fkRegistrator; @@ -107,6 +107,7 @@ public class TPerson implements Serializable { this.comment = comment; this.consentCatalogPhoto = consentCatalogPhoto; this.requiredPrice = requiredPrice; + this.progress = progress; } /** @@ -193,13 +194,6 @@ 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.created. */ @@ -249,6 +243,13 @@ 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) @@ -330,12 +331,6 @@ 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.created == null) { if (other.created != null) return false; @@ -378,6 +373,12 @@ 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; } @@ -397,7 +398,6 @@ 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.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,6 +405,7 @@ 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; } @@ -424,7 +425,6 @@ public class TPerson implements Serializable { sb.append(", ").append(email); sb.append(", ").append(fkCamp); sb.append(", ").append(fkProfile); - sb.append(", ").append(accept); sb.append(", ").append(created); sb.append(", ").append(sex); sb.append(", ").append(fkRegistrator); @@ -432,6 +432,7 @@ 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/TPersondocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPersondocument.java index e2ce822..5812822 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPersondocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPersondocument.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TPersondocument implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TProfile.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TProfile.java index 35851ea..17d0a2c 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TProfile.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TProfile.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TProfile implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TProfilerole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TProfilerole.java index 8e7f76c..273b44c 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TProfilerole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TProfilerole.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TProfilerole implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TRss.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TRss.java index 28b8c46..23ccb6a 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TRss.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TRss.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TRss implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSales.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSales.java index 97f8480..86b6022 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSales.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSales.java @@ -13,7 +13,7 @@ import java.util.Arrays; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TSales implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSalescontent.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSalescontent.java index f97f48d..ff55fc3 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSalescontent.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSalescontent.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TSalescontent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSalescontenttype.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSalescontenttype.java index 4adb2bb..c281d59 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSalescontenttype.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TSalescontenttype.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TSalescontenttype implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VAdult.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VAdult.java index bc8bceb..6f141b6 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VAdult.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VAdult.java @@ -14,7 +14,7 @@ import org.jooq.types.YearToSecond; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VAdult implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VBudget.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VBudget.java index a04a599..a17750d 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VBudget.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VBudget.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VBudget implements Serializable { private static final long serialVersionUID = 1L; 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 deleted file mode 100644 index 29d3c13..0000000 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCamp.java +++ /dev/null @@ -1,453 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.camporganizer.db.jooq.tables.pojos; - - -import java.io.Serializable; -import java.time.LocalDateTime; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class VCamp implements Serializable { - - private static final long serialVersionUID = 1L; - - private final Integer pk; - private final Boolean isOver; - private final String name; - private final LocalDateTime arrive; - private final LocalDateTime depart; - private final Double year; - private final String locationName; - private final Integer minAge; - private final Integer maxAge; - private final String url; - private final String price; - private final String countries; - private final Integer fkDocument; - private final Integer bedsFemale; - private final Integer bedsMale; - private final Integer blockedBedsFemale; - private final Integer blockedBedsMale; - private final Long usedBedsMale; - private final Long usedBedsFemale; - private final LocalDateTime startBooking; - private final Boolean bookingHasStarted; - - public VCamp(VCamp value) { - this.pk = value.pk; - this.isOver = value.isOver; - this.name = value.name; - this.arrive = value.arrive; - this.depart = value.depart; - this.year = value.year; - this.locationName = value.locationName; - this.minAge = value.minAge; - this.maxAge = value.maxAge; - this.url = value.url; - this.price = value.price; - this.countries = value.countries; - this.fkDocument = value.fkDocument; - this.bedsFemale = value.bedsFemale; - this.bedsMale = value.bedsMale; - this.blockedBedsFemale = value.blockedBedsFemale; - this.blockedBedsMale = value.blockedBedsMale; - this.usedBedsMale = value.usedBedsMale; - this.usedBedsFemale = value.usedBedsFemale; - this.startBooking = value.startBooking; - this.bookingHasStarted = value.bookingHasStarted; - } - - public VCamp( - 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 - ) { - this.pk = pk; - this.isOver = isOver; - this.name = name; - this.arrive = arrive; - this.depart = depart; - this.year = year; - this.locationName = locationName; - this.minAge = minAge; - this.maxAge = maxAge; - this.url = url; - this.price = price; - this.countries = countries; - this.fkDocument = fkDocument; - this.bedsFemale = bedsFemale; - this.bedsMale = bedsMale; - this.blockedBedsFemale = blockedBedsFemale; - this.blockedBedsMale = blockedBedsMale; - this.usedBedsMale = usedBedsMale; - this.usedBedsFemale = usedBedsFemale; - this.startBooking = startBooking; - this.bookingHasStarted = bookingHasStarted; - } - - /** - * Getter for public.v_camp.pk. - */ - public Integer getPk() { - return this.pk; - } - - /** - * Getter for public.v_camp.is_over. - */ - public Boolean getIsOver() { - return this.isOver; - } - - /** - * Getter for public.v_camp.name. - */ - public String getName() { - return this.name; - } - - /** - * Getter for public.v_camp.arrive. - */ - public LocalDateTime getArrive() { - return this.arrive; - } - - /** - * Getter for public.v_camp.depart. - */ - public LocalDateTime getDepart() { - return this.depart; - } - - /** - * Getter for public.v_camp.year. - */ - public Double getYear() { - return this.year; - } - - /** - * Getter for public.v_camp.location_name. - */ - public String getLocationName() { - return this.locationName; - } - - /** - * Getter for public.v_camp.min_age. - */ - public Integer getMinAge() { - return this.minAge; - } - - /** - * Getter for public.v_camp.max_age. - */ - public Integer getMaxAge() { - return this.maxAge; - } - - /** - * Getter for public.v_camp.url. - */ - public String getUrl() { - return this.url; - } - - /** - * Getter for public.v_camp.price. - */ - public String getPrice() { - return this.price; - } - - /** - * Getter for public.v_camp.countries. - */ - public String getCountries() { - return this.countries; - } - - /** - * Getter for public.v_camp.fk_document. - */ - public Integer getFkDocument() { - return this.fkDocument; - } - - /** - * Getter for public.v_camp.beds_female. - */ - public Integer getBedsFemale() { - return this.bedsFemale; - } - - /** - * Getter for public.v_camp.beds_male. - */ - public Integer getBedsMale() { - return this.bedsMale; - } - - /** - * Getter for public.v_camp.blocked_beds_female. - */ - public Integer getBlockedBedsFemale() { - return this.blockedBedsFemale; - } - - /** - * Getter for public.v_camp.blocked_beds_male. - */ - public Integer getBlockedBedsMale() { - return this.blockedBedsMale; - } - - /** - * Getter for public.v_camp.used_beds_male. - */ - public Long getUsedBedsMale() { - return this.usedBedsMale; - } - - /** - * Getter for public.v_camp.used_beds_female. - */ - public Long getUsedBedsFemale() { - return this.usedBedsFemale; - } - - /** - * Getter for public.v_camp.start_booking. - */ - public LocalDateTime getStartBooking() { - return this.startBooking; - } - - /** - * Getter for public.v_camp.booking_has_started. - */ - public Boolean getBookingHasStarted() { - return this.bookingHasStarted; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final VCamp other = (VCamp) obj; - if (this.pk == null) { - if (other.pk != null) - return false; - } - else if (!this.pk.equals(other.pk)) - return false; - if (this.isOver == null) { - if (other.isOver != null) - return false; - } - else if (!this.isOver.equals(other.isOver)) - return false; - if (this.name == null) { - if (other.name != null) - return false; - } - else if (!this.name.equals(other.name)) - return false; - if (this.arrive == null) { - if (other.arrive != null) - return false; - } - else if (!this.arrive.equals(other.arrive)) - return false; - if (this.depart == null) { - if (other.depart != null) - return false; - } - else if (!this.depart.equals(other.depart)) - return false; - if (this.year == null) { - if (other.year != null) - return false; - } - else if (!this.year.equals(other.year)) - return false; - if (this.locationName == null) { - if (other.locationName != null) - return false; - } - else if (!this.locationName.equals(other.locationName)) - return false; - if (this.minAge == null) { - if (other.minAge != null) - return false; - } - else if (!this.minAge.equals(other.minAge)) - return false; - if (this.maxAge == null) { - if (other.maxAge != null) - return false; - } - else if (!this.maxAge.equals(other.maxAge)) - return false; - if (this.url == null) { - if (other.url != null) - return false; - } - else if (!this.url.equals(other.url)) - return false; - if (this.price == null) { - if (other.price != null) - return false; - } - else if (!this.price.equals(other.price)) - return false; - if (this.countries == null) { - if (other.countries != null) - return false; - } - else if (!this.countries.equals(other.countries)) - return false; - if (this.fkDocument == null) { - if (other.fkDocument != null) - return false; - } - else if (!this.fkDocument.equals(other.fkDocument)) - return false; - if (this.bedsFemale == null) { - if (other.bedsFemale != null) - return false; - } - else if (!this.bedsFemale.equals(other.bedsFemale)) - return false; - if (this.bedsMale == null) { - if (other.bedsMale != null) - return false; - } - else if (!this.bedsMale.equals(other.bedsMale)) - 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.usedBedsMale == null) { - if (other.usedBedsMale != null) - return false; - } - else if (!this.usedBedsMale.equals(other.usedBedsMale)) - return false; - if (this.usedBedsFemale == null) { - if (other.usedBedsFemale != null) - return false; - } - else if (!this.usedBedsFemale.equals(other.usedBedsFemale)) - return false; - if (this.startBooking == null) { - if (other.startBooking != null) - return false; - } - else if (!this.startBooking.equals(other.startBooking)) - return false; - if (this.bookingHasStarted == null) { - if (other.bookingHasStarted != null) - return false; - } - else if (!this.bookingHasStarted.equals(other.bookingHasStarted)) - return false; - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((this.pk == null) ? 0 : this.pk.hashCode()); - result = prime * result + ((this.isOver == null) ? 0 : this.isOver.hashCode()); - result = prime * result + ((this.name == null) ? 0 : this.name.hashCode()); - result = prime * result + ((this.arrive == null) ? 0 : this.arrive.hashCode()); - result = prime * result + ((this.depart == null) ? 0 : this.depart.hashCode()); - result = prime * result + ((this.year == null) ? 0 : this.year.hashCode()); - 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.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()); - result = prime * result + ((this.fkDocument == null) ? 0 : this.fkDocument.hashCode()); - result = prime * result + ((this.bedsFemale == null) ? 0 : this.bedsFemale.hashCode()); - result = prime * result + ((this.bedsMale == null) ? 0 : this.bedsMale.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.usedBedsMale == null) ? 0 : this.usedBedsMale.hashCode()); - result = prime * result + ((this.usedBedsFemale == null) ? 0 : this.usedBedsFemale.hashCode()); - result = prime * result + ((this.startBooking == null) ? 0 : this.startBooking.hashCode()); - result = prime * result + ((this.bookingHasStarted == null) ? 0 : this.bookingHasStarted.hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("VCamp ("); - - sb.append(pk); - sb.append(", ").append(isOver); - sb.append(", ").append(name); - sb.append(", ").append(arrive); - sb.append(", ").append(depart); - sb.append(", ").append(year); - sb.append(", ").append(locationName); - sb.append(", ").append(minAge); - sb.append(", ").append(maxAge); - sb.append(", ").append(url); - sb.append(", ").append(price); - sb.append(", ").append(countries); - sb.append(", ").append(fkDocument); - sb.append(", ").append(bedsFemale); - sb.append(", ").append(bedsMale); - sb.append(", ").append(blockedBedsFemale); - sb.append(", ").append(blockedBedsMale); - sb.append(", ").append(usedBedsMale); - sb.append(", ").append(usedBedsFemale); - sb.append(", ").append(startBooking); - sb.append(", ").append(bookingHasStarted); - - sb.append(")"); - return sb.toString(); - } -} diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampBudget.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampBudget.java index 807d8e9..a63cb7d 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampBudget.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampBudget.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCampBudget implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampBudgetYear.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampBudgetYear.java index 2e99f4b..5f32133 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampBudgetYear.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampBudgetYear.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCampBudgetYear implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampdocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampdocument.java index 82b0e83..32c28b7 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampdocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCampdocument.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCampdocument implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCamprole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCamprole.java index a10aab7..2a0b4e8 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCamprole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VCamprole.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCamprole implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VDocument.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VDocument.java index 200ea8d..a25721e 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VDocument.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VDocument.java @@ -13,7 +13,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VDocument implements Serializable { private static final long serialVersionUID = 1L; 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 deleted file mode 100644 index 6d7e75f..0000000 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VDsgvoDeleteCandidate.java +++ /dev/null @@ -1,228 +0,0 @@ -/* - * 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" }) -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/pojos/VFeeder.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VFeeder.java index 9522225..4039bc1 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VFeeder.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VFeeder.java @@ -14,7 +14,7 @@ import org.jooq.types.YearToSecond; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VFeeder implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VProfile.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VProfile.java index 1b4e016..a602dc4 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VProfile.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VProfile.java @@ -13,7 +13,7 @@ import java.util.Arrays; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VProfile implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VRegistration.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VRegistration.java index 16e671d..6a244fe 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VRegistration.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VRegistration.java @@ -13,7 +13,7 @@ import java.time.LocalDate; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VRegistration implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VRole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VRole.java index 7774af6..da68fc8 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VRole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VRole.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VRole implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VSales.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VSales.java index 9c3d0ee..9bd282e 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VSales.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VSales.java @@ -13,7 +13,7 @@ import java.util.Arrays; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VSales implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VVersion.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VVersion.java index 112ff6d..11c6e4a 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VVersion.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/VVersion.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VVersion implements Serializable { private static final long serialVersionUID = 1L; 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 11e1d74..52f3182 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 @@ -15,7 +15,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TCampRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampdocumentRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampdocumentRecord.java index cc11640..ab6f23b 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampdocumentRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampdocumentRecord.java @@ -13,7 +13,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TCampdocumentRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampprofileRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampprofileRecord.java index baaa5a2..9d74f79 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampprofileRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TCampprofileRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TCampprofileRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TDocumentRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TDocumentRecord.java index 3bc9288..c9df3b6 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TDocumentRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TDocumentRecord.java @@ -15,7 +15,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TDocumentRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TDocumentroleRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TDocumentroleRecord.java index 2127996..84181bf 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TDocumentroleRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TDocumentroleRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TDocumentroleRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TLocationRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TLocationRecord.java index f555d87..579f924 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TLocationRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TLocationRecord.java @@ -13,7 +13,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TLocationRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; 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 a3f92cc..7e32fde 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 @@ -5,6 +5,7 @@ package de.jottyfan.camporganizer.db.jooq.tables.records; 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.TPerson; @@ -19,7 +20,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TPersonRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; @@ -204,26 +205,11 @@ public class TPersonRecord extends UpdatableRecordImpl { return (Integer) get(11); } - /** - * Setter for public.t_person.accept. - */ - public TPersonRecord setAccept(Boolean value) { - set(12, value); - return this; - } - - /** - * Getter for public.t_person.accept. - */ - public Boolean getAccept() { - return (Boolean) get(12); - } - /** * Setter for public.t_person.created. */ public TPersonRecord setCreated(LocalDateTime value) { - set(13, value); + set(12, value); return this; } @@ -231,14 +217,14 @@ public class TPersonRecord extends UpdatableRecordImpl { * Getter for public.t_person.created. */ public LocalDateTime getCreated() { - return (LocalDateTime) get(13); + return (LocalDateTime) get(12); } /** * Setter for public.t_person.sex. */ public TPersonRecord setSex(EnumSex value) { - set(14, value); + set(13, value); return this; } @@ -246,14 +232,14 @@ public class TPersonRecord extends UpdatableRecordImpl { * Getter for public.t_person.sex. */ public EnumSex getSex() { - return (EnumSex) get(14); + return (EnumSex) get(13); } /** * Setter for public.t_person.fk_registrator. */ public TPersonRecord setFkRegistrator(Integer value) { - set(15, value); + set(14, value); return this; } @@ -261,14 +247,14 @@ public class TPersonRecord extends UpdatableRecordImpl { * Getter for public.t_person.fk_registrator. */ public Integer getFkRegistrator() { - return (Integer) get(15); + return (Integer) get(14); } /** * Setter for public.t_person.paid. */ public TPersonRecord setPaid(BigDecimal value) { - set(16, value); + set(15, value); return this; } @@ -276,14 +262,14 @@ public class TPersonRecord extends UpdatableRecordImpl { * Getter for public.t_person.paid. */ public BigDecimal getPaid() { - return (BigDecimal) get(16); + return (BigDecimal) get(15); } /** * Setter for public.t_person.comment. */ public TPersonRecord setComment(String value) { - set(17, value); + set(16, value); return this; } @@ -291,14 +277,14 @@ public class TPersonRecord extends UpdatableRecordImpl { * Getter for public.t_person.comment. */ public String getComment() { - return (String) get(17); + return (String) get(16); } /** * Setter for public.t_person.consent_catalog_photo. */ public TPersonRecord setConsentCatalogPhoto(Boolean value) { - set(18, value); + set(17, value); return this; } @@ -306,14 +292,14 @@ public class TPersonRecord extends UpdatableRecordImpl { * Getter for public.t_person.consent_catalog_photo. */ public Boolean getConsentCatalogPhoto() { - return (Boolean) get(18); + return (Boolean) get(17); } /** * Setter for public.t_person.required_price. */ public TPersonRecord setRequiredPrice(BigDecimal value) { - set(19, value); + set(18, value); return this; } @@ -321,7 +307,22 @@ public class TPersonRecord extends UpdatableRecordImpl { * Getter for public.t_person.required_price. */ public BigDecimal getRequiredPrice() { - return (BigDecimal) get(19); + return (BigDecimal) get(18); + } + + /** + * Setter for public.t_person.progress. + */ + public TPersonRecord setProgress(EnumProgress value) { + set(19, value); + return this; + } + + /** + * Getter for public.t_person.progress. + */ + public EnumProgress getProgress() { + return (EnumProgress) get(19); } // ------------------------------------------------------------------------- @@ -347,7 +348,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, Boolean accept, LocalDateTime created, EnumSex sex, Integer fkRegistrator, BigDecimal paid, String comment, Boolean consentCatalogPhoto, BigDecimal requiredPrice) { + 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) { super(TPerson.T_PERSON); setPk(pk); @@ -362,7 +363,6 @@ public class TPersonRecord extends UpdatableRecordImpl { setEmail(email); setFkCamp(fkCamp); setFkProfile(fkProfile); - setAccept(accept); setCreated(created); setSex(sex); setFkRegistrator(fkRegistrator); @@ -370,6 +370,7 @@ public class TPersonRecord extends UpdatableRecordImpl { setComment(comment); setConsentCatalogPhoto(consentCatalogPhoto); setRequiredPrice(requiredPrice); + setProgress(progress); resetChangedOnNotNull(); } @@ -392,7 +393,6 @@ public class TPersonRecord extends UpdatableRecordImpl { setEmail(value.getEmail()); setFkCamp(value.getFkCamp()); setFkProfile(value.getFkProfile()); - setAccept(value.getAccept()); setCreated(value.getCreated()); setSex(value.getSex()); setFkRegistrator(value.getFkRegistrator()); @@ -400,6 +400,7 @@ 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/TPersondocumentRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersondocumentRecord.java index 4925e40..b13e1e4 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersondocumentRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersondocumentRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TPersondocumentRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TProfileRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TProfileRecord.java index 1e13595..6df4604 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TProfileRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TProfileRecord.java @@ -15,7 +15,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TProfileRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TProfileroleRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TProfileroleRecord.java index b0807cd..33da305 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TProfileroleRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TProfileroleRecord.java @@ -13,7 +13,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TProfileroleRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TRssRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TRssRecord.java index 4b033e2..76d7635 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TRssRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TRssRecord.java @@ -15,7 +15,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TRssRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalesRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalesRecord.java index 37e884e..83e87df 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalesRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalesRecord.java @@ -16,7 +16,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TSalesRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalescontentRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalescontentRecord.java index 3505172..7fadf4b 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalescontentRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalescontentRecord.java @@ -12,7 +12,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TSalescontentRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalescontenttypeRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalescontenttypeRecord.java index 329fd3b..32336fd 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalescontenttypeRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TSalescontenttypeRecord.java @@ -13,7 +13,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class TSalescontenttypeRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VAdultRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VAdultRecord.java index 8b80a81..c81a3ce 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VAdultRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VAdultRecord.java @@ -14,7 +14,7 @@ import org.jooq.types.YearToSecond; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VAdultRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VBudgetRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VBudgetRecord.java index 10268a7..a758c80 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VBudgetRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VBudgetRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VBudgetRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampBudgetRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampBudgetRecord.java index 9510a43..83b1cf5 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampBudgetRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampBudgetRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCampBudgetRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampBudgetYearRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampBudgetYearRecord.java index 72226bd..cb22e8f 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampBudgetYearRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampBudgetYearRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCampBudgetYearRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; 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 deleted file mode 100644 index b3897b5..0000000 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampRecord.java +++ /dev/null @@ -1,409 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.camporganizer.db.jooq.tables.records; - - -import de.jottyfan.camporganizer.db.jooq.tables.VCamp; - -import java.time.LocalDateTime; - -import org.jooq.impl.TableRecordImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class VCampRecord extends TableRecordImpl { - - private static final long serialVersionUID = 1L; - - /** - * Setter for public.v_camp.pk. - */ - public VCampRecord setPk(Integer value) { - set(0, value); - return this; - } - - /** - * Getter for public.v_camp.pk. - */ - public Integer getPk() { - return (Integer) get(0); - } - - /** - * Setter for public.v_camp.is_over. - */ - public VCampRecord setIsOver(Boolean value) { - set(1, value); - return this; - } - - /** - * Getter for public.v_camp.is_over. - */ - public Boolean getIsOver() { - return (Boolean) get(1); - } - - /** - * Setter for public.v_camp.name. - */ - public VCampRecord setName(String value) { - set(2, value); - return this; - } - - /** - * Getter for public.v_camp.name. - */ - public String getName() { - return (String) get(2); - } - - /** - * Setter for public.v_camp.arrive. - */ - public VCampRecord setArrive(LocalDateTime value) { - set(3, value); - return this; - } - - /** - * Getter for public.v_camp.arrive. - */ - public LocalDateTime getArrive() { - return (LocalDateTime) get(3); - } - - /** - * Setter for public.v_camp.depart. - */ - public VCampRecord setDepart(LocalDateTime value) { - set(4, value); - return this; - } - - /** - * Getter for public.v_camp.depart. - */ - public LocalDateTime getDepart() { - return (LocalDateTime) get(4); - } - - /** - * Setter for public.v_camp.year. - */ - public VCampRecord setYear(Double value) { - set(5, value); - return this; - } - - /** - * Getter for public.v_camp.year. - */ - public Double getYear() { - return (Double) get(5); - } - - /** - * Setter for public.v_camp.location_name. - */ - public VCampRecord setLocationName(String value) { - set(6, value); - return this; - } - - /** - * Getter for public.v_camp.location_name. - */ - public String getLocationName() { - return (String) get(6); - } - - /** - * Setter for public.v_camp.min_age. - */ - public VCampRecord setMinAge(Integer value) { - set(7, value); - return this; - } - - /** - * Getter for public.v_camp.min_age. - */ - public Integer getMinAge() { - return (Integer) get(7); - } - - /** - * Setter for public.v_camp.max_age. - */ - public VCampRecord setMaxAge(Integer value) { - set(8, value); - return this; - } - - /** - * Getter for public.v_camp.max_age. - */ - public Integer getMaxAge() { - return (Integer) get(8); - } - - /** - * Setter for public.v_camp.url. - */ - public VCampRecord setUrl(String value) { - set(9, value); - return this; - } - - /** - * Getter for public.v_camp.url. - */ - public String getUrl() { - return (String) get(9); - } - - /** - * Setter for public.v_camp.price. - */ - public VCampRecord setPrice(String value) { - set(10, value); - return this; - } - - /** - * Getter for public.v_camp.price. - */ - public String getPrice() { - return (String) get(10); - } - - /** - * Setter for public.v_camp.countries. - */ - public VCampRecord setCountries(String value) { - set(11, value); - return this; - } - - /** - * Getter for public.v_camp.countries. - */ - public String getCountries() { - return (String) get(11); - } - - /** - * Setter for public.v_camp.fk_document. - */ - public VCampRecord setFkDocument(Integer value) { - set(12, value); - return this; - } - - /** - * Getter for public.v_camp.fk_document. - */ - public Integer getFkDocument() { - return (Integer) get(12); - } - - /** - * Setter for public.v_camp.beds_female. - */ - public VCampRecord setBedsFemale(Integer value) { - set(13, value); - return this; - } - - /** - * Getter for public.v_camp.beds_female. - */ - public Integer getBedsFemale() { - return (Integer) get(13); - } - - /** - * Setter for public.v_camp.beds_male. - */ - public VCampRecord setBedsMale(Integer value) { - set(14, value); - return this; - } - - /** - * Getter for public.v_camp.beds_male. - */ - public Integer getBedsMale() { - return (Integer) get(14); - } - - /** - * Setter for public.v_camp.blocked_beds_female. - */ - public VCampRecord setBlockedBedsFemale(Integer value) { - set(15, value); - return this; - } - - /** - * Getter for public.v_camp.blocked_beds_female. - */ - public Integer getBlockedBedsFemale() { - return (Integer) get(15); - } - - /** - * Setter for public.v_camp.blocked_beds_male. - */ - public VCampRecord setBlockedBedsMale(Integer value) { - set(16, value); - return this; - } - - /** - * Getter for public.v_camp.blocked_beds_male. - */ - public Integer getBlockedBedsMale() { - return (Integer) get(16); - } - - /** - * Setter for public.v_camp.used_beds_male. - */ - public VCampRecord setUsedBedsMale(Long value) { - set(17, value); - return this; - } - - /** - * Getter for public.v_camp.used_beds_male. - */ - public Long getUsedBedsMale() { - return (Long) get(17); - } - - /** - * Setter for public.v_camp.used_beds_female. - */ - public VCampRecord setUsedBedsFemale(Long value) { - set(18, value); - return this; - } - - /** - * Getter for public.v_camp.used_beds_female. - */ - public Long getUsedBedsFemale() { - return (Long) get(18); - } - - /** - * Setter for public.v_camp.start_booking. - */ - public VCampRecord setStartBooking(LocalDateTime value) { - set(19, value); - return this; - } - - /** - * Getter for public.v_camp.start_booking. - */ - public LocalDateTime getStartBooking() { - return (LocalDateTime) get(19); - } - - /** - * Setter for public.v_camp.booking_has_started. - */ - public VCampRecord setBookingHasStarted(Boolean value) { - set(20, value); - return this; - } - - /** - * Getter for public.v_camp.booking_has_started. - */ - public Boolean getBookingHasStarted() { - return (Boolean) get(20); - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached VCampRecord - */ - public VCampRecord() { - super(VCamp.V_CAMP); - } - - /** - * 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) { - super(VCamp.V_CAMP); - - setPk(pk); - setIsOver(isOver); - setName(name); - setArrive(arrive); - setDepart(depart); - setYear(year); - setLocationName(locationName); - setMinAge(minAge); - setMaxAge(maxAge); - setUrl(url); - setPrice(price); - setCountries(countries); - setFkDocument(fkDocument); - setBedsFemale(bedsFemale); - setBedsMale(bedsMale); - setBlockedBedsFemale(blockedBedsFemale); - setBlockedBedsMale(blockedBedsMale); - setUsedBedsMale(usedBedsMale); - setUsedBedsFemale(usedBedsFemale); - setStartBooking(startBooking); - setBookingHasStarted(bookingHasStarted); - resetChangedOnNotNull(); - } - - /** - * Create a detached, initialised VCampRecord - */ - public VCampRecord(de.jottyfan.camporganizer.db.jooq.tables.pojos.VCamp value) { - super(VCamp.V_CAMP); - - if (value != null) { - setPk(value.getPk()); - setIsOver(value.getIsOver()); - setName(value.getName()); - setArrive(value.getArrive()); - setDepart(value.getDepart()); - setYear(value.getYear()); - setLocationName(value.getLocationName()); - setMinAge(value.getMinAge()); - setMaxAge(value.getMaxAge()); - setUrl(value.getUrl()); - setPrice(value.getPrice()); - setCountries(value.getCountries()); - setFkDocument(value.getFkDocument()); - setBedsFemale(value.getBedsFemale()); - setBedsMale(value.getBedsMale()); - setBlockedBedsFemale(value.getBlockedBedsFemale()); - setBlockedBedsMale(value.getBlockedBedsMale()); - setUsedBedsMale(value.getUsedBedsMale()); - setUsedBedsFemale(value.getUsedBedsFemale()); - setStartBooking(value.getStartBooking()); - setBookingHasStarted(value.getBookingHasStarted()); - resetChangedOnNotNull(); - } - } -} diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampdocumentRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampdocumentRecord.java index f114bfb..a62eb08 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampdocumentRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCampdocumentRecord.java @@ -16,7 +16,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCampdocumentRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCamproleRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCamproleRecord.java index 1138609..84799a5 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCamproleRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VCamproleRecord.java @@ -13,7 +13,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VCamproleRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VDocumentRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VDocumentRecord.java index 2343680..b79b178 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VDocumentRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VDocumentRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VDocumentRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; 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 deleted file mode 100644 index b5ccb1e..0000000 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VDsgvoDeleteCandidateRecord.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * 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" }) -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/java/de/jottyfan/camporganizer/db/jooq/tables/records/VFeederRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VFeederRecord.java index da11d14..cee8b49 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VFeederRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VFeederRecord.java @@ -14,7 +14,7 @@ import org.jooq.types.YearToSecond; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VFeederRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VProfileRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VProfileRecord.java index 3e8bd4a..34a1fde 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VProfileRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VProfileRecord.java @@ -13,7 +13,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VProfileRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VRegistrationRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VRegistrationRecord.java index 509cfdf..1a0beb6 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VRegistrationRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VRegistrationRecord.java @@ -15,7 +15,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VRegistrationRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VRoleRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VRoleRecord.java index efc4f41..3ea5ac6 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VRoleRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VRoleRecord.java @@ -13,7 +13,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VRoleRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VSalesRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VSalesRecord.java index 1ddc42f..1e8058f 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VSalesRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VSalesRecord.java @@ -15,7 +15,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VSalesRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VVersionRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VVersionRecord.java index 5c6b953..6cba4b0 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VVersionRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/VVersionRecord.java @@ -12,7 +12,7 @@ import org.jooq.impl.TableRecordImpl; /** * This class is generated by jOOQ. */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class VVersionRecord extends TableRecordImpl { private static final long serialVersionUID = 1L; diff --git a/src/main/resources/enums/progress.sql b/src/main/resources/enums/progress.sql new file mode 100644 index 0000000..3efe422 --- /dev/null +++ b/src/main/resources/enums/progress.sql @@ -0,0 +1,6 @@ +create type public.enum_progress as enum ( + 'requested', + 'approved', + 'rejected', + 'revoked' +); diff --git a/src/main/resources/setup.sql b/src/main/resources/setup.sql index 578beae..6e2e04b 100644 --- a/src/main/resources/setup.sql +++ b/src/main/resources/setup.sql @@ -5,6 +5,7 @@ begin; \i enums/module.sql \i enums/role.sql \i enums/sex.sql + \i enums/progress.sql \i tables/document.sql \i tables/documentrole.sql diff --git a/src/main/resources/tables/person.sql b/src/main/resources/tables/person.sql index fbfcf55..aa1ee4d 100644 --- a/src/main/resources/tables/person.sql +++ b/src/main/resources/tables/person.sql @@ -12,6 +12,7 @@ create table public.t_person ( fk_camp integer references public.t_camp(pk), fk_profile integer references public.t_profile(pk), accept boolean, + progress public.enum_progress default 'requested', created timestamp without time zone default now(), sex public.enum_sex, fk_registrator integer references public.t_profile(pk), diff --git a/src/main/resources/upgrade_2024-10-23.sql b/src/main/resources/upgrade_2024-10-23.sql new file mode 100644 index 0000000..2001420 --- /dev/null +++ b/src/main/resources/upgrade_2024-10-23.sql @@ -0,0 +1,14 @@ +begin; + + \i enums/progress.sql + + alter table t_person add column progress public.enum_progress default 'requested'; + update t_person set progress = 'approved' where accept = true; + update t_person set progress = 'rejected' where accept = false; + update t_person set progress = 'requested' where accept is null; + + \i views/camp.sql + + \i views/version.sql + +commit; diff --git a/src/main/resources/views/camp.sql b/src/main/resources/views/camp.sql index b6835e1..6ace84c 100644 --- a/src/main/resources/views/camp.sql +++ b/src/main/resources/views/camp.sql @@ -2,14 +2,14 @@ create or replace view public.v_camp as with female(used, fk_camp) as ( select count(1), fk_camp from t_person - where accept = true + where progress = 'approved' and sex = 'female' and camprole = 'student' group by fk_camp ), male(used, fk_camp) as ( select count(1), fk_camp from t_person - where accept = true + where progress = 'approved' and sex = 'male' and camprole = 'student' group by fk_camp