From d1ad4521295ae1a61466e889b22623eb01327199 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sun, 14 Dec 2025 16:52:26 +0100 Subject: [PATCH] preparations for youth group support --- build.gradle | 13 +- .../de/jottyfan/bico/db/DefaultCatalog.java | 17 +- .../jottyfan/bico/db/{public_ => }/Keys.java | 41 +- .../bico/db/{public_ => }/Public.java | 30 +- .../bico/db/{public_ => }/Tables.java | 24 +- .../java/de/jottyfan/bico/db/camp/Camp.java | 76 --- .../java/de/jottyfan/bico/db/camp/Keys.java | 41 -- .../java/de/jottyfan/bico/db/camp/Tables.java | 38 -- .../jottyfan/bico/db/camp/enums/EnumCamp.java | 56 --- .../de/jottyfan/bico/db/camp/tables/TAge.java | 311 ------------ .../bico/db/camp/tables/TRegistration.java | 394 --------------- .../bico/db/camp/tables/VParticipant.java | 228 --------- .../bico/db/camp/tables/VVersion.java | 213 -------- .../bico/db/camp/tables/pojos/TAge.java | 156 ------ .../db/camp/tables/pojos/TRegistration.java | 475 ------------------ .../db/camp/tables/pojos/VParticipant.java | 91 ---- .../bico/db/camp/tables/pojos/VVersion.java | 72 --- .../db/camp/tables/records/TAgeRecord.java | 160 ------ .../tables/records/TRegistrationRecord.java | 438 ---------------- .../tables/records/VParticipantRecord.java | 84 ---- .../camp/tables/records/VVersionRecord.java | 67 --- .../EnumSex.java => enums/EnumGroupname.java} | 20 +- .../bico/db/{public_ => }/tables/TLesson.java | 16 +- .../{public_ => }/tables/TLessonSubject.java | 12 +- .../bico/db/{public_ => }/tables/TPerson.java | 10 +- .../db/{public_ => }/tables/TProfile.java | 8 +- .../bico/db/{public_ => }/tables/TSlot.java | 16 +- .../bico/db/{public_ => }/tables/TSource.java | 10 +- .../db/{public_ => }/tables/TSubject.java | 14 +- .../db/{public_ => }/tables/VCalendar.java | 22 +- .../bico/db/{public_ => }/tables/VLesson.java | 8 +- .../{public_ => }/tables/VLessonMissing.java | 8 +- .../db/{public_ => }/tables/VVersion.java | 8 +- .../{public_ => }/tables/pojos/TLesson.java | 2 +- .../tables/pojos/TLessonSubject.java | 2 +- .../{public_ => }/tables/pojos/TPerson.java | 2 +- .../{public_ => }/tables/pojos/TProfile.java | 2 +- .../db/{public_ => }/tables/pojos/TSlot.java | 25 +- .../{public_ => }/tables/pojos/TSource.java | 2 +- .../{public_ => }/tables/pojos/TSubject.java | 2 +- .../{public_ => }/tables/pojos/VCalendar.java | 42 +- .../{public_ => }/tables/pojos/VLesson.java | 2 +- .../tables/pojos/VLessonMissing.java | 2 +- .../{public_ => }/tables/pojos/VVersion.java | 2 +- .../tables/records/TLessonRecord.java | 10 +- .../tables/records/TLessonSubjectRecord.java | 10 +- .../tables/records/TPersonRecord.java | 10 +- .../tables/records/TProfileRecord.java | 10 +- .../tables/records/TSlotRecord.java | 30 +- .../tables/records/TSourceRecord.java | 10 +- .../tables/records/TSubjectRecord.java | 10 +- .../tables/records/VCalendarRecord.java | 46 +- .../tables/records/VLessonMissingRecord.java | 10 +- .../tables/records/VLessonRecord.java | 10 +- .../tables/records/VVersionRecord.java | 10 +- src/main/resources/v9.sql | 34 ++ 56 files changed, 357 insertions(+), 3105 deletions(-) rename src/main/java/de/jottyfan/bico/db/{public_ => }/Keys.java (79%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/Public.java (77%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/Tables.java (72%) delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/Camp.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/Keys.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/Tables.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/enums/EnumCamp.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/TAge.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/TRegistration.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/VParticipant.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/VVersion.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/pojos/TAge.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/pojos/TRegistration.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/pojos/VParticipant.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/pojos/VVersion.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/records/TAgeRecord.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/records/TRegistrationRecord.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/records/VParticipantRecord.java delete mode 100644 src/main/java/de/jottyfan/bico/db/camp/tables/records/VVersionRecord.java rename src/main/java/de/jottyfan/bico/db/{camp/enums/EnumSex.java => enums/EnumGroupname.java} (65%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/TLesson.java (95%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/TLessonSubject.java (96%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/TPerson.java (96%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/TProfile.java (96%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/TSlot.java (92%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/TSource.java (96%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/TSubject.java (95%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/VCalendar.java (92%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/VLesson.java (96%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/VLessonMissing.java (96%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/VVersion.java (95%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/TLesson.java (98%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/TLessonSubject.java (98%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/TPerson.java (98%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/TProfile.java (98%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/TSlot.java (77%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/TSource.java (97%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/TSubject.java (99%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/VCalendar.java (90%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/VLesson.java (98%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/VLessonMissing.java (98%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/pojos/VVersion.java (96%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/TLessonRecord.java (91%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/TLessonSubjectRecord.java (90%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/TPersonRecord.java (91%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/TProfileRecord.java (90%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/TSlotRecord.java (76%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/TSourceRecord.java (88%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/TSubjectRecord.java (95%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/VCalendarRecord.java (88%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/VLessonMissingRecord.java (90%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/VLessonRecord.java (93%) rename src/main/java/de/jottyfan/bico/db/{public_ => }/tables/records/VVersionRecord.java (83%) create mode 100644 src/main/resources/v9.sql diff --git a/build.gradle b/build.gradle index b12855e..c2464d9 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'org.jooq:jooq-codegen:3.19.15' + classpath 'org.jooq:jooq-codegen:3.20.10' classpath 'org.postgresql:postgresql:latest.release' classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release' classpath 'nu.studer.jooq:nu.studer.jooq.gradle.plugin:latest.release' @@ -22,7 +22,7 @@ apply plugin: 'java' apply plugin: 'maven-publish' group = 'de.jottyfan' -version = '8' +version = '9' description = """bicolib""" @@ -36,8 +36,8 @@ repositories { } dependencies { - implementation 'org.jooq:jooq:3.19.15' - implementation 'org.jooq:jooq-codegen:3.19.15' + implementation 'org.jooq:jooq:3.20.10' + implementation 'org.jooq:jooq-codegen:3.20.10' implementation 'org.postgresql:postgresql:latest.release' @@ -47,7 +47,7 @@ dependencies { import org.jooq.meta.jaxb.Logging jooq { - version = '3.19.15' + version = '3.20.10' edition = nu.studer.gradle.jooq.JooqEdition.OSS configurations { bicolib { @@ -74,9 +74,6 @@ jooq { schema { inputSchema = 'public' } - schema { - inputSchema = 'camp' - } } } generate { diff --git a/src/main/java/de/jottyfan/bico/db/DefaultCatalog.java b/src/main/java/de/jottyfan/bico/db/DefaultCatalog.java index 765d3b1..0c1601e 100644 --- a/src/main/java/de/jottyfan/bico/db/DefaultCatalog.java +++ b/src/main/java/de/jottyfan/bico/db/DefaultCatalog.java @@ -4,9 +4,6 @@ package de.jottyfan.bico.db; -import de.jottyfan.bico.db.camp.Camp; -import de.jottyfan.bico.db.public_.Public; - import java.util.Arrays; import java.util.List; @@ -29,12 +26,7 @@ public class DefaultCatalog extends CatalogImpl { public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog(); /** - * The schema camp. - */ - public final Camp CAMP = Camp.CAMP; - - /** - * The schema public. + * standard public schema */ public final Public PUBLIC = Public.PUBLIC; @@ -48,16 +40,15 @@ public class DefaultCatalog extends CatalogImpl { @Override public final List getSchemas() { return Arrays.asList( - Camp.CAMP, Public.PUBLIC ); } /** - * A reference to the 3.19 minor release of the code generator. If this + * A reference to the 3.20 minor release of the code generator. If this * doesn't compile, it's because the runtime library uses an older minor - * release, namely: 3.19. You can turn off the generation of this reference + * release, namely: 3.20. You can turn off the generation of this reference * by specifying /configuration/generator/generate/jooqVersionReference */ - private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_19; + private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_20; } diff --git a/src/main/java/de/jottyfan/bico/db/public_/Keys.java b/src/main/java/de/jottyfan/bico/db/Keys.java similarity index 79% rename from src/main/java/de/jottyfan/bico/db/public_/Keys.java rename to src/main/java/de/jottyfan/bico/db/Keys.java index ed7f1fd..857b2c3 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/Keys.java +++ b/src/main/java/de/jottyfan/bico/db/Keys.java @@ -1,29 +1,30 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_; +package de.jottyfan.bico.db; -import de.jottyfan.bico.db.public_.tables.TLesson; -import de.jottyfan.bico.db.public_.tables.TLessonSubject; -import de.jottyfan.bico.db.public_.tables.TPerson; -import de.jottyfan.bico.db.public_.tables.TProfile; -import de.jottyfan.bico.db.public_.tables.TSlot; -import de.jottyfan.bico.db.public_.tables.TSource; -import de.jottyfan.bico.db.public_.tables.TSubject; -import de.jottyfan.bico.db.public_.tables.records.TLessonRecord; -import de.jottyfan.bico.db.public_.tables.records.TLessonSubjectRecord; -import de.jottyfan.bico.db.public_.tables.records.TPersonRecord; -import de.jottyfan.bico.db.public_.tables.records.TProfileRecord; -import de.jottyfan.bico.db.public_.tables.records.TSlotRecord; -import de.jottyfan.bico.db.public_.tables.records.TSourceRecord; -import de.jottyfan.bico.db.public_.tables.records.TSubjectRecord; +import de.jottyfan.bico.db.tables.TLesson; +import de.jottyfan.bico.db.tables.TLessonSubject; +import de.jottyfan.bico.db.tables.TPerson; +import de.jottyfan.bico.db.tables.TProfile; +import de.jottyfan.bico.db.tables.TSlot; +import de.jottyfan.bico.db.tables.TSource; +import de.jottyfan.bico.db.tables.TSubject; +import de.jottyfan.bico.db.tables.records.TLessonRecord; +import de.jottyfan.bico.db.tables.records.TLessonSubjectRecord; +import de.jottyfan.bico.db.tables.records.TPersonRecord; +import de.jottyfan.bico.db.tables.records.TProfileRecord; +import de.jottyfan.bico.db.tables.records.TSlotRecord; +import de.jottyfan.bico.db.tables.records.TSourceRecord; +import de.jottyfan.bico.db.tables.records.TSubjectRecord; import org.jooq.ForeignKey; import org.jooq.TableField; import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.Internal; +import org.jooq.impl.QOM.ForeignKeyRule; /** @@ -56,9 +57,9 @@ public class Keys { // FOREIGN KEY definitions // ------------------------------------------------------------------------- - public static final ForeignKey T_LESSON__T_LESSON_FK_LESSONDAY_FKEY = Internal.createForeignKey(TLesson.T_LESSON, DSL.name("t_lesson_fk_lessonday_fkey"), new TableField[] { TLesson.T_LESSON.FK_SLOT }, Keys.T_LESSONDAY_PKEY, new TableField[] { TSlot.T_SLOT.PK_SLOT }, true); - public static final ForeignKey T_LESSON__T_LESSON_FK_PERSON_FKEY = Internal.createForeignKey(TLesson.T_LESSON, DSL.name("t_lesson_fk_person_fkey"), new TableField[] { TLesson.T_LESSON.FK_PERSON }, Keys.T_PERSON_PKEY, new TableField[] { TPerson.T_PERSON.PK_PERSON }, true); - public static final ForeignKey T_LESSON_SUBJECT__T_LESSON_SUBJECT_FK_LESSON_FKEY = Internal.createForeignKey(TLessonSubject.T_LESSON_SUBJECT, DSL.name("t_lesson_subject_fk_lesson_fkey"), new TableField[] { TLessonSubject.T_LESSON_SUBJECT.FK_LESSON }, Keys.T_LESSON_PKEY, new TableField[] { TLesson.T_LESSON.PK_LESSON }, true); - public static final ForeignKey T_LESSON_SUBJECT__T_LESSON_SUBJECT_FK_SUBJECT_FKEY = Internal.createForeignKey(TLessonSubject.T_LESSON_SUBJECT, DSL.name("t_lesson_subject_fk_subject_fkey"), new TableField[] { TLessonSubject.T_LESSON_SUBJECT.FK_SUBJECT }, Keys.T_SUBJECT_PKEY, new TableField[] { TSubject.T_SUBJECT.PK_SUBJECT }, true); - public static final ForeignKey T_SUBJECT__T_SUBJECT_FK_SOURCE_FKEY = Internal.createForeignKey(TSubject.T_SUBJECT, DSL.name("t_subject_fk_source_fkey"), new TableField[] { TSubject.T_SUBJECT.FK_SOURCE }, Keys.T_SOURCE_PKEY, new TableField[] { TSource.T_SOURCE.PK_SOURCE }, true); + public static final ForeignKey T_LESSON__T_LESSON_FK_LESSONDAY_FKEY = Internal.createForeignKey(TLesson.T_LESSON, DSL.name("t_lesson_fk_lessonday_fkey"), new TableField[] { TLesson.T_LESSON.FK_SLOT }, Keys.T_LESSONDAY_PKEY, new TableField[] { TSlot.T_SLOT.PK_SLOT }, true, ForeignKeyRule.NO_ACTION, ForeignKeyRule.NO_ACTION); + public static final ForeignKey T_LESSON__T_LESSON_FK_PERSON_FKEY = Internal.createForeignKey(TLesson.T_LESSON, DSL.name("t_lesson_fk_person_fkey"), new TableField[] { TLesson.T_LESSON.FK_PERSON }, Keys.T_PERSON_PKEY, new TableField[] { TPerson.T_PERSON.PK_PERSON }, true, ForeignKeyRule.NO_ACTION, ForeignKeyRule.NO_ACTION); + public static final ForeignKey T_LESSON_SUBJECT__T_LESSON_SUBJECT_FK_LESSON_FKEY = Internal.createForeignKey(TLessonSubject.T_LESSON_SUBJECT, DSL.name("t_lesson_subject_fk_lesson_fkey"), new TableField[] { TLessonSubject.T_LESSON_SUBJECT.FK_LESSON }, Keys.T_LESSON_PKEY, new TableField[] { TLesson.T_LESSON.PK_LESSON }, true, ForeignKeyRule.NO_ACTION, ForeignKeyRule.NO_ACTION); + public static final ForeignKey T_LESSON_SUBJECT__T_LESSON_SUBJECT_FK_SUBJECT_FKEY = Internal.createForeignKey(TLessonSubject.T_LESSON_SUBJECT, DSL.name("t_lesson_subject_fk_subject_fkey"), new TableField[] { TLessonSubject.T_LESSON_SUBJECT.FK_SUBJECT }, Keys.T_SUBJECT_PKEY, new TableField[] { TSubject.T_SUBJECT.PK_SUBJECT }, true, ForeignKeyRule.NO_ACTION, ForeignKeyRule.NO_ACTION); + public static final ForeignKey T_SUBJECT__T_SUBJECT_FK_SOURCE_FKEY = Internal.createForeignKey(TSubject.T_SUBJECT, DSL.name("t_subject_fk_source_fkey"), new TableField[] { TSubject.T_SUBJECT.FK_SOURCE }, Keys.T_SOURCE_PKEY, new TableField[] { TSource.T_SOURCE.PK_SOURCE }, true, ForeignKeyRule.NO_ACTION, ForeignKeyRule.NO_ACTION); } diff --git a/src/main/java/de/jottyfan/bico/db/public_/Public.java b/src/main/java/de/jottyfan/bico/db/Public.java similarity index 77% rename from src/main/java/de/jottyfan/bico/db/public_/Public.java rename to src/main/java/de/jottyfan/bico/db/Public.java index 6bcd3af..058d60a 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/Public.java +++ b/src/main/java/de/jottyfan/bico/db/Public.java @@ -1,32 +1,32 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_; +package de.jottyfan.bico.db; -import de.jottyfan.bico.db.DefaultCatalog; -import de.jottyfan.bico.db.public_.tables.TLesson; -import de.jottyfan.bico.db.public_.tables.TLessonSubject; -import de.jottyfan.bico.db.public_.tables.TPerson; -import de.jottyfan.bico.db.public_.tables.TProfile; -import de.jottyfan.bico.db.public_.tables.TSlot; -import de.jottyfan.bico.db.public_.tables.TSource; -import de.jottyfan.bico.db.public_.tables.TSubject; -import de.jottyfan.bico.db.public_.tables.VCalendar; -import de.jottyfan.bico.db.public_.tables.VLesson; -import de.jottyfan.bico.db.public_.tables.VLessonMissing; -import de.jottyfan.bico.db.public_.tables.VVersion; +import de.jottyfan.bico.db.tables.TLesson; +import de.jottyfan.bico.db.tables.TLessonSubject; +import de.jottyfan.bico.db.tables.TPerson; +import de.jottyfan.bico.db.tables.TProfile; +import de.jottyfan.bico.db.tables.TSlot; +import de.jottyfan.bico.db.tables.TSource; +import de.jottyfan.bico.db.tables.TSubject; +import de.jottyfan.bico.db.tables.VCalendar; +import de.jottyfan.bico.db.tables.VLesson; +import de.jottyfan.bico.db.tables.VLessonMissing; +import de.jottyfan.bico.db.tables.VVersion; import java.util.Arrays; import java.util.List; import org.jooq.Catalog; import org.jooq.Table; +import org.jooq.impl.DSL; import org.jooq.impl.SchemaImpl; /** - * This class is generated by jOOQ. + * standard public schema */ @SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) public class Public extends SchemaImpl { @@ -97,7 +97,7 @@ public class Public extends SchemaImpl { * No further instances allowed */ private Public() { - super("public", null); + super(DSL.name("public"), null, DSL.comment("standard public schema")); } diff --git a/src/main/java/de/jottyfan/bico/db/public_/Tables.java b/src/main/java/de/jottyfan/bico/db/Tables.java similarity index 72% rename from src/main/java/de/jottyfan/bico/db/public_/Tables.java rename to src/main/java/de/jottyfan/bico/db/Tables.java index 9fcd0f6..7ed53f8 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/Tables.java +++ b/src/main/java/de/jottyfan/bico/db/Tables.java @@ -1,20 +1,20 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_; +package de.jottyfan.bico.db; -import de.jottyfan.bico.db.public_.tables.TLesson; -import de.jottyfan.bico.db.public_.tables.TLessonSubject; -import de.jottyfan.bico.db.public_.tables.TPerson; -import de.jottyfan.bico.db.public_.tables.TProfile; -import de.jottyfan.bico.db.public_.tables.TSlot; -import de.jottyfan.bico.db.public_.tables.TSource; -import de.jottyfan.bico.db.public_.tables.TSubject; -import de.jottyfan.bico.db.public_.tables.VCalendar; -import de.jottyfan.bico.db.public_.tables.VLesson; -import de.jottyfan.bico.db.public_.tables.VLessonMissing; -import de.jottyfan.bico.db.public_.tables.VVersion; +import de.jottyfan.bico.db.tables.TLesson; +import de.jottyfan.bico.db.tables.TLessonSubject; +import de.jottyfan.bico.db.tables.TPerson; +import de.jottyfan.bico.db.tables.TProfile; +import de.jottyfan.bico.db.tables.TSlot; +import de.jottyfan.bico.db.tables.TSource; +import de.jottyfan.bico.db.tables.TSubject; +import de.jottyfan.bico.db.tables.VCalendar; +import de.jottyfan.bico.db.tables.VLesson; +import de.jottyfan.bico.db.tables.VLessonMissing; +import de.jottyfan.bico.db.tables.VVersion; /** diff --git a/src/main/java/de/jottyfan/bico/db/camp/Camp.java b/src/main/java/de/jottyfan/bico/db/camp/Camp.java deleted file mode 100644 index 2223be0..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/Camp.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp; - - -import de.jottyfan.bico.db.DefaultCatalog; -import de.jottyfan.bico.db.camp.tables.TAge; -import de.jottyfan.bico.db.camp.tables.TRegistration; -import de.jottyfan.bico.db.camp.tables.VParticipant; -import de.jottyfan.bico.db.camp.tables.VVersion; - -import java.util.Arrays; -import java.util.List; - -import org.jooq.Catalog; -import org.jooq.Table; -import org.jooq.impl.SchemaImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class Camp extends SchemaImpl { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of camp - */ - public static final Camp CAMP = new Camp(); - - /** - * The table camp.t_age. - */ - public final TAge T_AGE = TAge.T_AGE; - - /** - * The table camp.t_registration. - */ - public final TRegistration T_REGISTRATION = TRegistration.T_REGISTRATION; - - /** - * The table camp.v_participant. - */ - public final VParticipant V_PARTICIPANT = VParticipant.V_PARTICIPANT; - - /** - * The table camp.v_version. - */ - public final VVersion V_VERSION = VVersion.V_VERSION; - - /** - * No further instances allowed - */ - private Camp() { - super("camp", null); - } - - - @Override - public Catalog getCatalog() { - return DefaultCatalog.DEFAULT_CATALOG; - } - - @Override - public final List> getTables() { - return Arrays.asList( - TAge.T_AGE, - TRegistration.T_REGISTRATION, - VParticipant.V_PARTICIPANT, - VVersion.V_VERSION - ); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/Keys.java b/src/main/java/de/jottyfan/bico/db/camp/Keys.java deleted file mode 100644 index 3e85c7a..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/Keys.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp; - - -import de.jottyfan.bico.db.camp.tables.TAge; -import de.jottyfan.bico.db.camp.tables.TRegistration; -import de.jottyfan.bico.db.camp.tables.records.TAgeRecord; -import de.jottyfan.bico.db.camp.tables.records.TRegistrationRecord; - -import org.jooq.ForeignKey; -import org.jooq.TableField; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.Internal; - - -/** - * A class modelling foreign key relationships and constraints of tables in - * camp. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class Keys { - - // ------------------------------------------------------------------------- - // UNIQUE and PRIMARY KEY definitions - // ------------------------------------------------------------------------- - - public static final UniqueKey T_AGE_AGE_KEY = Internal.createUniqueKey(TAge.T_AGE, DSL.name("t_age_age_key"), new TableField[] { TAge.T_AGE.AGE }, true); - public static final UniqueKey T_AGE_NAME_KEY = Internal.createUniqueKey(TAge.T_AGE, DSL.name("t_age_name_key"), new TableField[] { TAge.T_AGE.NAME }, true); - public static final UniqueKey T_AGE_PKEY = Internal.createUniqueKey(TAge.T_AGE, DSL.name("t_age_pkey"), new TableField[] { TAge.T_AGE.PK_AGE }, true); - public static final UniqueKey T_REGISTRATION_CAMP_FORENAME_SURNAME_KEY = Internal.createUniqueKey(TRegistration.T_REGISTRATION, DSL.name("t_registration_camp_forename_surname_key"), new TableField[] { TRegistration.T_REGISTRATION.CAMP, TRegistration.T_REGISTRATION.FORENAME, TRegistration.T_REGISTRATION.SURNAME }, true); - public static final UniqueKey T_REGISTRATION_PKEY = Internal.createUniqueKey(TRegistration.T_REGISTRATION, DSL.name("t_registration_pkey"), new TableField[] { TRegistration.T_REGISTRATION.PK_REGISTRATION }, true); - - // ------------------------------------------------------------------------- - // FOREIGN KEY definitions - // ------------------------------------------------------------------------- - - public static final ForeignKey T_REGISTRATION__T_REGISTRATION_FK_AGE_FKEY = Internal.createForeignKey(TRegistration.T_REGISTRATION, DSL.name("t_registration_fk_age_fkey"), new TableField[] { TRegistration.T_REGISTRATION.FK_AGE }, Keys.T_AGE_PKEY, new TableField[] { TAge.T_AGE.PK_AGE }, true); -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/Tables.java b/src/main/java/de/jottyfan/bico/db/camp/Tables.java deleted file mode 100644 index f79675f..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/Tables.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp; - - -import de.jottyfan.bico.db.camp.tables.TAge; -import de.jottyfan.bico.db.camp.tables.TRegistration; -import de.jottyfan.bico.db.camp.tables.VParticipant; -import de.jottyfan.bico.db.camp.tables.VVersion; - - -/** - * Convenience access to all tables in camp. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class Tables { - - /** - * The table camp.t_age. - */ - public static final TAge T_AGE = TAge.T_AGE; - - /** - * The table camp.t_registration. - */ - public static final TRegistration T_REGISTRATION = TRegistration.T_REGISTRATION; - - /** - * The table camp.v_participant. - */ - public static final VParticipant V_PARTICIPANT = VParticipant.V_PARTICIPANT; - - /** - * The table camp.v_version. - */ - public static final VVersion V_VERSION = VVersion.V_VERSION; -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/enums/EnumCamp.java b/src/main/java/de/jottyfan/bico/db/camp/enums/EnumCamp.java deleted file mode 100644 index 885d4f9..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/enums/EnumCamp.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.enums; - - -import de.jottyfan.bico.db.camp.Camp; - -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 EnumCamp implements EnumType { - - Gemeindefreizeit_2025("Gemeindefreizeit 2025"); - - private final String literal; - - private EnumCamp(String literal) { - this.literal = literal; - } - - @Override - public Catalog getCatalog() { - return getSchema().getCatalog(); - } - - @Override - public Schema getSchema() { - return Camp.CAMP; - } - - @Override - public String getName() { - return "enum_camp"; - } - - @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 EnumCamp lookupLiteral(String literal) { - return EnumType.lookupLiteral(EnumCamp.class, literal); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/TAge.java b/src/main/java/de/jottyfan/bico/db/camp/tables/TAge.java deleted file mode 100644 index cf26e53..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/TAge.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables; - - -import de.jottyfan.bico.db.camp.Camp; -import de.jottyfan.bico.db.camp.Keys; -import de.jottyfan.bico.db.camp.tables.TRegistration.TRegistrationPath; -import de.jottyfan.bico.db.camp.tables.records.TAgeRecord; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import org.jooq.Condition; -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Identity; -import org.jooq.InverseForeignKey; -import org.jooq.Name; -import org.jooq.Path; -import org.jooq.PlainSQL; -import org.jooq.QueryPart; -import org.jooq.Record; -import org.jooq.SQL; -import org.jooq.Schema; -import org.jooq.Select; -import org.jooq.Stringly; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.TableOptions; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.DefaultDataType; -import org.jooq.impl.SQLDataType; -import org.jooq.impl.TableImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class TAge extends TableImpl { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of camp.t_age - */ - public static final TAge T_AGE = new TAge(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return TAgeRecord.class; - } - - /** - * The column camp.t_age.created. - */ - public final TableField CREATED = createField(DSL.name("created"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("CURRENT_TIMESTAMP"), SQLDataType.LOCALDATETIME)), this, ""); - - /** - * The column camp.t_age.pk_age. - */ - public final TableField PK_AGE = createField(DSL.name("pk_age"), SQLDataType.INTEGER.nullable(false).identity(true), this, ""); - - /** - * The column camp.t_age.name. - */ - public final TableField NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, ""); - - /** - * @deprecated Unknown data type. If this is a qualified, user-defined type, - * it may have been excluded from code generation. If this is a built-in - * type, you can define an explicit {@link org.jooq.Binding} to specify how - * this type should be handled. Deprecation can be turned off using - * {@literal } in your code generator - * configuration. - */ - @Deprecated - public final TableField AGE = createField(DSL.name("age"), DefaultDataType.getDefaultDataType("\"pg_catalog\".\"int4range\"").nullable(false), this, ""); - - /** - * The column camp.t_age.price. - */ - public final TableField PRICE = createField(DSL.name("price"), SQLDataType.NUMERIC(4, 2).nullable(false), this, ""); - - private TAge(Name alias, Table aliased) { - this(alias, aliased, (Field[]) null, null); - } - - private TAge(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); - } - - /** - * Create an aliased camp.t_age table reference - */ - public TAge(String alias) { - this(DSL.name(alias), T_AGE); - } - - /** - * Create an aliased camp.t_age table reference - */ - public TAge(Name alias) { - this(alias, T_AGE); - } - - /** - * Create a camp.t_age table reference - */ - public TAge() { - this(DSL.name("t_age"), null); - } - - public TAge(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_AGE); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TAgePath extends TAge implements Path { - - private static final long serialVersionUID = 1L; - public TAgePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TAgePath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TAgePath as(String alias) { - return new TAgePath(DSL.name(alias), this); - } - - @Override - public TAgePath as(Name alias) { - return new TAgePath(alias, this); - } - - @Override - public TAgePath as(Table alias) { - return new TAgePath(alias.getQualifiedName(), this); - } - } - - @Override - public Schema getSchema() { - return aliased() ? null : Camp.CAMP; - } - - @Override - public Identity getIdentity() { - return (Identity) super.getIdentity(); - } - - @Override - public UniqueKey getPrimaryKey() { - return Keys.T_AGE_PKEY; - } - - @Override - public List> getUniqueKeys() { - return Arrays.asList(Keys.T_AGE_AGE_KEY, Keys.T_AGE_NAME_KEY); - } - - private transient TRegistrationPath _tRegistration; - - /** - * Get the implicit to-many join path to the - * camp.t_registration table - */ - public TRegistrationPath tRegistration() { - if (_tRegistration == null) - _tRegistration = new TRegistrationPath(this, null, Keys.T_REGISTRATION__T_REGISTRATION_FK_AGE_FKEY.getInverseKey()); - - return _tRegistration; - } - - @Override - public TAge as(String alias) { - return new TAge(DSL.name(alias), this); - } - - @Override - public TAge as(Name alias) { - return new TAge(alias, this); - } - - @Override - public TAge as(Table alias) { - return new TAge(alias.getQualifiedName(), this); - } - - /** - * Rename this table - */ - @Override - public TAge rename(String name) { - return new TAge(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public TAge rename(Name name) { - return new TAge(name, null); - } - - /** - * Rename this table - */ - @Override - public TAge rename(Table name) { - return new TAge(name.getQualifiedName(), null); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TAge where(Condition condition) { - return new TAge(getQualifiedName(), aliased() ? this : null, null, condition); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TAge where(Collection conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TAge where(Condition... conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TAge where(Field condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TAge where(SQL condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TAge where(@Stringly.SQL String condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TAge where(@Stringly.SQL String condition, Object... binds) { - return where(DSL.condition(condition, binds)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TAge where(@Stringly.SQL String condition, QueryPart... parts) { - return where(DSL.condition(condition, parts)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TAge whereExists(Select select) { - return where(DSL.exists(select)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TAge whereNotExists(Select select) { - return where(DSL.notExists(select)); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/TRegistration.java b/src/main/java/de/jottyfan/bico/db/camp/tables/TRegistration.java deleted file mode 100644 index e77d868..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/TRegistration.java +++ /dev/null @@ -1,394 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables; - - -import de.jottyfan.bico.db.camp.Camp; -import de.jottyfan.bico.db.camp.Keys; -import de.jottyfan.bico.db.camp.enums.EnumCamp; -import de.jottyfan.bico.db.camp.enums.EnumSex; -import de.jottyfan.bico.db.camp.tables.TAge.TAgePath; -import de.jottyfan.bico.db.camp.tables.records.TRegistrationRecord; - -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import org.jooq.Condition; -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Identity; -import org.jooq.InverseForeignKey; -import org.jooq.Name; -import org.jooq.Path; -import org.jooq.PlainSQL; -import org.jooq.QueryPart; -import org.jooq.Record; -import org.jooq.SQL; -import org.jooq.Schema; -import org.jooq.Select; -import org.jooq.Stringly; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.TableOptions; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.SQLDataType; -import org.jooq.impl.TableImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class TRegistration extends TableImpl { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of camp.t_registration - */ - public static final TRegistration T_REGISTRATION = new TRegistration(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return TRegistrationRecord.class; - } - - /** - * The column camp.t_registration.created. - */ - public final TableField CREATED = createField(DSL.name("created"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("CURRENT_TIMESTAMP"), SQLDataType.LOCALDATETIME)), this, ""); - - /** - * The column camp.t_registration.pk_registration. - */ - public final TableField PK_REGISTRATION = createField(DSL.name("pk_registration"), SQLDataType.INTEGER.nullable(false).identity(true), this, ""); - - /** - * The column camp.t_registration.registrator. - */ - public final TableField REGISTRATOR = createField(DSL.name("registrator"), SQLDataType.CLOB.nullable(false), this, ""); - - /** - * The column camp.t_registration.camp. - */ - public final TableField CAMP = createField(DSL.name("camp"), SQLDataType.VARCHAR.nullable(false).asEnumDataType(EnumCamp.class), this, ""); - - /** - * The column camp.t_registration.forename. - */ - public final TableField FORENAME = createField(DSL.name("forename"), SQLDataType.CLOB.nullable(false), this, ""); - - /** - * The column camp.t_registration.surname. - */ - public final TableField SURNAME = createField(DSL.name("surname"), SQLDataType.CLOB.nullable(false), this, ""); - - /** - * The column camp.t_registration.sex. - */ - public final TableField SEX = createField(DSL.name("sex"), SQLDataType.VARCHAR.nullable(false).asEnumDataType(EnumSex.class), this, ""); - - /** - * The column camp.t_registration.barrier_free. - */ - public final TableField BARRIER_FREE = createField(DSL.name("barrier_free"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, ""); - - /** - * The column camp.t_registration.nutrition. - */ - public final TableField NUTRITION = createField(DSL.name("nutrition"), SQLDataType.CLOB, this, ""); - - /** - * The column camp.t_registration.driver_provide_places. - */ - public final TableField DRIVER_PROVIDE_PLACES = createField(DSL.name("driver_provide_places"), SQLDataType.INTEGER, this, ""); - - /** - * The column camp.t_registration.want_place_in_car. - */ - public final TableField WANT_PLACE_IN_CAR = createField(DSL.name("want_place_in_car"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column camp.t_registration.diseases. - */ - public final TableField DISEASES = createField(DSL.name("diseases"), SQLDataType.CLOB, this, ""); - - /** - * The column camp.t_registration.require_payment. - */ - public final TableField REQUIRE_PAYMENT = createField(DSL.name("require_payment"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column camp.t_registration.fk_age. - */ - public final TableField FK_AGE = createField(DSL.name("fk_age"), SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column camp.t_registration.day0. - */ - public final TableField DAY0 = createField(DSL.name("day0"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column camp.t_registration.day1. - */ - public final TableField DAY1 = createField(DSL.name("day1"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column camp.t_registration.day2. - */ - public final TableField DAY2 = createField(DSL.name("day2"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column camp.t_registration.day3. - */ - public final TableField DAY3 = createField(DSL.name("day3"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column camp.t_registration.day4. - */ - public final TableField DAY4 = createField(DSL.name("day4"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column camp.t_registration.towels. - */ - public final TableField TOWELS = createField(DSL.name("towels"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column camp.t_registration.bed_linen. - */ - public final TableField BED_LINEN = createField(DSL.name("bed_linen"), SQLDataType.BOOLEAN, this, ""); - - /** - * The column camp.t_registration.cot. - */ - public final TableField COT = createField(DSL.name("cot"), SQLDataType.BOOLEAN, this, ""); - - private TRegistration(Name alias, Table aliased) { - this(alias, aliased, (Field[]) null, null); - } - - private TRegistration(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); - } - - /** - * Create an aliased camp.t_registration table reference - */ - public TRegistration(String alias) { - this(DSL.name(alias), T_REGISTRATION); - } - - /** - * Create an aliased camp.t_registration table reference - */ - public TRegistration(Name alias) { - this(alias, T_REGISTRATION); - } - - /** - * Create a camp.t_registration table reference - */ - public TRegistration() { - this(DSL.name("t_registration"), null); - } - - public TRegistration(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, T_REGISTRATION); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class TRegistrationPath extends TRegistration implements Path { - - private static final long serialVersionUID = 1L; - public TRegistrationPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private TRegistrationPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public TRegistrationPath as(String alias) { - return new TRegistrationPath(DSL.name(alias), this); - } - - @Override - public TRegistrationPath as(Name alias) { - return new TRegistrationPath(alias, this); - } - - @Override - public TRegistrationPath as(Table alias) { - return new TRegistrationPath(alias.getQualifiedName(), this); - } - } - - @Override - public Schema getSchema() { - return aliased() ? null : Camp.CAMP; - } - - @Override - public Identity getIdentity() { - return (Identity) super.getIdentity(); - } - - @Override - public UniqueKey getPrimaryKey() { - return Keys.T_REGISTRATION_PKEY; - } - - @Override - public List> getUniqueKeys() { - return Arrays.asList(Keys.T_REGISTRATION_CAMP_FORENAME_SURNAME_KEY); - } - - @Override - public List> getReferences() { - return Arrays.asList(Keys.T_REGISTRATION__T_REGISTRATION_FK_AGE_FKEY); - } - - private transient TAgePath _tAge; - - /** - * Get the implicit join path to the camp.t_age table. - */ - public TAgePath tAge() { - if (_tAge == null) - _tAge = new TAgePath(this, Keys.T_REGISTRATION__T_REGISTRATION_FK_AGE_FKEY, null); - - return _tAge; - } - - @Override - public TRegistration as(String alias) { - return new TRegistration(DSL.name(alias), this); - } - - @Override - public TRegistration as(Name alias) { - return new TRegistration(alias, this); - } - - @Override - public TRegistration as(Table alias) { - return new TRegistration(alias.getQualifiedName(), this); - } - - /** - * Rename this table - */ - @Override - public TRegistration rename(String name) { - return new TRegistration(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public TRegistration rename(Name name) { - return new TRegistration(name, null); - } - - /** - * Rename this table - */ - @Override - public TRegistration rename(Table name) { - return new TRegistration(name.getQualifiedName(), null); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TRegistration where(Condition condition) { - return new TRegistration(getQualifiedName(), aliased() ? this : null, null, condition); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TRegistration where(Collection conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TRegistration where(Condition... conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TRegistration where(Field condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TRegistration where(SQL condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TRegistration where(@Stringly.SQL String condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TRegistration where(@Stringly.SQL String condition, Object... binds) { - return where(DSL.condition(condition, binds)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public TRegistration where(@Stringly.SQL String condition, QueryPart... parts) { - return where(DSL.condition(condition, parts)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TRegistration whereExists(Select select) { - return where(DSL.exists(select)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public TRegistration whereNotExists(Select select) { - return where(DSL.notExists(select)); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/VParticipant.java b/src/main/java/de/jottyfan/bico/db/camp/tables/VParticipant.java deleted file mode 100644 index 678008a..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/VParticipant.java +++ /dev/null @@ -1,228 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables; - - -import de.jottyfan.bico.db.camp.Camp; -import de.jottyfan.bico.db.camp.tables.records.VParticipantRecord; - -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", "this-escape" }) -public class VParticipant extends TableImpl { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of camp.v_participant - */ - public static final VParticipant V_PARTICIPANT = new VParticipant(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return VParticipantRecord.class; - } - - /** - * The column camp.v_participant.males. - */ - public final TableField MALES = createField(DSL.name("males"), SQLDataType.BIGINT, this, ""); - - /** - * The column camp.v_participant.females. - */ - public final TableField FEMALES = createField(DSL.name("females"), SQLDataType.BIGINT, this, ""); - - private VParticipant(Name alias, Table aliased) { - this(alias, aliased, (Field[]) null, null); - } - - private VParticipant(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_participant" as SELECT sum( - CASE - WHEN (sex = 'männlich'::camp.enum_sex) THEN 1 - ELSE 0 - END) AS males, - sum( - CASE - WHEN (sex = 'weiblich'::camp.enum_sex) THEN 1 - ELSE 0 - END) AS females - FROM camp.t_registration; - """), where); - } - - /** - * Create an aliased camp.v_participant table reference - */ - public VParticipant(String alias) { - this(DSL.name(alias), V_PARTICIPANT); - } - - /** - * Create an aliased camp.v_participant table reference - */ - public VParticipant(Name alias) { - this(alias, V_PARTICIPANT); - } - - /** - * Create a camp.v_participant table reference - */ - public VParticipant() { - this(DSL.name("v_participant"), null); - } - - @Override - public Schema getSchema() { - return aliased() ? null : Camp.CAMP; - } - - @Override - public VParticipant as(String alias) { - return new VParticipant(DSL.name(alias), this); - } - - @Override - public VParticipant as(Name alias) { - return new VParticipant(alias, this); - } - - @Override - public VParticipant as(Table alias) { - return new VParticipant(alias.getQualifiedName(), this); - } - - /** - * Rename this table - */ - @Override - public VParticipant rename(String name) { - return new VParticipant(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public VParticipant rename(Name name) { - return new VParticipant(name, null); - } - - /** - * Rename this table - */ - @Override - public VParticipant rename(Table name) { - return new VParticipant(name.getQualifiedName(), null); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VParticipant where(Condition condition) { - return new VParticipant(getQualifiedName(), aliased() ? this : null, null, condition); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VParticipant where(Collection conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VParticipant where(Condition... conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VParticipant where(Field condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VParticipant where(SQL condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VParticipant where(@Stringly.SQL String condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VParticipant where(@Stringly.SQL String condition, Object... binds) { - return where(DSL.condition(condition, binds)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VParticipant where(@Stringly.SQL String condition, QueryPart... parts) { - return where(DSL.condition(condition, parts)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VParticipant whereExists(Select select) { - return where(DSL.exists(select)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VParticipant whereNotExists(Select select) { - return where(DSL.notExists(select)); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/VVersion.java b/src/main/java/de/jottyfan/bico/db/camp/tables/VVersion.java deleted file mode 100644 index e929923..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/VVersion.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables; - - -import de.jottyfan.bico.db.camp.Camp; -import de.jottyfan.bico.db.camp.tables.records.VVersionRecord; - -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", "this-escape" }) -public class VVersion extends TableImpl { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of camp.v_version - */ - public static final VVersion V_VERSION = new VVersion(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return VVersionRecord.class; - } - - /** - * The column camp.v_version.version. - */ - public final TableField VERSION = createField(DSL.name("version"), SQLDataType.INTEGER, this, ""); - - private VVersion(Name alias, Table aliased) { - this(alias, aliased, (Field[]) null, null); - } - - private VVersion(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_version" as SELECT 6 AS version; - """), where); - } - - /** - * Create an aliased camp.v_version table reference - */ - public VVersion(String alias) { - this(DSL.name(alias), V_VERSION); - } - - /** - * Create an aliased camp.v_version table reference - */ - public VVersion(Name alias) { - this(alias, V_VERSION); - } - - /** - * Create a camp.v_version table reference - */ - public VVersion() { - this(DSL.name("v_version"), null); - } - - @Override - public Schema getSchema() { - return aliased() ? null : Camp.CAMP; - } - - @Override - public VVersion as(String alias) { - return new VVersion(DSL.name(alias), this); - } - - @Override - public VVersion as(Name alias) { - return new VVersion(alias, this); - } - - @Override - public VVersion as(Table alias) { - return new VVersion(alias.getQualifiedName(), this); - } - - /** - * Rename this table - */ - @Override - public VVersion rename(String name) { - return new VVersion(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public VVersion rename(Name name) { - return new VVersion(name, null); - } - - /** - * Rename this table - */ - @Override - public VVersion rename(Table name) { - return new VVersion(name.getQualifiedName(), null); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VVersion where(Condition condition) { - return new VVersion(getQualifiedName(), aliased() ? this : null, null, condition); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VVersion where(Collection conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VVersion where(Condition... conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VVersion where(Field condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VVersion where(SQL condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VVersion where(@Stringly.SQL String condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VVersion where(@Stringly.SQL String condition, Object... binds) { - return where(DSL.condition(condition, binds)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public VVersion where(@Stringly.SQL String condition, QueryPart... parts) { - return where(DSL.condition(condition, parts)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VVersion whereExists(Select select) { - return where(DSL.exists(select)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public VVersion whereNotExists(Select select) { - return where(DSL.notExists(select)); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/TAge.java b/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/TAge.java deleted file mode 100644 index a31a618..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/TAge.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables.pojos; - - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class TAge implements Serializable { - - private static final long serialVersionUID = 1L; - - private final LocalDateTime created; - private final Integer pkAge; - private final String name; - private final Object age; - private final BigDecimal price; - - public TAge(TAge value) { - this.created = value.created; - this.pkAge = value.pkAge; - this.name = value.name; - this.age = value.age; - this.price = value.price; - } - - public TAge( - LocalDateTime created, - Integer pkAge, - String name, - Object age, - BigDecimal price - ) { - this.created = created; - this.pkAge = pkAge; - this.name = name; - this.age = age; - this.price = price; - } - - /** - * Getter for camp.t_age.created. - */ - public LocalDateTime getCreated() { - return this.created; - } - - /** - * Getter for camp.t_age.pk_age. - */ - public Integer getPkAge() { - return this.pkAge; - } - - /** - * Getter for camp.t_age.name. - */ - public String getName() { - return this.name; - } - - /** - * @deprecated Unknown data type. If this is a qualified, user-defined type, - * it may have been excluded from code generation. If this is a built-in - * type, you can define an explicit {@link org.jooq.Binding} to specify how - * this type should be handled. Deprecation can be turned off using - * {@literal } in your code generator - * configuration. - */ - @Deprecated - public Object getAge() { - return this.age; - } - - /** - * Getter for camp.t_age.price. - */ - public BigDecimal getPrice() { - return this.price; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final TAge other = (TAge) obj; - if (this.created == null) { - if (other.created != null) - return false; - } - else if (!this.created.equals(other.created)) - return false; - if (this.pkAge == null) { - if (other.pkAge != null) - return false; - } - else if (!this.pkAge.equals(other.pkAge)) - return false; - if (this.name == null) { - if (other.name != null) - return false; - } - else if (!this.name.equals(other.name)) - return false; - if (this.age == null) { - if (other.age != null) - return false; - } - else if (!this.age.equals(other.age)) - return false; - if (this.price == null) { - if (other.price != null) - return false; - } - else if (!this.price.equals(other.price)) - return false; - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((this.created == null) ? 0 : this.created.hashCode()); - result = prime * result + ((this.pkAge == null) ? 0 : this.pkAge.hashCode()); - result = prime * result + ((this.name == null) ? 0 : this.name.hashCode()); - result = prime * result + ((this.age == null) ? 0 : this.age.hashCode()); - result = prime * result + ((this.price == null) ? 0 : this.price.hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("TAge ("); - - sb.append(created); - sb.append(", ").append(pkAge); - sb.append(", ").append(name); - sb.append(", ").append(age); - sb.append(", ").append(price); - - sb.append(")"); - return sb.toString(); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/TRegistration.java b/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/TRegistration.java deleted file mode 100644 index 4afc820..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/TRegistration.java +++ /dev/null @@ -1,475 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables.pojos; - - -import de.jottyfan.bico.db.camp.enums.EnumCamp; -import de.jottyfan.bico.db.camp.enums.EnumSex; - -import java.io.Serializable; -import java.time.LocalDateTime; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class TRegistration implements Serializable { - - private static final long serialVersionUID = 1L; - - private final LocalDateTime created; - private final Integer pkRegistration; - private final String registrator; - private final EnumCamp camp; - private final String forename; - private final String surname; - private final EnumSex sex; - private final Boolean barrierFree; - private final String nutrition; - private final Integer driverProvidePlaces; - private final Boolean wantPlaceInCar; - private final String diseases; - private final Boolean requirePayment; - private final Integer fkAge; - private final Boolean day0; - private final Boolean day1; - private final Boolean day2; - private final Boolean day3; - private final Boolean day4; - private final Boolean towels; - private final Boolean bedLinen; - private final Boolean cot; - - public TRegistration(TRegistration value) { - this.created = value.created; - this.pkRegistration = value.pkRegistration; - this.registrator = value.registrator; - this.camp = value.camp; - this.forename = value.forename; - this.surname = value.surname; - this.sex = value.sex; - this.barrierFree = value.barrierFree; - this.nutrition = value.nutrition; - this.driverProvidePlaces = value.driverProvidePlaces; - this.wantPlaceInCar = value.wantPlaceInCar; - this.diseases = value.diseases; - this.requirePayment = value.requirePayment; - this.fkAge = value.fkAge; - this.day0 = value.day0; - this.day1 = value.day1; - this.day2 = value.day2; - this.day3 = value.day3; - this.day4 = value.day4; - this.towels = value.towels; - this.bedLinen = value.bedLinen; - this.cot = value.cot; - } - - public TRegistration( - LocalDateTime created, - Integer pkRegistration, - String registrator, - EnumCamp camp, - String forename, - String surname, - EnumSex sex, - Boolean barrierFree, - String nutrition, - Integer driverProvidePlaces, - Boolean wantPlaceInCar, - String diseases, - Boolean requirePayment, - Integer fkAge, - Boolean day0, - Boolean day1, - Boolean day2, - Boolean day3, - Boolean day4, - Boolean towels, - Boolean bedLinen, - Boolean cot - ) { - this.created = created; - this.pkRegistration = pkRegistration; - this.registrator = registrator; - this.camp = camp; - this.forename = forename; - this.surname = surname; - this.sex = sex; - this.barrierFree = barrierFree; - this.nutrition = nutrition; - this.driverProvidePlaces = driverProvidePlaces; - this.wantPlaceInCar = wantPlaceInCar; - this.diseases = diseases; - this.requirePayment = requirePayment; - this.fkAge = fkAge; - this.day0 = day0; - this.day1 = day1; - this.day2 = day2; - this.day3 = day3; - this.day4 = day4; - this.towels = towels; - this.bedLinen = bedLinen; - this.cot = cot; - } - - /** - * Getter for camp.t_registration.created. - */ - public LocalDateTime getCreated() { - return this.created; - } - - /** - * Getter for camp.t_registration.pk_registration. - */ - public Integer getPkRegistration() { - return this.pkRegistration; - } - - /** - * Getter for camp.t_registration.registrator. - */ - public String getRegistrator() { - return this.registrator; - } - - /** - * Getter for camp.t_registration.camp. - */ - public EnumCamp getCamp() { - return this.camp; - } - - /** - * Getter for camp.t_registration.forename. - */ - public String getForename() { - return this.forename; - } - - /** - * Getter for camp.t_registration.surname. - */ - public String getSurname() { - return this.surname; - } - - /** - * Getter for camp.t_registration.sex. - */ - public EnumSex getSex() { - return this.sex; - } - - /** - * Getter for camp.t_registration.barrier_free. - */ - public Boolean getBarrierFree() { - return this.barrierFree; - } - - /** - * Getter for camp.t_registration.nutrition. - */ - public String getNutrition() { - return this.nutrition; - } - - /** - * Getter for camp.t_registration.driver_provide_places. - */ - public Integer getDriverProvidePlaces() { - return this.driverProvidePlaces; - } - - /** - * Getter for camp.t_registration.want_place_in_car. - */ - public Boolean getWantPlaceInCar() { - return this.wantPlaceInCar; - } - - /** - * Getter for camp.t_registration.diseases. - */ - public String getDiseases() { - return this.diseases; - } - - /** - * Getter for camp.t_registration.require_payment. - */ - public Boolean getRequirePayment() { - return this.requirePayment; - } - - /** - * Getter for camp.t_registration.fk_age. - */ - public Integer getFkAge() { - return this.fkAge; - } - - /** - * Getter for camp.t_registration.day0. - */ - public Boolean getDay0() { - return this.day0; - } - - /** - * Getter for camp.t_registration.day1. - */ - public Boolean getDay1() { - return this.day1; - } - - /** - * Getter for camp.t_registration.day2. - */ - public Boolean getDay2() { - return this.day2; - } - - /** - * Getter for camp.t_registration.day3. - */ - public Boolean getDay3() { - return this.day3; - } - - /** - * Getter for camp.t_registration.day4. - */ - public Boolean getDay4() { - return this.day4; - } - - /** - * Getter for camp.t_registration.towels. - */ - public Boolean getTowels() { - return this.towels; - } - - /** - * Getter for camp.t_registration.bed_linen. - */ - public Boolean getBedLinen() { - return this.bedLinen; - } - - /** - * Getter for camp.t_registration.cot. - */ - public Boolean getCot() { - return this.cot; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final TRegistration other = (TRegistration) obj; - if (this.created == null) { - if (other.created != null) - return false; - } - else if (!this.created.equals(other.created)) - return false; - if (this.pkRegistration == null) { - if (other.pkRegistration != null) - return false; - } - else if (!this.pkRegistration.equals(other.pkRegistration)) - return false; - if (this.registrator == null) { - if (other.registrator != null) - return false; - } - else if (!this.registrator.equals(other.registrator)) - return false; - if (this.camp == null) { - if (other.camp != null) - return false; - } - else if (!this.camp.equals(other.camp)) - 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.sex == null) { - if (other.sex != null) - return false; - } - else if (!this.sex.equals(other.sex)) - return false; - if (this.barrierFree == null) { - if (other.barrierFree != null) - return false; - } - else if (!this.barrierFree.equals(other.barrierFree)) - return false; - if (this.nutrition == null) { - if (other.nutrition != null) - return false; - } - else if (!this.nutrition.equals(other.nutrition)) - return false; - if (this.driverProvidePlaces == null) { - if (other.driverProvidePlaces != null) - return false; - } - else if (!this.driverProvidePlaces.equals(other.driverProvidePlaces)) - return false; - if (this.wantPlaceInCar == null) { - if (other.wantPlaceInCar != null) - return false; - } - else if (!this.wantPlaceInCar.equals(other.wantPlaceInCar)) - return false; - if (this.diseases == null) { - if (other.diseases != null) - return false; - } - else if (!this.diseases.equals(other.diseases)) - return false; - if (this.requirePayment == null) { - if (other.requirePayment != null) - return false; - } - else if (!this.requirePayment.equals(other.requirePayment)) - return false; - if (this.fkAge == null) { - if (other.fkAge != null) - return false; - } - else if (!this.fkAge.equals(other.fkAge)) - return false; - if (this.day0 == null) { - if (other.day0 != null) - return false; - } - else if (!this.day0.equals(other.day0)) - return false; - if (this.day1 == null) { - if (other.day1 != null) - return false; - } - else if (!this.day1.equals(other.day1)) - return false; - if (this.day2 == null) { - if (other.day2 != null) - return false; - } - else if (!this.day2.equals(other.day2)) - return false; - if (this.day3 == null) { - if (other.day3 != null) - return false; - } - else if (!this.day3.equals(other.day3)) - return false; - if (this.day4 == null) { - if (other.day4 != null) - return false; - } - else if (!this.day4.equals(other.day4)) - return false; - if (this.towels == null) { - if (other.towels != null) - return false; - } - else if (!this.towels.equals(other.towels)) - return false; - if (this.bedLinen == null) { - if (other.bedLinen != null) - return false; - } - else if (!this.bedLinen.equals(other.bedLinen)) - return false; - if (this.cot == null) { - if (other.cot != null) - return false; - } - else if (!this.cot.equals(other.cot)) - return false; - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((this.created == null) ? 0 : this.created.hashCode()); - result = prime * result + ((this.pkRegistration == null) ? 0 : this.pkRegistration.hashCode()); - result = prime * result + ((this.registrator == null) ? 0 : this.registrator.hashCode()); - result = prime * result + ((this.camp == null) ? 0 : this.camp.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.sex == null) ? 0 : this.sex.hashCode()); - result = prime * result + ((this.barrierFree == null) ? 0 : this.barrierFree.hashCode()); - result = prime * result + ((this.nutrition == null) ? 0 : this.nutrition.hashCode()); - result = prime * result + ((this.driverProvidePlaces == null) ? 0 : this.driverProvidePlaces.hashCode()); - result = prime * result + ((this.wantPlaceInCar == null) ? 0 : this.wantPlaceInCar.hashCode()); - result = prime * result + ((this.diseases == null) ? 0 : this.diseases.hashCode()); - result = prime * result + ((this.requirePayment == null) ? 0 : this.requirePayment.hashCode()); - result = prime * result + ((this.fkAge == null) ? 0 : this.fkAge.hashCode()); - result = prime * result + ((this.day0 == null) ? 0 : this.day0.hashCode()); - result = prime * result + ((this.day1 == null) ? 0 : this.day1.hashCode()); - result = prime * result + ((this.day2 == null) ? 0 : this.day2.hashCode()); - result = prime * result + ((this.day3 == null) ? 0 : this.day3.hashCode()); - result = prime * result + ((this.day4 == null) ? 0 : this.day4.hashCode()); - result = prime * result + ((this.towels == null) ? 0 : this.towels.hashCode()); - result = prime * result + ((this.bedLinen == null) ? 0 : this.bedLinen.hashCode()); - result = prime * result + ((this.cot == null) ? 0 : this.cot.hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("TRegistration ("); - - sb.append(created); - sb.append(", ").append(pkRegistration); - sb.append(", ").append(registrator); - sb.append(", ").append(camp); - sb.append(", ").append(forename); - sb.append(", ").append(surname); - sb.append(", ").append(sex); - sb.append(", ").append(barrierFree); - sb.append(", ").append(nutrition); - sb.append(", ").append(driverProvidePlaces); - sb.append(", ").append(wantPlaceInCar); - sb.append(", ").append(diseases); - sb.append(", ").append(requirePayment); - sb.append(", ").append(fkAge); - sb.append(", ").append(day0); - sb.append(", ").append(day1); - sb.append(", ").append(day2); - sb.append(", ").append(day3); - sb.append(", ").append(day4); - sb.append(", ").append(towels); - sb.append(", ").append(bedLinen); - sb.append(", ").append(cot); - - sb.append(")"); - return sb.toString(); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/VParticipant.java b/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/VParticipant.java deleted file mode 100644 index 1ee8566..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/VParticipant.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables.pojos; - - -import java.io.Serializable; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class VParticipant implements Serializable { - - private static final long serialVersionUID = 1L; - - private final Long males; - private final Long females; - - public VParticipant(VParticipant value) { - this.males = value.males; - this.females = value.females; - } - - public VParticipant( - Long males, - Long females - ) { - this.males = males; - this.females = females; - } - - /** - * Getter for camp.v_participant.males. - */ - public Long getMales() { - return this.males; - } - - /** - * Getter for camp.v_participant.females. - */ - public Long getFemales() { - return this.females; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final VParticipant other = (VParticipant) obj; - if (this.males == null) { - if (other.males != null) - return false; - } - else if (!this.males.equals(other.males)) - return false; - if (this.females == null) { - if (other.females != null) - return false; - } - else if (!this.females.equals(other.females)) - return false; - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((this.males == null) ? 0 : this.males.hashCode()); - result = prime * result + ((this.females == null) ? 0 : this.females.hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("VParticipant ("); - - sb.append(males); - sb.append(", ").append(females); - - sb.append(")"); - return sb.toString(); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/VVersion.java b/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/VVersion.java deleted file mode 100644 index c84e646..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/pojos/VVersion.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables.pojos; - - -import java.io.Serializable; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class VVersion implements Serializable { - - private static final long serialVersionUID = 1L; - - private final Integer version; - - public VVersion(VVersion value) { - this.version = value.version; - } - - public VVersion( - Integer version - ) { - this.version = version; - } - - /** - * Getter for camp.v_version.version. - */ - public Integer getVersion() { - return this.version; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final VVersion other = (VVersion) obj; - if (this.version == null) { - if (other.version != null) - return false; - } - else if (!this.version.equals(other.version)) - return false; - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((this.version == null) ? 0 : this.version.hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("VVersion ("); - - sb.append(version); - - sb.append(")"); - return sb.toString(); - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/records/TAgeRecord.java b/src/main/java/de/jottyfan/bico/db/camp/tables/records/TAgeRecord.java deleted file mode 100644 index 42c1925..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/records/TAgeRecord.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables.records; - - -import de.jottyfan.bico.db.camp.tables.TAge; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -import org.jooq.Record1; -import org.jooq.impl.UpdatableRecordImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class TAgeRecord extends UpdatableRecordImpl { - - private static final long serialVersionUID = 1L; - - /** - * Setter for camp.t_age.created. - */ - public TAgeRecord setCreated(LocalDateTime value) { - set(0, value); - return this; - } - - /** - * Getter for camp.t_age.created. - */ - public LocalDateTime getCreated() { - return (LocalDateTime) get(0); - } - - /** - * Setter for camp.t_age.pk_age. - */ - public TAgeRecord setPkAge(Integer value) { - set(1, value); - return this; - } - - /** - * Getter for camp.t_age.pk_age. - */ - public Integer getPkAge() { - return (Integer) get(1); - } - - /** - * Setter for camp.t_age.name. - */ - public TAgeRecord setName(String value) { - set(2, value); - return this; - } - - /** - * Getter for camp.t_age.name. - */ - public String getName() { - return (String) get(2); - } - - /** - * @deprecated Unknown data type. If this is a qualified, user-defined type, - * it may have been excluded from code generation. If this is a built-in - * type, you can define an explicit {@link org.jooq.Binding} to specify how - * this type should be handled. Deprecation can be turned off using - * {@literal } in your code generator - * configuration. - */ - @Deprecated - public TAgeRecord setAge(Object value) { - set(3, value); - return this; - } - - /** - * @deprecated Unknown data type. If this is a qualified, user-defined type, - * it may have been excluded from code generation. If this is a built-in - * type, you can define an explicit {@link org.jooq.Binding} to specify how - * this type should be handled. Deprecation can be turned off using - * {@literal } in your code generator - * configuration. - */ - @Deprecated - public Object getAge() { - return get(3); - } - - /** - * Setter for camp.t_age.price. - */ - public TAgeRecord setPrice(BigDecimal value) { - set(4, value); - return this; - } - - /** - * Getter for camp.t_age.price. - */ - public BigDecimal getPrice() { - return (BigDecimal) get(4); - } - - // ------------------------------------------------------------------------- - // Primary key information - // ------------------------------------------------------------------------- - - @Override - public Record1 key() { - return (Record1) super.key(); - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached TAgeRecord - */ - public TAgeRecord() { - super(TAge.T_AGE); - } - - /** - * Create a detached, initialised TAgeRecord - */ - public TAgeRecord(LocalDateTime created, Integer pkAge, String name, Object age, BigDecimal price) { - super(TAge.T_AGE); - - setCreated(created); - setPkAge(pkAge); - setName(name); - setAge(age); - setPrice(price); - resetChangedOnNotNull(); - } - - /** - * Create a detached, initialised TAgeRecord - */ - public TAgeRecord(de.jottyfan.bico.db.camp.tables.pojos.TAge value) { - super(TAge.T_AGE); - - if (value != null) { - setCreated(value.getCreated()); - setPkAge(value.getPkAge()); - setName(value.getName()); - setAge(value.getAge()); - setPrice(value.getPrice()); - resetChangedOnNotNull(); - } - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/records/TRegistrationRecord.java b/src/main/java/de/jottyfan/bico/db/camp/tables/records/TRegistrationRecord.java deleted file mode 100644 index 8ee9481..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/records/TRegistrationRecord.java +++ /dev/null @@ -1,438 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables.records; - - -import de.jottyfan.bico.db.camp.enums.EnumCamp; -import de.jottyfan.bico.db.camp.enums.EnumSex; -import de.jottyfan.bico.db.camp.tables.TRegistration; - -import java.time.LocalDateTime; - -import org.jooq.Record1; -import org.jooq.impl.UpdatableRecordImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class TRegistrationRecord extends UpdatableRecordImpl { - - private static final long serialVersionUID = 1L; - - /** - * Setter for camp.t_registration.created. - */ - public TRegistrationRecord setCreated(LocalDateTime value) { - set(0, value); - return this; - } - - /** - * Getter for camp.t_registration.created. - */ - public LocalDateTime getCreated() { - return (LocalDateTime) get(0); - } - - /** - * Setter for camp.t_registration.pk_registration. - */ - public TRegistrationRecord setPkRegistration(Integer value) { - set(1, value); - return this; - } - - /** - * Getter for camp.t_registration.pk_registration. - */ - public Integer getPkRegistration() { - return (Integer) get(1); - } - - /** - * Setter for camp.t_registration.registrator. - */ - public TRegistrationRecord setRegistrator(String value) { - set(2, value); - return this; - } - - /** - * Getter for camp.t_registration.registrator. - */ - public String getRegistrator() { - return (String) get(2); - } - - /** - * Setter for camp.t_registration.camp. - */ - public TRegistrationRecord setCamp(EnumCamp value) { - set(3, value); - return this; - } - - /** - * Getter for camp.t_registration.camp. - */ - public EnumCamp getCamp() { - return (EnumCamp) get(3); - } - - /** - * Setter for camp.t_registration.forename. - */ - public TRegistrationRecord setForename(String value) { - set(4, value); - return this; - } - - /** - * Getter for camp.t_registration.forename. - */ - public String getForename() { - return (String) get(4); - } - - /** - * Setter for camp.t_registration.surname. - */ - public TRegistrationRecord setSurname(String value) { - set(5, value); - return this; - } - - /** - * Getter for camp.t_registration.surname. - */ - public String getSurname() { - return (String) get(5); - } - - /** - * Setter for camp.t_registration.sex. - */ - public TRegistrationRecord setSex(EnumSex value) { - set(6, value); - return this; - } - - /** - * Getter for camp.t_registration.sex. - */ - public EnumSex getSex() { - return (EnumSex) get(6); - } - - /** - * Setter for camp.t_registration.barrier_free. - */ - public TRegistrationRecord setBarrierFree(Boolean value) { - set(7, value); - return this; - } - - /** - * Getter for camp.t_registration.barrier_free. - */ - public Boolean getBarrierFree() { - return (Boolean) get(7); - } - - /** - * Setter for camp.t_registration.nutrition. - */ - public TRegistrationRecord setNutrition(String value) { - set(8, value); - return this; - } - - /** - * Getter for camp.t_registration.nutrition. - */ - public String getNutrition() { - return (String) get(8); - } - - /** - * Setter for camp.t_registration.driver_provide_places. - */ - public TRegistrationRecord setDriverProvidePlaces(Integer value) { - set(9, value); - return this; - } - - /** - * Getter for camp.t_registration.driver_provide_places. - */ - public Integer getDriverProvidePlaces() { - return (Integer) get(9); - } - - /** - * Setter for camp.t_registration.want_place_in_car. - */ - public TRegistrationRecord setWantPlaceInCar(Boolean value) { - set(10, value); - return this; - } - - /** - * Getter for camp.t_registration.want_place_in_car. - */ - public Boolean getWantPlaceInCar() { - return (Boolean) get(10); - } - - /** - * Setter for camp.t_registration.diseases. - */ - public TRegistrationRecord setDiseases(String value) { - set(11, value); - return this; - } - - /** - * Getter for camp.t_registration.diseases. - */ - public String getDiseases() { - return (String) get(11); - } - - /** - * Setter for camp.t_registration.require_payment. - */ - public TRegistrationRecord setRequirePayment(Boolean value) { - set(12, value); - return this; - } - - /** - * Getter for camp.t_registration.require_payment. - */ - public Boolean getRequirePayment() { - return (Boolean) get(12); - } - - /** - * Setter for camp.t_registration.fk_age. - */ - public TRegistrationRecord setFkAge(Integer value) { - set(13, value); - return this; - } - - /** - * Getter for camp.t_registration.fk_age. - */ - public Integer getFkAge() { - return (Integer) get(13); - } - - /** - * Setter for camp.t_registration.day0. - */ - public TRegistrationRecord setDay0(Boolean value) { - set(14, value); - return this; - } - - /** - * Getter for camp.t_registration.day0. - */ - public Boolean getDay0() { - return (Boolean) get(14); - } - - /** - * Setter for camp.t_registration.day1. - */ - public TRegistrationRecord setDay1(Boolean value) { - set(15, value); - return this; - } - - /** - * Getter for camp.t_registration.day1. - */ - public Boolean getDay1() { - return (Boolean) get(15); - } - - /** - * Setter for camp.t_registration.day2. - */ - public TRegistrationRecord setDay2(Boolean value) { - set(16, value); - return this; - } - - /** - * Getter for camp.t_registration.day2. - */ - public Boolean getDay2() { - return (Boolean) get(16); - } - - /** - * Setter for camp.t_registration.day3. - */ - public TRegistrationRecord setDay3(Boolean value) { - set(17, value); - return this; - } - - /** - * Getter for camp.t_registration.day3. - */ - public Boolean getDay3() { - return (Boolean) get(17); - } - - /** - * Setter for camp.t_registration.day4. - */ - public TRegistrationRecord setDay4(Boolean value) { - set(18, value); - return this; - } - - /** - * Getter for camp.t_registration.day4. - */ - public Boolean getDay4() { - return (Boolean) get(18); - } - - /** - * Setter for camp.t_registration.towels. - */ - public TRegistrationRecord setTowels(Boolean value) { - set(19, value); - return this; - } - - /** - * Getter for camp.t_registration.towels. - */ - public Boolean getTowels() { - return (Boolean) get(19); - } - - /** - * Setter for camp.t_registration.bed_linen. - */ - public TRegistrationRecord setBedLinen(Boolean value) { - set(20, value); - return this; - } - - /** - * Getter for camp.t_registration.bed_linen. - */ - public Boolean getBedLinen() { - return (Boolean) get(20); - } - - /** - * Setter for camp.t_registration.cot. - */ - public TRegistrationRecord setCot(Boolean value) { - set(21, value); - return this; - } - - /** - * Getter for camp.t_registration.cot. - */ - public Boolean getCot() { - return (Boolean) get(21); - } - - // ------------------------------------------------------------------------- - // Primary key information - // ------------------------------------------------------------------------- - - @Override - public Record1 key() { - return (Record1) super.key(); - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached TRegistrationRecord - */ - public TRegistrationRecord() { - super(TRegistration.T_REGISTRATION); - } - - /** - * Create a detached, initialised TRegistrationRecord - */ - public TRegistrationRecord(LocalDateTime created, Integer pkRegistration, String registrator, EnumCamp camp, String forename, String surname, EnumSex sex, Boolean barrierFree, String nutrition, Integer driverProvidePlaces, Boolean wantPlaceInCar, String diseases, Boolean requirePayment, Integer fkAge, Boolean day0, Boolean day1, Boolean day2, Boolean day3, Boolean day4, Boolean towels, Boolean bedLinen, Boolean cot) { - super(TRegistration.T_REGISTRATION); - - setCreated(created); - setPkRegistration(pkRegistration); - setRegistrator(registrator); - setCamp(camp); - setForename(forename); - setSurname(surname); - setSex(sex); - setBarrierFree(barrierFree); - setNutrition(nutrition); - setDriverProvidePlaces(driverProvidePlaces); - setWantPlaceInCar(wantPlaceInCar); - setDiseases(diseases); - setRequirePayment(requirePayment); - setFkAge(fkAge); - setDay0(day0); - setDay1(day1); - setDay2(day2); - setDay3(day3); - setDay4(day4); - setTowels(towels); - setBedLinen(bedLinen); - setCot(cot); - resetChangedOnNotNull(); - } - - /** - * Create a detached, initialised TRegistrationRecord - */ - public TRegistrationRecord(de.jottyfan.bico.db.camp.tables.pojos.TRegistration value) { - super(TRegistration.T_REGISTRATION); - - if (value != null) { - setCreated(value.getCreated()); - setPkRegistration(value.getPkRegistration()); - setRegistrator(value.getRegistrator()); - setCamp(value.getCamp()); - setForename(value.getForename()); - setSurname(value.getSurname()); - setSex(value.getSex()); - setBarrierFree(value.getBarrierFree()); - setNutrition(value.getNutrition()); - setDriverProvidePlaces(value.getDriverProvidePlaces()); - setWantPlaceInCar(value.getWantPlaceInCar()); - setDiseases(value.getDiseases()); - setRequirePayment(value.getRequirePayment()); - setFkAge(value.getFkAge()); - setDay0(value.getDay0()); - setDay1(value.getDay1()); - setDay2(value.getDay2()); - setDay3(value.getDay3()); - setDay4(value.getDay4()); - setTowels(value.getTowels()); - setBedLinen(value.getBedLinen()); - setCot(value.getCot()); - resetChangedOnNotNull(); - } - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/records/VParticipantRecord.java b/src/main/java/de/jottyfan/bico/db/camp/tables/records/VParticipantRecord.java deleted file mode 100644 index ac59e3e..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/records/VParticipantRecord.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables.records; - - -import de.jottyfan.bico.db.camp.tables.VParticipant; - -import org.jooq.impl.TableRecordImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class VParticipantRecord extends TableRecordImpl { - - private static final long serialVersionUID = 1L; - - /** - * Setter for camp.v_participant.males. - */ - public VParticipantRecord setMales(Long value) { - set(0, value); - return this; - } - - /** - * Getter for camp.v_participant.males. - */ - public Long getMales() { - return (Long) get(0); - } - - /** - * Setter for camp.v_participant.females. - */ - public VParticipantRecord setFemales(Long value) { - set(1, value); - return this; - } - - /** - * Getter for camp.v_participant.females. - */ - public Long getFemales() { - return (Long) get(1); - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached VParticipantRecord - */ - public VParticipantRecord() { - super(VParticipant.V_PARTICIPANT); - } - - /** - * Create a detached, initialised VParticipantRecord - */ - public VParticipantRecord(Long males, Long females) { - super(VParticipant.V_PARTICIPANT); - - setMales(males); - setFemales(females); - resetChangedOnNotNull(); - } - - /** - * Create a detached, initialised VParticipantRecord - */ - public VParticipantRecord(de.jottyfan.bico.db.camp.tables.pojos.VParticipant value) { - super(VParticipant.V_PARTICIPANT); - - if (value != null) { - setMales(value.getMales()); - setFemales(value.getFemales()); - resetChangedOnNotNull(); - } - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/tables/records/VVersionRecord.java b/src/main/java/de/jottyfan/bico/db/camp/tables/records/VVersionRecord.java deleted file mode 100644 index a4972ea..0000000 --- a/src/main/java/de/jottyfan/bico/db/camp/tables/records/VVersionRecord.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package de.jottyfan.bico.db.camp.tables.records; - - -import de.jottyfan.bico.db.camp.tables.VVersion; - -import org.jooq.impl.TableRecordImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public class VVersionRecord extends TableRecordImpl { - - private static final long serialVersionUID = 1L; - - /** - * Setter for camp.v_version.version. - */ - public VVersionRecord setVersion(Integer value) { - set(0, value); - return this; - } - - /** - * Getter for camp.v_version.version. - */ - public Integer getVersion() { - return (Integer) get(0); - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached VVersionRecord - */ - public VVersionRecord() { - super(VVersion.V_VERSION); - } - - /** - * Create a detached, initialised VVersionRecord - */ - public VVersionRecord(Integer version) { - super(VVersion.V_VERSION); - - setVersion(version); - resetChangedOnNotNull(); - } - - /** - * Create a detached, initialised VVersionRecord - */ - public VVersionRecord(de.jottyfan.bico.db.camp.tables.pojos.VVersion value) { - super(VVersion.V_VERSION); - - if (value != null) { - setVersion(value.getVersion()); - resetChangedOnNotNull(); - } - } -} diff --git a/src/main/java/de/jottyfan/bico/db/camp/enums/EnumSex.java b/src/main/java/de/jottyfan/bico/db/enums/EnumGroupname.java similarity index 65% rename from src/main/java/de/jottyfan/bico/db/camp/enums/EnumSex.java rename to src/main/java/de/jottyfan/bico/db/enums/EnumGroupname.java index 1a9c463..192df82 100644 --- a/src/main/java/de/jottyfan/bico/db/camp/enums/EnumSex.java +++ b/src/main/java/de/jottyfan/bico/db/enums/EnumGroupname.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.camp.enums; +package de.jottyfan.bico.db.enums; -import de.jottyfan.bico.db.camp.Camp; +import de.jottyfan.bico.db.Public; import org.jooq.Catalog; import org.jooq.EnumType; @@ -15,15 +15,15 @@ import org.jooq.Schema; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" }) -public enum EnumSex implements EnumType { +public enum EnumGroupname implements EnumType { - männlich("männlich"), + bibleclass("bibleclass"), - weiblich("weiblich"); + youthgroup("youthgroup"); private final String literal; - private EnumSex(String literal) { + private EnumGroupname(String literal) { this.literal = literal; } @@ -34,12 +34,12 @@ public enum EnumSex implements EnumType { @Override public Schema getSchema() { - return Camp.CAMP; + return Public.PUBLIC; } @Override public String getName() { - return "enum_sex"; + return "enum_groupname"; } @Override @@ -52,7 +52,7 @@ public enum EnumSex implements EnumType { * null, if no such value could be found, see {@link * EnumType#lookupLiteral(Class, String)}. */ - public static EnumSex lookupLiteral(String literal) { - return EnumType.lookupLiteral(EnumSex.class, literal); + public static EnumGroupname lookupLiteral(String literal) { + return EnumType.lookupLiteral(EnumGroupname.class, literal); } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/TLesson.java b/src/main/java/de/jottyfan/bico/db/tables/TLesson.java similarity index 95% rename from src/main/java/de/jottyfan/bico/db/public_/tables/TLesson.java rename to src/main/java/de/jottyfan/bico/db/tables/TLesson.java index 1fe862a..1ff81d7 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/TLesson.java +++ b/src/main/java/de/jottyfan/bico/db/tables/TLesson.java @@ -1,16 +1,16 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Keys; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.TLessonSubject.TLessonSubjectPath; -import de.jottyfan.bico.db.public_.tables.TPerson.TPersonPath; -import de.jottyfan.bico.db.public_.tables.TSlot.TSlotPath; -import de.jottyfan.bico.db.public_.tables.TSubject.TSubjectPath; -import de.jottyfan.bico.db.public_.tables.records.TLessonRecord; +import de.jottyfan.bico.db.Keys; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.TLessonSubject.TLessonSubjectPath; +import de.jottyfan.bico.db.tables.TPerson.TPersonPath; +import de.jottyfan.bico.db.tables.TSlot.TSlotPath; +import de.jottyfan.bico.db.tables.TSubject.TSubjectPath; +import de.jottyfan.bico.db.tables.records.TLessonRecord; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/TLessonSubject.java b/src/main/java/de/jottyfan/bico/db/tables/TLessonSubject.java similarity index 96% rename from src/main/java/de/jottyfan/bico/db/public_/tables/TLessonSubject.java rename to src/main/java/de/jottyfan/bico/db/tables/TLessonSubject.java index f66e7bd..88b5bcd 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/TLessonSubject.java +++ b/src/main/java/de/jottyfan/bico/db/tables/TLessonSubject.java @@ -1,14 +1,14 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Keys; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.TLesson.TLessonPath; -import de.jottyfan.bico.db.public_.tables.TSubject.TSubjectPath; -import de.jottyfan.bico.db.public_.tables.records.TLessonSubjectRecord; +import de.jottyfan.bico.db.Keys; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.TLesson.TLessonPath; +import de.jottyfan.bico.db.tables.TSubject.TSubjectPath; +import de.jottyfan.bico.db.tables.records.TLessonSubjectRecord; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/TPerson.java b/src/main/java/de/jottyfan/bico/db/tables/TPerson.java similarity index 96% rename from src/main/java/de/jottyfan/bico/db/public_/tables/TPerson.java rename to src/main/java/de/jottyfan/bico/db/tables/TPerson.java index 4f83266..da97555 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/TPerson.java +++ b/src/main/java/de/jottyfan/bico/db/tables/TPerson.java @@ -1,13 +1,13 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Keys; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.TLesson.TLessonPath; -import de.jottyfan.bico.db.public_.tables.records.TPersonRecord; +import de.jottyfan.bico.db.Keys; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.TLesson.TLessonPath; +import de.jottyfan.bico.db.tables.records.TPersonRecord; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/TProfile.java b/src/main/java/de/jottyfan/bico/db/tables/TProfile.java similarity index 96% rename from src/main/java/de/jottyfan/bico/db/public_/tables/TProfile.java rename to src/main/java/de/jottyfan/bico/db/tables/TProfile.java index 850e472..dded369 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/TProfile.java +++ b/src/main/java/de/jottyfan/bico/db/tables/TProfile.java @@ -1,12 +1,12 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Keys; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.records.TProfileRecord; +import de.jottyfan.bico.db.Keys; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.records.TProfileRecord; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/TSlot.java b/src/main/java/de/jottyfan/bico/db/tables/TSlot.java similarity index 92% rename from src/main/java/de/jottyfan/bico/db/public_/tables/TSlot.java rename to src/main/java/de/jottyfan/bico/db/tables/TSlot.java index 5aa4e7b..acba744 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/TSlot.java +++ b/src/main/java/de/jottyfan/bico/db/tables/TSlot.java @@ -1,13 +1,14 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Keys; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.TLesson.TLessonPath; -import de.jottyfan.bico.db.public_.tables.records.TSlotRecord; +import de.jottyfan.bico.db.Keys; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.enums.EnumGroupname; +import de.jottyfan.bico.db.tables.TLesson.TLessonPath; +import de.jottyfan.bico.db.tables.records.TSlotRecord; import java.time.LocalDate; import java.util.Arrays; @@ -73,6 +74,11 @@ public class TSlot extends TableImpl { */ public final TableField NOTE = createField(DSL.name("note"), SQLDataType.CLOB, this, ""); + /** + * The column public.t_slot.groupname. + */ + public final TableField GROUPNAME = createField(DSL.name("groupname"), SQLDataType.VARCHAR.nullable(false).defaultValue(DSL.field(DSL.raw("'bibleclass'::enum_groupname"), SQLDataType.VARCHAR)).asEnumDataType(EnumGroupname.class), this, ""); + private TSlot(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/TSource.java b/src/main/java/de/jottyfan/bico/db/tables/TSource.java similarity index 96% rename from src/main/java/de/jottyfan/bico/db/public_/tables/TSource.java rename to src/main/java/de/jottyfan/bico/db/tables/TSource.java index 87616bf..af97b66 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/TSource.java +++ b/src/main/java/de/jottyfan/bico/db/tables/TSource.java @@ -1,13 +1,13 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Keys; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.TSubject.TSubjectPath; -import de.jottyfan.bico.db.public_.tables.records.TSourceRecord; +import de.jottyfan.bico.db.Keys; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.TSubject.TSubjectPath; +import de.jottyfan.bico.db.tables.records.TSourceRecord; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/TSubject.java b/src/main/java/de/jottyfan/bico/db/tables/TSubject.java similarity index 95% rename from src/main/java/de/jottyfan/bico/db/public_/tables/TSubject.java rename to src/main/java/de/jottyfan/bico/db/tables/TSubject.java index 1b2356f..06c1287 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/TSubject.java +++ b/src/main/java/de/jottyfan/bico/db/tables/TSubject.java @@ -1,15 +1,15 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Keys; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.TLesson.TLessonPath; -import de.jottyfan.bico.db.public_.tables.TLessonSubject.TLessonSubjectPath; -import de.jottyfan.bico.db.public_.tables.TSource.TSourcePath; -import de.jottyfan.bico.db.public_.tables.records.TSubjectRecord; +import de.jottyfan.bico.db.Keys; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.TLesson.TLessonPath; +import de.jottyfan.bico.db.tables.TLessonSubject.TLessonSubjectPath; +import de.jottyfan.bico.db.tables.TSource.TSourcePath; +import de.jottyfan.bico.db.tables.records.TSubjectRecord; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/VCalendar.java b/src/main/java/de/jottyfan/bico/db/tables/VCalendar.java similarity index 92% rename from src/main/java/de/jottyfan/bico/db/public_/tables/VCalendar.java rename to src/main/java/de/jottyfan/bico/db/tables/VCalendar.java index 0c1fa6a..afebcd7 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/VCalendar.java +++ b/src/main/java/de/jottyfan/bico/db/tables/VCalendar.java @@ -1,11 +1,11 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.records.VCalendarRecord; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.records.VCalendarRecord; import java.time.LocalDate; import java.util.Collection; @@ -138,13 +138,23 @@ public class VCalendar extends TableImpl { */ public final TableField PK_SOURCE = createField(DSL.name("pk_source"), SQLDataType.INTEGER, this, ""); + /** + * The column public.v_calendar.bibleclass. + */ + public final TableField BIBLECLASS = createField(DSL.name("bibleclass"), SQLDataType.BOOLEAN, this, ""); + + /** + * The column public.v_calendar.youthgroup. + */ + public final TableField YOUTHGROUP = createField(DSL.name("youthgroup"), SQLDataType.BOOLEAN, this, ""); + private VCalendar(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } private VCalendar(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_calendar" as SELECT d.slot_day, + CREATE VIEW "v_calendar" AS SELECT d.slot_day, ((p.forename || ' '::text) || p.surname) AS fullname, p.abbreviation, o.name AS source_name, @@ -161,7 +171,9 @@ public class VCalendar extends TableImpl { ls.pk_lesson_subject, p.pk_person, s.pk_subject, - o.pk_source + o.pk_source, + (d.groupname = 'bibleclass'::enum_groupname) AS bibleclass, + (d.groupname = 'youthgroup'::enum_groupname) AS youthgroup FROM (((((t_slot d LEFT JOIN t_lesson l ON ((l.fk_slot = d.pk_slot))) LEFT JOIN t_lesson_subject ls ON ((ls.fk_lesson = l.pk_lesson))) diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/VLesson.java b/src/main/java/de/jottyfan/bico/db/tables/VLesson.java similarity index 96% rename from src/main/java/de/jottyfan/bico/db/public_/tables/VLesson.java rename to src/main/java/de/jottyfan/bico/db/tables/VLesson.java index 26df824..59defd2 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/VLesson.java +++ b/src/main/java/de/jottyfan/bico/db/tables/VLesson.java @@ -1,11 +1,11 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.records.VLessonRecord; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.records.VLessonRecord; import java.time.LocalDate; import java.util.Collection; @@ -84,7 +84,7 @@ public class VLesson extends TableImpl { private VLesson(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_lesson" as SELECT su.pk_subject, + CREATE VIEW "v_lesson" AS SELECT su.pk_subject, s.name AS source_name, su.theme, su.subtheme, diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/VLessonMissing.java b/src/main/java/de/jottyfan/bico/db/tables/VLessonMissing.java similarity index 96% rename from src/main/java/de/jottyfan/bico/db/public_/tables/VLessonMissing.java rename to src/main/java/de/jottyfan/bico/db/tables/VLessonMissing.java index 71ec4a7..305da37 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/VLessonMissing.java +++ b/src/main/java/de/jottyfan/bico/db/tables/VLessonMissing.java @@ -1,11 +1,11 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.records.VLessonMissingRecord; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.records.VLessonMissingRecord; import java.util.Collection; @@ -73,7 +73,7 @@ public class VLessonMissing extends TableImpl { private VLessonMissing(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_lesson_missing" as SELECT s.name AS source_name, + CREATE VIEW "v_lesson_missing" AS SELECT s.name AS source_name, su.theme, su.subtheme, su.order_nr diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/VVersion.java b/src/main/java/de/jottyfan/bico/db/tables/VVersion.java similarity index 95% rename from src/main/java/de/jottyfan/bico/db/public_/tables/VVersion.java rename to src/main/java/de/jottyfan/bico/db/tables/VVersion.java index 6b6b91e..14d56bf 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/VVersion.java +++ b/src/main/java/de/jottyfan/bico/db/tables/VVersion.java @@ -1,11 +1,11 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables; +package de.jottyfan.bico.db.tables; -import de.jottyfan.bico.db.public_.Public; -import de.jottyfan.bico.db.public_.tables.records.VVersionRecord; +import de.jottyfan.bico.db.Public; +import de.jottyfan.bico.db.tables.records.VVersionRecord; import java.util.Collection; @@ -58,7 +58,7 @@ public class VVersion extends TableImpl { private VVersion(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "v_version" as SELECT 8 AS version; + CREATE VIEW "v_version" AS SELECT 9 AS version; """), where); } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TLesson.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/TLesson.java similarity index 98% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TLesson.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/TLesson.java index 95604da..d9bb4d9 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TLesson.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/TLesson.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TLessonSubject.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/TLessonSubject.java similarity index 98% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TLessonSubject.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/TLessonSubject.java index 917f1cc..1f6a61e 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TLessonSubject.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/TLessonSubject.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TPerson.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/TPerson.java similarity index 98% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TPerson.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/TPerson.java index feb7d4b..c2aaf27 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TPerson.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/TPerson.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TProfile.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/TProfile.java similarity index 98% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TProfile.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/TProfile.java index 97caf1d..5fa4ac3 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TProfile.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/TProfile.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TSlot.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/TSlot.java similarity index 77% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TSlot.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/TSlot.java index a219572..d62d468 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TSlot.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/TSlot.java @@ -1,9 +1,11 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; +import de.jottyfan.bico.db.enums.EnumGroupname; + import java.io.Serializable; import java.time.LocalDate; @@ -19,21 +21,25 @@ public class TSlot implements Serializable { private final Integer pkSlot; private final LocalDate slotDay; private final String note; + private final EnumGroupname groupname; public TSlot(TSlot value) { this.pkSlot = value.pkSlot; this.slotDay = value.slotDay; this.note = value.note; + this.groupname = value.groupname; } public TSlot( Integer pkSlot, LocalDate slotDay, - String note + String note, + EnumGroupname groupname ) { this.pkSlot = pkSlot; this.slotDay = slotDay; this.note = note; + this.groupname = groupname; } /** @@ -57,6 +63,13 @@ public class TSlot implements Serializable { return this.note; } + /** + * Getter for public.t_slot.groupname. + */ + public EnumGroupname getGroupname() { + return this.groupname; + } + @Override public boolean equals(Object obj) { if (this == obj) @@ -84,6 +97,12 @@ public class TSlot implements Serializable { } else if (!this.note.equals(other.note)) return false; + if (this.groupname == null) { + if (other.groupname != null) + return false; + } + else if (!this.groupname.equals(other.groupname)) + return false; return true; } @@ -94,6 +113,7 @@ public class TSlot implements Serializable { result = prime * result + ((this.pkSlot == null) ? 0 : this.pkSlot.hashCode()); result = prime * result + ((this.slotDay == null) ? 0 : this.slotDay.hashCode()); result = prime * result + ((this.note == null) ? 0 : this.note.hashCode()); + result = prime * result + ((this.groupname == null) ? 0 : this.groupname.hashCode()); return result; } @@ -104,6 +124,7 @@ public class TSlot implements Serializable { sb.append(pkSlot); sb.append(", ").append(slotDay); sb.append(", ").append(note); + sb.append(", ").append(groupname); sb.append(")"); return sb.toString(); diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TSource.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/TSource.java similarity index 97% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TSource.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/TSource.java index c27fbb4..84d32d9 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TSource.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/TSource.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TSubject.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/TSubject.java similarity index 99% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TSubject.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/TSubject.java index e0a86af..839be5f 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/TSubject.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/TSubject.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VCalendar.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/VCalendar.java similarity index 90% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VCalendar.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/VCalendar.java index 42a0a54..3e3faec 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VCalendar.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/VCalendar.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; @@ -34,6 +34,8 @@ public class VCalendar implements Serializable { private final Integer pkPerson; private final Integer pkSubject; private final Integer pkSource; + private final Boolean bibleclass; + private final Boolean youthgroup; public VCalendar(VCalendar value) { this.slotDay = value.slotDay; @@ -54,6 +56,8 @@ public class VCalendar implements Serializable { this.pkPerson = value.pkPerson; this.pkSubject = value.pkSubject; this.pkSource = value.pkSource; + this.bibleclass = value.bibleclass; + this.youthgroup = value.youthgroup; } public VCalendar( @@ -74,7 +78,9 @@ public class VCalendar implements Serializable { Integer pkLessonSubject, Integer pkPerson, Integer pkSubject, - Integer pkSource + Integer pkSource, + Boolean bibleclass, + Boolean youthgroup ) { this.slotDay = slotDay; this.fullname = fullname; @@ -94,6 +100,8 @@ public class VCalendar implements Serializable { this.pkPerson = pkPerson; this.pkSubject = pkSubject; this.pkSource = pkSource; + this.bibleclass = bibleclass; + this.youthgroup = youthgroup; } /** @@ -222,6 +230,20 @@ public class VCalendar implements Serializable { return this.pkSource; } + /** + * Getter for public.v_calendar.bibleclass. + */ + public Boolean getBibleclass() { + return this.bibleclass; + } + + /** + * Getter for public.v_calendar.youthgroup. + */ + public Boolean getYouthgroup() { + return this.youthgroup; + } + @Override public boolean equals(Object obj) { if (this == obj) @@ -339,6 +361,18 @@ public class VCalendar implements Serializable { } else if (!this.pkSource.equals(other.pkSource)) return false; + if (this.bibleclass == null) { + if (other.bibleclass != null) + return false; + } + else if (!this.bibleclass.equals(other.bibleclass)) + return false; + if (this.youthgroup == null) { + if (other.youthgroup != null) + return false; + } + else if (!this.youthgroup.equals(other.youthgroup)) + return false; return true; } @@ -364,6 +398,8 @@ public class VCalendar implements Serializable { result = prime * result + ((this.pkPerson == null) ? 0 : this.pkPerson.hashCode()); result = prime * result + ((this.pkSubject == null) ? 0 : this.pkSubject.hashCode()); result = prime * result + ((this.pkSource == null) ? 0 : this.pkSource.hashCode()); + result = prime * result + ((this.bibleclass == null) ? 0 : this.bibleclass.hashCode()); + result = prime * result + ((this.youthgroup == null) ? 0 : this.youthgroup.hashCode()); return result; } @@ -389,6 +425,8 @@ public class VCalendar implements Serializable { sb.append(", ").append(pkPerson); sb.append(", ").append(pkSubject); sb.append(", ").append(pkSource); + sb.append(", ").append(bibleclass); + sb.append(", ").append(youthgroup); sb.append(")"); return sb.toString(); diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VLesson.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/VLesson.java similarity index 98% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VLesson.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/VLesson.java index b7affe8..a378007 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VLesson.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/VLesson.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VLessonMissing.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/VLessonMissing.java similarity index 98% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VLessonMissing.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/VLessonMissing.java index 0aa0340..0041d08 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VLessonMissing.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/VLessonMissing.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VVersion.java b/src/main/java/de/jottyfan/bico/db/tables/pojos/VVersion.java similarity index 96% rename from src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VVersion.java rename to src/main/java/de/jottyfan/bico/db/tables/pojos/VVersion.java index 18b8d11..b1ba53b 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/pojos/VVersion.java +++ b/src/main/java/de/jottyfan/bico/db/tables/pojos/VVersion.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.pojos; +package de.jottyfan.bico.db.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TLessonRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/TLessonRecord.java similarity index 91% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/TLessonRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/TLessonRecord.java index d4eb460..34c753e 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TLessonRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/TLessonRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.TLesson; +import de.jottyfan.bico.db.tables.TLesson; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -108,13 +108,13 @@ public class TLessonRecord extends UpdatableRecordImpl { setFkSlot(fkSlot); setFkPerson(fkPerson); setNotes(notes); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } /** * Create a detached, initialised TLessonRecord */ - public TLessonRecord(de.jottyfan.bico.db.public_.tables.pojos.TLesson value) { + public TLessonRecord(de.jottyfan.bico.db.tables.pojos.TLesson value) { super(TLesson.T_LESSON); if (value != null) { @@ -122,7 +122,7 @@ public class TLessonRecord extends UpdatableRecordImpl { setFkSlot(value.getFkSlot()); setFkPerson(value.getFkPerson()); setNotes(value.getNotes()); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TLessonSubjectRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/TLessonSubjectRecord.java similarity index 90% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/TLessonSubjectRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/TLessonSubjectRecord.java index de80eb0..53a0614 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TLessonSubjectRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/TLessonSubjectRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.TLessonSubject; +import de.jottyfan.bico.db.tables.TLessonSubject; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -92,20 +92,20 @@ public class TLessonSubjectRecord extends UpdatableRecordImpl { setForename(forename); setSurname(surname); setAbbreviation(abbreviation); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } /** * Create a detached, initialised TPersonRecord */ - public TPersonRecord(de.jottyfan.bico.db.public_.tables.pojos.TPerson value) { + public TPersonRecord(de.jottyfan.bico.db.tables.pojos.TPerson value) { super(TPerson.T_PERSON); if (value != null) { @@ -122,7 +122,7 @@ public class TPersonRecord extends UpdatableRecordImpl { setForename(value.getForename()); setSurname(value.getSurname()); setAbbreviation(value.getAbbreviation()); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TProfileRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/TProfileRecord.java similarity index 90% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/TProfileRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/TProfileRecord.java index 283dc4b..09a3005 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TProfileRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/TProfileRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.TProfile; +import de.jottyfan.bico.db.tables.TProfile; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -92,20 +92,20 @@ public class TProfileRecord extends UpdatableRecordImpl { setId(id); setUsername(username); setTheme(theme); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } /** * Create a detached, initialised TProfileRecord */ - public TProfileRecord(de.jottyfan.bico.db.public_.tables.pojos.TProfile value) { + public TProfileRecord(de.jottyfan.bico.db.tables.pojos.TProfile value) { super(TProfile.T_PROFILE); if (value != null) { setId(value.getId()); setUsername(value.getUsername()); setTheme(value.getTheme()); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TSlotRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/TSlotRecord.java similarity index 76% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/TSlotRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/TSlotRecord.java index 5e12fd6..a563a73 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TSlotRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/TSlotRecord.java @@ -1,10 +1,11 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.TSlot; +import de.jottyfan.bico.db.enums.EnumGroupname; +import de.jottyfan.bico.db.tables.TSlot; import java.time.LocalDate; @@ -65,6 +66,21 @@ public class TSlotRecord extends UpdatableRecordImpl { return (String) get(2); } + /** + * Setter for public.t_slot.groupname. + */ + public TSlotRecord setGroupname(EnumGroupname value) { + set(3, value); + return this; + } + + /** + * Getter for public.t_slot.groupname. + */ + public EnumGroupname getGroupname() { + return (EnumGroupname) get(3); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -88,26 +104,28 @@ public class TSlotRecord extends UpdatableRecordImpl { /** * Create a detached, initialised TSlotRecord */ - public TSlotRecord(Integer pkSlot, LocalDate slotDay, String note) { + public TSlotRecord(Integer pkSlot, LocalDate slotDay, String note, EnumGroupname groupname) { super(TSlot.T_SLOT); setPkSlot(pkSlot); setSlotDay(slotDay); setNote(note); - resetChangedOnNotNull(); + setGroupname(groupname); + resetTouchedOnNotNull(); } /** * Create a detached, initialised TSlotRecord */ - public TSlotRecord(de.jottyfan.bico.db.public_.tables.pojos.TSlot value) { + public TSlotRecord(de.jottyfan.bico.db.tables.pojos.TSlot value) { super(TSlot.T_SLOT); if (value != null) { setPkSlot(value.getPkSlot()); setSlotDay(value.getSlotDay()); setNote(value.getNote()); - resetChangedOnNotNull(); + setGroupname(value.getGroupname()); + resetTouchedOnNotNull(); } } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TSourceRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/TSourceRecord.java similarity index 88% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/TSourceRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/TSourceRecord.java index 1bcc324..0604057 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TSourceRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/TSourceRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.TSource; +import de.jottyfan.bico.db.tables.TSource; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -76,19 +76,19 @@ public class TSourceRecord extends UpdatableRecordImpl { setPkSource(pkSource); setName(name); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } /** * Create a detached, initialised TSourceRecord */ - public TSourceRecord(de.jottyfan.bico.db.public_.tables.pojos.TSource value) { + public TSourceRecord(de.jottyfan.bico.db.tables.pojos.TSource value) { super(TSource.T_SOURCE); if (value != null) { setPkSource(value.getPkSource()); setName(value.getName()); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TSubjectRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/TSubjectRecord.java similarity index 95% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/TSubjectRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/TSubjectRecord.java index c358bca..0e2f622 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/TSubjectRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/TSubjectRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.TSubject; +import de.jottyfan.bico.db.tables.TSubject; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -188,13 +188,13 @@ public class TSubjectRecord extends UpdatableRecordImpl { setBibleverse(bibleverse); setNotes(notes); setOrderNr(orderNr); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } /** * Create a detached, initialised TSubjectRecord */ - public TSubjectRecord(de.jottyfan.bico.db.public_.tables.pojos.TSubject value) { + public TSubjectRecord(de.jottyfan.bico.db.tables.pojos.TSubject value) { super(TSubject.T_SUBJECT); if (value != null) { @@ -207,7 +207,7 @@ public class TSubjectRecord extends UpdatableRecordImpl { setBibleverse(value.getBibleverse()); setNotes(value.getNotes()); setOrderNr(value.getOrderNr()); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/VCalendarRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/VCalendarRecord.java similarity index 88% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/VCalendarRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/VCalendarRecord.java index 78031dd..af31558 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/VCalendarRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/VCalendarRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.VCalendar; +import de.jottyfan.bico.db.tables.VCalendar; import java.time.LocalDate; @@ -289,6 +289,36 @@ public class VCalendarRecord extends TableRecordImpl { return (Integer) get(17); } + /** + * Setter for public.v_calendar.bibleclass. + */ + public VCalendarRecord setBibleclass(Boolean value) { + set(18, value); + return this; + } + + /** + * Getter for public.v_calendar.bibleclass. + */ + public Boolean getBibleclass() { + return (Boolean) get(18); + } + + /** + * Setter for public.v_calendar.youthgroup. + */ + public VCalendarRecord setYouthgroup(Boolean value) { + set(19, value); + return this; + } + + /** + * Getter for public.v_calendar.youthgroup. + */ + public Boolean getYouthgroup() { + return (Boolean) get(19); + } + // ------------------------------------------------------------------------- // Constructors // ------------------------------------------------------------------------- @@ -303,7 +333,7 @@ public class VCalendarRecord extends TableRecordImpl { /** * Create a detached, initialised VCalendarRecord */ - public VCalendarRecord(LocalDate slotDay, String fullname, String abbreviation, String sourceName, String theme, String subtheme, String bookPages, String worksheets, String bibleverse, String subjectNotes, String lessonNotes, String slotNotes, Integer pkSlot, Integer pkLesson, Integer pkLessonSubject, Integer pkPerson, Integer pkSubject, Integer pkSource) { + public VCalendarRecord(LocalDate slotDay, String fullname, String abbreviation, String sourceName, String theme, String subtheme, String bookPages, String worksheets, String bibleverse, String subjectNotes, String lessonNotes, String slotNotes, Integer pkSlot, Integer pkLesson, Integer pkLessonSubject, Integer pkPerson, Integer pkSubject, Integer pkSource, Boolean bibleclass, Boolean youthgroup) { super(VCalendar.V_CALENDAR); setSlotDay(slotDay); @@ -324,13 +354,15 @@ public class VCalendarRecord extends TableRecordImpl { setPkPerson(pkPerson); setPkSubject(pkSubject); setPkSource(pkSource); - resetChangedOnNotNull(); + setBibleclass(bibleclass); + setYouthgroup(youthgroup); + resetTouchedOnNotNull(); } /** * Create a detached, initialised VCalendarRecord */ - public VCalendarRecord(de.jottyfan.bico.db.public_.tables.pojos.VCalendar value) { + public VCalendarRecord(de.jottyfan.bico.db.tables.pojos.VCalendar value) { super(VCalendar.V_CALENDAR); if (value != null) { @@ -352,7 +384,9 @@ public class VCalendarRecord extends TableRecordImpl { setPkPerson(value.getPkPerson()); setPkSubject(value.getPkSubject()); setPkSource(value.getPkSource()); - resetChangedOnNotNull(); + setBibleclass(value.getBibleclass()); + setYouthgroup(value.getYouthgroup()); + resetTouchedOnNotNull(); } } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/VLessonMissingRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/VLessonMissingRecord.java similarity index 90% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/VLessonMissingRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/VLessonMissingRecord.java index ed9e33d..3b4707c 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/VLessonMissingRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/VLessonMissingRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.VLessonMissing; +import de.jottyfan.bico.db.tables.VLessonMissing; import org.jooq.impl.TableRecordImpl; @@ -98,13 +98,13 @@ public class VLessonMissingRecord extends TableRecordImpl setTheme(theme); setSubtheme(subtheme); setOrderNr(orderNr); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } /** * Create a detached, initialised VLessonMissingRecord */ - public VLessonMissingRecord(de.jottyfan.bico.db.public_.tables.pojos.VLessonMissing value) { + public VLessonMissingRecord(de.jottyfan.bico.db.tables.pojos.VLessonMissing value) { super(VLessonMissing.V_LESSON_MISSING); if (value != null) { @@ -112,7 +112,7 @@ public class VLessonMissingRecord extends TableRecordImpl setTheme(value.getTheme()); setSubtheme(value.getSubtheme()); setOrderNr(value.getOrderNr()); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/VLessonRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/VLessonRecord.java similarity index 93% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/VLessonRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/VLessonRecord.java index 6fb3e4a..82280ce 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/VLessonRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/VLessonRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.VLesson; +import de.jottyfan.bico.db.tables.VLesson; import java.time.LocalDate; @@ -132,13 +132,13 @@ public class VLessonRecord extends TableRecordImpl { setSubtheme(subtheme); setSlots(slots); setOrderNr(orderNr); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } /** * Create a detached, initialised VLessonRecord */ - public VLessonRecord(de.jottyfan.bico.db.public_.tables.pojos.VLesson value) { + public VLessonRecord(de.jottyfan.bico.db.tables.pojos.VLesson value) { super(VLesson.V_LESSON); if (value != null) { @@ -148,7 +148,7 @@ public class VLessonRecord extends TableRecordImpl { setSubtheme(value.getSubtheme()); setSlots(value.getSlots()); setOrderNr(value.getOrderNr()); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } } } diff --git a/src/main/java/de/jottyfan/bico/db/public_/tables/records/VVersionRecord.java b/src/main/java/de/jottyfan/bico/db/tables/records/VVersionRecord.java similarity index 83% rename from src/main/java/de/jottyfan/bico/db/public_/tables/records/VVersionRecord.java rename to src/main/java/de/jottyfan/bico/db/tables/records/VVersionRecord.java index 60ace8a..82bb191 100644 --- a/src/main/java/de/jottyfan/bico/db/public_/tables/records/VVersionRecord.java +++ b/src/main/java/de/jottyfan/bico/db/tables/records/VVersionRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package de.jottyfan.bico.db.public_.tables.records; +package de.jottyfan.bico.db.tables.records; -import de.jottyfan.bico.db.public_.tables.VVersion; +import de.jottyfan.bico.db.tables.VVersion; import org.jooq.impl.TableRecordImpl; @@ -50,18 +50,18 @@ public class VVersionRecord extends TableRecordImpl { super(VVersion.V_VERSION); setVersion(version); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } /** * Create a detached, initialised VVersionRecord */ - public VVersionRecord(de.jottyfan.bico.db.public_.tables.pojos.VVersion value) { + public VVersionRecord(de.jottyfan.bico.db.tables.pojos.VVersion value) { super(VVersion.V_VERSION); if (value != null) { setVersion(value.getVersion()); - resetChangedOnNotNull(); + resetTouchedOnNotNull(); } } } diff --git a/src/main/resources/v9.sql b/src/main/resources/v9.sql new file mode 100644 index 0000000..a7616cd --- /dev/null +++ b/src/main/resources/v9.sql @@ -0,0 +1,34 @@ +create type public.enum_groupname as enum ('bibleclass', 'youthgroup'); + +alter table public.t_slot add column groupname enum_groupname not null default 'bibleclass'; + +create or replace view v_calendar as +SELECT d.slot_day, + p.forename || ' ' || p.surname AS fullname, + p.abbreviation, + o.name AS source_name, + s.theme, + s.subtheme, + s.book_pages, + s.worksheets, + s.bibleverse, + s.notes AS subject_notes, + l.notes AS lesson_notes, + d.note AS slot_notes, + d.pk_slot, + l.pk_lesson, + ls.pk_lesson_subject, + p.pk_person, + s.pk_subject, + o.pk_source, + d.groupname = 'bibleclass'::enum_groupname as bibleclass, + d.groupname = 'youthgroup'::enum_groupname as youthgroup +FROM public.t_slot d +LEFT JOIN public.t_lesson l ON l.fk_slot = d.pk_slot +LEFT JOIN public.t_lesson_subject ls ON ls.fk_lesson = l.pk_lesson +LEFT JOIN public.t_person p ON p.pk_person = l.fk_person +LEFT JOIN public.t_subject s ON s.pk_subject = ls.fk_subject +LEFT JOIN public.t_source o ON o.pk_source = s.fk_source; + +create or replace view v_version as +select 9 as version;