diff --git a/.gradle/6.8/fileChanges/last-build.bin b/.gradle/6.8/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/6.8/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/6.8/fileHashes/fileHashes.lock b/.gradle/6.8/fileHashes/fileHashes.lock deleted file mode 100644 index 182796b..0000000 Binary files a/.gradle/6.8/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/6.8/gc.properties b/.gradle/6.8/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/7.3/checksums/checksums.lock b/.gradle/7.3/checksums/checksums.lock index b05f18b..c0b49f4 100644 Binary files a/.gradle/7.3/checksums/checksums.lock and b/.gradle/7.3/checksums/checksums.lock differ diff --git a/.gradle/7.3/checksums/md5-checksums.bin b/.gradle/7.3/checksums/md5-checksums.bin index 1aa84be..cf1bcff 100644 Binary files a/.gradle/7.3/checksums/md5-checksums.bin and b/.gradle/7.3/checksums/md5-checksums.bin differ diff --git a/.gradle/7.3/checksums/sha1-checksums.bin b/.gradle/7.3/checksums/sha1-checksums.bin index 033a6eb..851111b 100644 Binary files a/.gradle/7.3/checksums/sha1-checksums.bin and b/.gradle/7.3/checksums/sha1-checksums.bin differ diff --git a/.gradle/7.3/executionHistory/executionHistory.bin b/.gradle/7.3/executionHistory/executionHistory.bin index b5c5202..21e1b1d 100644 Binary files a/.gradle/7.3/executionHistory/executionHistory.bin and b/.gradle/7.3/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.3/executionHistory/executionHistory.lock b/.gradle/7.3/executionHistory/executionHistory.lock index 96e8d6d..d08223d 100644 Binary files a/.gradle/7.3/executionHistory/executionHistory.lock and b/.gradle/7.3/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.3/fileHashes/fileHashes.bin b/.gradle/7.3/fileHashes/fileHashes.bin index 102101d..b809d36 100644 Binary files a/.gradle/7.3/fileHashes/fileHashes.bin and b/.gradle/7.3/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.3/fileHashes/fileHashes.lock b/.gradle/7.3/fileHashes/fileHashes.lock index 6b33b1d..4c3c693 100644 Binary files a/.gradle/7.3/fileHashes/fileHashes.lock and b/.gradle/7.3/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b61a465..ae1f22f 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index af7beba..129b103 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 1ba2c17..4efd0c8 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/build.gradle b/build.gradle index 4aafbb6..abf5c1b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,19 @@ +buildscript { + repositories { + mavenLocal() + mavenCentral() + maven { url "https://repo.maven.apache.org/maven2" } + maven { url "https://plugins.gradle.org/m2/" } + jcenter() + } + dependencies { + classpath 'org.jooq:jooq-codegen:3.16.4' + classpath 'org.postgresql:postgresql:42.3.2' + classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release' + classpath 'nu.studer.jooq:nu.studer.jooq.gradle.plugin:7.1.1' + } +} + plugins { id 'nu.studer.jooq' version '7.1.1' } @@ -6,7 +22,7 @@ apply plugin: 'java' apply plugin: 'maven-publish' group = 'de.jottyfan' -version = '2021.02' +version = '2023.03' description = """COJooq""" @@ -16,6 +32,7 @@ targetCompatibility = 11 repositories { mavenLocal() mavenCentral() + maven { url "https://repo.maven.apache.org/maven2" } } dependencies { @@ -81,9 +98,8 @@ publishing { } repositories { maven { - url = layout.buildDirectory.dir("/home/henkej/git/libs/") + url = layout.buildDirectory.dir("/home/jotty/git/libs/") } } } - diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumCamprole.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumCamprole.java index 38dcd52..5541112 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumCamprole.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/enums/EnumCamprole.java @@ -23,7 +23,9 @@ public enum EnumCamprole implements EnumType { director("director"), - feeder("feeder"); + feeder("feeder"), + + observer("observer"); private final String literal; diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPerson.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPerson.java index 4f25fc5..882baf9 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPerson.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/TPerson.java @@ -21,7 +21,7 @@ import org.jooq.ForeignKey; import org.jooq.Identity; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row19; +import org.jooq.Row20; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -148,6 +148,11 @@ public class TPerson extends TableImpl { */ public final TableField CONSENT_CATALOG_PHOTO = createField(DSL.name("consent_catalog_photo"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field("false", SQLDataType.BOOLEAN)), this, ""); + /** + * The column camp.t_person.required_price. + */ + public final TableField REQUIRED_PRICE = createField(DSL.name("required_price"), SQLDataType.NUMERIC(7, 2), this, ""); + private TPerson(Name alias, Table aliased) { this(alias, aliased, null); } @@ -269,11 +274,11 @@ public class TPerson extends TableImpl { } // ------------------------------------------------------------------------- - // Row19 type methods + // Row20 type methods // ------------------------------------------------------------------------- @Override - public Row19 fieldsRow() { - return (Row19) super.fieldsRow(); + public Row20 fieldsRow() { + return (Row20) super.fieldsRow(); } } diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPerson.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPerson.java index e0537fd..07461a3 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPerson.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/pojos/TPerson.java @@ -40,6 +40,7 @@ public class TPerson implements Serializable { private final BigDecimal paid; private final String comment; private final Boolean consentCatalogPhoto; + private final BigDecimal requiredPrice; public TPerson(TPerson value) { this.pk = value.pk; @@ -61,6 +62,7 @@ public class TPerson implements Serializable { this.paid = value.paid; this.comment = value.comment; this.consentCatalogPhoto = value.consentCatalogPhoto; + this.requiredPrice = value.requiredPrice; } public TPerson( @@ -82,7 +84,8 @@ public class TPerson implements Serializable { Integer fkRegistrator, BigDecimal paid, String comment, - Boolean consentCatalogPhoto + Boolean consentCatalogPhoto, + BigDecimal requiredPrice ) { this.pk = pk; this.forename = forename; @@ -103,6 +106,7 @@ public class TPerson implements Serializable { this.paid = paid; this.comment = comment; this.consentCatalogPhoto = consentCatalogPhoto; + this.requiredPrice = requiredPrice; } /** @@ -238,6 +242,13 @@ public class TPerson implements Serializable { return this.consentCatalogPhoto; } + /** + * Getter for camp.t_person.required_price. + */ + public BigDecimal getRequiredPrice() { + return this.requiredPrice; + } + @Override public String toString() { StringBuilder sb = new StringBuilder("TPerson ("); @@ -261,6 +272,7 @@ public class TPerson implements Serializable { sb.append(", ").append(paid); sb.append(", ").append(comment); sb.append(", ").append(consentCatalogPhoto); + sb.append(", ").append(requiredPrice); sb.append(")"); return sb.toString(); diff --git a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersonRecord.java b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersonRecord.java index e0bdc42..b72db29 100644 --- a/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersonRecord.java +++ b/src/main/java/de/jottyfan/camporganizer/db/jooq/tables/records/TPersonRecord.java @@ -14,8 +14,8 @@ import java.time.LocalDateTime; import org.jooq.Field; import org.jooq.Record1; -import org.jooq.Record19; -import org.jooq.Row19; +import org.jooq.Record20; +import org.jooq.Row20; import org.jooq.impl.UpdatableRecordImpl; @@ -23,7 +23,7 @@ import org.jooq.impl.UpdatableRecordImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TPersonRecord extends UpdatableRecordImpl implements Record19 { +public class TPersonRecord extends UpdatableRecordImpl implements Record20 { private static final long serialVersionUID = 1L; @@ -312,6 +312,21 @@ public class TPersonRecord extends UpdatableRecordImpl implements return (Boolean) get(18); } + /** + * Setter for camp.t_person.required_price. + */ + public TPersonRecord setRequiredPrice(BigDecimal value) { + set(19, value); + return this; + } + + /** + * Getter for camp.t_person.required_price. + */ + public BigDecimal getRequiredPrice() { + return (BigDecimal) get(19); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -322,17 +337,17 @@ public class TPersonRecord extends UpdatableRecordImpl implements } // ------------------------------------------------------------------------- - // Record19 type implementation + // Record20 type implementation // ------------------------------------------------------------------------- @Override - public Row19 fieldsRow() { - return (Row19) super.fieldsRow(); + public Row20 fieldsRow() { + return (Row20) super.fieldsRow(); } @Override - public Row19 valuesRow() { - return (Row19) super.valuesRow(); + public Row20 valuesRow() { + return (Row20) super.valuesRow(); } @Override @@ -430,6 +445,11 @@ public class TPersonRecord extends UpdatableRecordImpl implements return TPerson.T_PERSON.CONSENT_CATALOG_PHOTO; } + @Override + public Field field20() { + return TPerson.T_PERSON.REQUIRED_PRICE; + } + @Override public Integer component1() { return getPk(); @@ -525,6 +545,11 @@ public class TPersonRecord extends UpdatableRecordImpl implements return getConsentCatalogPhoto(); } + @Override + public BigDecimal component20() { + return getRequiredPrice(); + } + @Override public Integer value1() { return getPk(); @@ -620,6 +645,11 @@ public class TPersonRecord extends UpdatableRecordImpl implements return getConsentCatalogPhoto(); } + @Override + public BigDecimal value20() { + return getRequiredPrice(); + } + @Override public TPersonRecord value1(Integer value) { setPk(value); @@ -735,7 +765,13 @@ public class TPersonRecord extends UpdatableRecordImpl implements } @Override - public TPersonRecord values(Integer value1, String value2, String value3, String value4, String value5, String value6, String value7, LocalDate value8, EnumCamprole value9, String value10, Integer value11, Integer value12, Boolean value13, LocalDateTime value14, EnumSex value15, Integer value16, BigDecimal value17, String value18, Boolean value19) { + public TPersonRecord value20(BigDecimal value) { + setRequiredPrice(value); + return this; + } + + @Override + public TPersonRecord values(Integer value1, String value2, String value3, String value4, String value5, String value6, String value7, LocalDate value8, EnumCamprole value9, String value10, Integer value11, Integer value12, Boolean value13, LocalDateTime value14, EnumSex value15, Integer value16, BigDecimal value17, String value18, Boolean value19, BigDecimal value20) { value1(value1); value2(value2); value3(value3); @@ -755,6 +791,7 @@ public class TPersonRecord extends UpdatableRecordImpl implements value17(value17); value18(value18); value19(value19); + value20(value20); return this; } @@ -772,7 +809,7 @@ public class TPersonRecord extends UpdatableRecordImpl implements /** * Create a detached, initialised TPersonRecord */ - public TPersonRecord(Integer pk, String forename, String surname, String street, String zip, String city, String phone, LocalDate birthdate, EnumCamprole camprole, String email, Integer fkCamp, Integer fkProfile, Boolean accept, LocalDateTime created, EnumSex sex, Integer fkRegistrator, BigDecimal paid, String comment, Boolean consentCatalogPhoto) { + public TPersonRecord(Integer pk, String forename, String surname, String street, String zip, String city, String phone, LocalDate birthdate, EnumCamprole camprole, String email, Integer fkCamp, Integer fkProfile, Boolean accept, LocalDateTime created, EnumSex sex, Integer fkRegistrator, BigDecimal paid, String comment, Boolean consentCatalogPhoto, BigDecimal requiredPrice) { super(TPerson.T_PERSON); setPk(pk); @@ -794,6 +831,7 @@ public class TPersonRecord extends UpdatableRecordImpl implements setPaid(paid); setComment(comment); setConsentCatalogPhoto(consentCatalogPhoto); + setRequiredPrice(requiredPrice); } /** @@ -822,6 +860,7 @@ public class TPersonRecord extends UpdatableRecordImpl implements setPaid(value.getPaid()); setComment(value.getComment()); setConsentCatalogPhoto(value.getConsentCatalogPhoto()); + setRequiredPrice(value.getRequiredPrice()); } } }