diff --git a/.classpath b/.classpath index fa7119b..56e8fb3 100644 --- a/.classpath +++ b/.classpath @@ -24,11 +24,7 @@ - - - - - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 049e42f..3a21537 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 14e5ac1..cea524a 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,5 +3,5 @@ - + diff --git a/build.gradle b/build.gradle index ae0e795..5d5d27d 100644 --- a/build.gradle +++ b/build.gradle @@ -8,10 +8,10 @@ buildscript { } dependencies { classpath 'com.google.code.gson:gson:2.8.5' - classpath 'org.jooq:jooq-codegen:3.11.9' - classpath 'org.postgresql:postgresql:42.2.5' + classpath 'org.jooq:jooq-codegen:3.12.1' + classpath 'org.postgresql:postgresql:42.2.6' classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release' - classpath 'nu.studer:gradle-jooq-plugin:3.0.2' + classpath 'nu.studer:gradle-jooq-plugin:3.0.3' } } @@ -22,7 +22,7 @@ apply plugin: 'eclipse' apply plugin: 'nu.studer.jooq' group = 'jottyfan' -version = '1.0.4' +version = '1.0.5' description = """timetrack""" @@ -36,36 +36,37 @@ tasks.withType(JavaCompile) { repositories { mavenLocal() mavenCentral() - maven { url "http://vps207887.ovh.net/mvnrepo" } + maven { url "https://www.jottyfan.de/mvnrepo" } maven { url "https://repo.maven.apache.org/maven2" } } dependencies { compile 'org.jboss.weld.servlet:weld-servlet:2.4.8.Final' - compile 'org.apache.myfaces.core:myfaces-api:2.3.3' - compile 'org.apache.myfaces.core:myfaces-impl:2.3.3' - compile 'net.bootsfaces:bootsfaces:1.4.1' - compile 'de.jooqFaces:jooqFaces:0.1.3-SNAPSHOT' - compile 'org.postgresql:postgresql:42.2.5' - compile 'org.jooq:jooq:3.11.9' - compile 'org.jooq:jooq-codegen:3.11.9' + compile 'org.apache.myfaces.core:myfaces-api:2.3.4' + compile 'org.apache.myfaces.core:myfaces-impl:2.3.4' + compile 'net.bootsfaces:bootsfaces:1.4.2' + compile 'de.jooqFaces:jooqFaces:0.4.6' + compile 'org.postgresql:postgresql:42.2.6' + compile 'org.jooq:jooq:3.12.1' + compile 'org.jooq:jooq-codegen:3.12.1' compile 'com.google.code.gson:gson:2.8.5' - compile 'org.jasypt:jasypt:1.9.2' + compile 'org.jasypt:jasypt:1.9.3' compile 'javax.servlet:javax.servlet-api:4.0.1' - compile 'org.apache.logging.log4j:log4j-core:2.11.1' - compile 'org.apache.logging.log4j:log4j-api:2.11.1' + compile 'org.apache.logging.log4j:log4j-core:2.12.1' + compile 'org.apache.logging.log4j:log4j-api:2.12.1' - testCompile 'junit:junit:4.12' + testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2' + testCompile 'org.junit.jupiter:junit-jupiter-engine:5.5.2' - runtime 'org.postgresql:postgresql:42.2.5' + runtime 'org.postgresql:postgresql:42.2.6' - jooqRuntime 'org.postgresql:postgresql:42.2.5' + jooqRuntime 'org.postgresql:postgresql:42.2.6' } jooq { edition = 'OSS' - version = '3.11.9' + version = '3.12.1' timetrack (sourceSets.main) { jdbc { driver = 'org.postgresql.Driver' diff --git a/src/jooq/java/de/jottyfan/timetrack/db/DefaultCatalog.java b/src/jooq/java/de/jottyfan/timetrack/db/DefaultCatalog.java index f5924f7..7ad48dd 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/DefaultCatalog.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/DefaultCatalog.java @@ -4,6 +4,11 @@ package de.jottyfan.timetrack.db; +import de.jottyfan.timetrack.db.contact.Contact; +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.note.Note; +import de.jottyfan.timetrack.db.profile.Profile; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -13,11 +18,6 @@ import javax.annotation.Generated; import org.jooq.Schema; import org.jooq.impl.CatalogImpl; -import de.jottyfan.timetrack.db.contact.Contact; -import de.jottyfan.timetrack.db.done.Done; -import de.jottyfan.timetrack.db.note.Note; -import de.jottyfan.timetrack.db.profile.Profile; - /** * This class is generated by jOOQ. @@ -25,14 +25,14 @@ import de.jottyfan.timetrack.db.profile.Profile; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = 2027686892; + private static final long serialVersionUID = 1875812553; /** * The reference instance of diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/Contact.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/Contact.java index dfc34f1..1accc22 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/Contact.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/Contact.java @@ -4,6 +4,9 @@ package de.jottyfan.timetrack.db.contact; +import de.jottyfan.timetrack.db.DefaultCatalog; +import de.jottyfan.timetrack.db.contact.tables.TContact; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -14,9 +17,6 @@ import org.jooq.Catalog; import org.jooq.Table; import org.jooq.impl.SchemaImpl; -import de.jottyfan.timetrack.db.DefaultCatalog; -import de.jottyfan.timetrack.db.contact.tables.TContact; - /** * This class is generated by jOOQ. @@ -24,14 +24,14 @@ import de.jottyfan.timetrack.db.contact.tables.TContact; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Contact extends SchemaImpl { - private static final long serialVersionUID = -206762222; + private static final long serialVersionUID = 2007599284; /** * The reference instance of contact @@ -51,9 +51,6 @@ public class Contact extends SchemaImpl { } - /** - * {@inheritDoc} - */ @Override public Catalog getCatalog() { return DefaultCatalog.DEFAULT_CATALOG; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/Indexes.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/Indexes.java index 2e03647..baf9b37 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/Indexes.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/Indexes.java @@ -4,14 +4,14 @@ package de.jottyfan.timetrack.db.contact; +import de.jottyfan.timetrack.db.contact.tables.TContact; + import javax.annotation.Generated; import org.jooq.Index; import org.jooq.OrderField; import org.jooq.impl.Internal; -import de.jottyfan.timetrack.db.contact.tables.TContact; - /** * A class modelling indexes of tables of the contact schema. @@ -19,7 +19,7 @@ import de.jottyfan.timetrack.db.contact.tables.TContact; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/Tables.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/Tables.java index c187456..dcc488d 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/Tables.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/Tables.java @@ -4,10 +4,10 @@ package de.jottyfan.timetrack.db.contact; -import javax.annotation.Generated; - import de.jottyfan.timetrack.db.contact.tables.TContact; +import javax.annotation.Generated; + /** * Convenience access to all tables in contact @@ -15,7 +15,7 @@ import de.jottyfan.timetrack.db.contact.tables.TContact; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @@ -25,5 +25,5 @@ public class Tables { /** * The table contact.t_contact. */ - public static final TContact T_CONTACT = de.jottyfan.timetrack.db.contact.tables.TContact.T_CONTACT; + public static final TContact T_CONTACT = TContact.T_CONTACT; } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/enums/EnumContacttype.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/enums/EnumContacttype.java index 532ee5d..46b8517 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/enums/EnumContacttype.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/enums/EnumContacttype.java @@ -4,14 +4,14 @@ package de.jottyfan.timetrack.db.contact.enums; +import de.jottyfan.timetrack.db.contact.Contact; + import javax.annotation.Generated; import org.jooq.Catalog; import org.jooq.EnumType; import org.jooq.Schema; -import de.jottyfan.timetrack.db.contact.Contact; - /** * This class is generated by jOOQ. @@ -19,7 +19,7 @@ import de.jottyfan.timetrack.db.contact.Contact; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @@ -42,33 +42,21 @@ public enum EnumContacttype implements EnumType { this.literal = literal; } - /** - * {@inheritDoc} - */ @Override public Catalog getCatalog() { return getSchema() == null ? null : getSchema().getCatalog(); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Contact.CONTACT; } - /** - * {@inheritDoc} - */ @Override public String getName() { return "enum_contacttype"; } - /** - * {@inheritDoc} - */ @Override public String getLiteral() { return literal; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/TContact.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/TContact.java index f0902ee..82a4eef 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/TContact.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/TContact.java @@ -4,6 +4,11 @@ package de.jottyfan.timetrack.db.contact.tables; +import de.jottyfan.timetrack.db.contact.Contact; +import de.jottyfan.timetrack.db.contact.Indexes; +import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; +import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord; + import java.util.Arrays; import java.util.List; @@ -14,17 +19,13 @@ import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row5; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.contact.Contact; -import de.jottyfan.timetrack.db.contact.Indexes; -import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; -import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord; - /** * This class is generated by jOOQ. @@ -32,14 +33,14 @@ import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TContact extends TableImpl { - private static final long serialVersionUID = 1349495675; + private static final long serialVersionUID = -1913430710; /** * The reference instance of contact.t_contact @@ -57,27 +58,27 @@ public class TContact extends TableImpl { /** * The column contact.t_contact.pk. */ - public final TableField PK = createField("pk", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column contact.t_contact.forename. */ - public final TableField FORENAME = createField("forename", org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); + public final TableField FORENAME = createField(DSL.name("forename"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); /** * The column contact.t_contact.surname. */ - public final TableField SURNAME = createField("surname", org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); + public final TableField SURNAME = createField(DSL.name("surname"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); /** * The column contact.t_contact.contact. */ - public final TableField CONTACT = createField("contact", org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); + public final TableField CONTACT = createField(DSL.name("contact"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); /** * The column contact.t_contact.type. */ - public final TableField TYPE = createField("type", org.jooq.impl.SQLDataType.VARCHAR.nullable(false).asEnumDataType(de.jottyfan.timetrack.db.contact.enums.EnumContacttype.class), this, ""); + public final TableField TYPE = createField(DSL.name("type"), org.jooq.impl.SQLDataType.VARCHAR.nullable(false).asEnumDataType(de.jottyfan.timetrack.db.contact.enums.EnumContacttype.class), this, ""); /** * Create a contact.t_contact table reference @@ -112,33 +113,21 @@ public class TContact extends TableImpl { super(child, key, T_CONTACT); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Contact.CONTACT; } - /** - * {@inheritDoc} - */ @Override public List getIndexes() { return Arrays.asList(Indexes.T_CONTACT_PKEY); } - /** - * {@inheritDoc} - */ @Override public TContact as(String alias) { return new TContact(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public TContact as(Name alias) { return new TContact(alias, this); @@ -159,4 +148,13 @@ public class TContact extends TableImpl { public TContact rename(Name name) { return new TContact(name, null); } + + // ------------------------------------------------------------------------- + // Row5 type methods + // ------------------------------------------------------------------------- + + @Override + public Row5 fieldsRow() { + return (Row5) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/records/TContactRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/records/TContactRecord.java index 17cd523..d0ff648 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/records/TContactRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/records/TContactRecord.java @@ -4,6 +4,9 @@ package de.jottyfan.timetrack.db.contact.tables.records; +import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; +import de.jottyfan.timetrack.db.contact.tables.TContact; + import javax.annotation.Generated; import org.jooq.Field; @@ -11,9 +14,6 @@ import org.jooq.Record5; import org.jooq.Row5; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; -import de.jottyfan.timetrack.db.contact.tables.TContact; - /** * This class is generated by jOOQ. @@ -21,14 +21,14 @@ import de.jottyfan.timetrack.db.contact.tables.TContact; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TContactRecord extends TableRecordImpl implements Record5 { - private static final long serialVersionUID = 815817311; + private static final long serialVersionUID = 875007667; /** * Setter for contact.t_contact.pk. @@ -104,190 +104,121 @@ public class TContactRecord extends TableRecordImpl implements R // Record5 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row5 fieldsRow() { return (Row5) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row5 valuesRow() { return (Row5) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return TContact.T_CONTACT.PK; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return TContact.T_CONTACT.FORENAME; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return TContact.T_CONTACT.SURNAME; } - /** - * {@inheritDoc} - */ @Override public Field field4() { return TContact.T_CONTACT.CONTACT; } - /** - * {@inheritDoc} - */ @Override public Field field5() { return TContact.T_CONTACT.TYPE; } - /** - * {@inheritDoc} - */ @Override public Integer component1() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String component2() { return getForename(); } - /** - * {@inheritDoc} - */ @Override public String component3() { return getSurname(); } - /** - * {@inheritDoc} - */ @Override public String component4() { return getContact(); } - /** - * {@inheritDoc} - */ @Override public EnumContacttype component5() { return getType(); } - /** - * {@inheritDoc} - */ @Override public Integer value1() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String value2() { return getForename(); } - /** - * {@inheritDoc} - */ @Override public String value3() { return getSurname(); } - /** - * {@inheritDoc} - */ @Override public String value4() { return getContact(); } - /** - * {@inheritDoc} - */ @Override public EnumContacttype value5() { return getType(); } - /** - * {@inheritDoc} - */ @Override public TContactRecord value1(Integer value) { setPk(value); return this; } - /** - * {@inheritDoc} - */ @Override public TContactRecord value2(String value) { setForename(value); return this; } - /** - * {@inheritDoc} - */ @Override public TContactRecord value3(String value) { setSurname(value); return this; } - /** - * {@inheritDoc} - */ @Override public TContactRecord value4(String value) { setContact(value); return this; } - /** - * {@inheritDoc} - */ @Override public TContactRecord value5(EnumContacttype value) { setType(value); return this; } - /** - * {@inheritDoc} - */ @Override public TContactRecord values(Integer value1, String value2, String value3, String value4, EnumContacttype value5) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/Done.java b/src/jooq/java/de/jottyfan/timetrack/db/done/Done.java index 5cbc150..aed00a0 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/Done.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/Done.java @@ -4,6 +4,21 @@ package de.jottyfan.timetrack.db.done; +import de.jottyfan.timetrack.db.DefaultCatalog; +import de.jottyfan.timetrack.db.done.tables.TDone; +import de.jottyfan.timetrack.db.done.tables.TJob; +import de.jottyfan.timetrack.db.done.tables.TModule; +import de.jottyfan.timetrack.db.done.tables.TProject; +import de.jottyfan.timetrack.db.done.tables.VDaily; +import de.jottyfan.timetrack.db.done.tables.VDaylimits; +import de.jottyfan.timetrack.db.done.tables.VDaysummary; +import de.jottyfan.timetrack.db.done.tables.VDone; +import de.jottyfan.timetrack.db.done.tables.VDuration; +import de.jottyfan.timetrack.db.done.tables.VHamster; +import de.jottyfan.timetrack.db.done.tables.VHamstersummary; +import de.jottyfan.timetrack.db.done.tables.VTasklist; +import de.jottyfan.timetrack.db.done.tables.VTotalofday; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -14,14 +29,6 @@ import org.jooq.Catalog; import org.jooq.Table; import org.jooq.impl.SchemaImpl; -import de.jottyfan.timetrack.db.DefaultCatalog; -import de.jottyfan.timetrack.db.done.tables.TDone; -import de.jottyfan.timetrack.db.done.tables.TJob; -import de.jottyfan.timetrack.db.done.tables.TModule; -import de.jottyfan.timetrack.db.done.tables.TProject; -import de.jottyfan.timetrack.db.done.tables.VTasklist; -import de.jottyfan.timetrack.db.done.tables.VTotalofday; - /** * This class is generated by jOOQ. @@ -29,14 +36,14 @@ import de.jottyfan.timetrack.db.done.tables.VTotalofday; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Done extends SchemaImpl { - private static final long serialVersionUID = 1049524459; + private static final long serialVersionUID = -1471367006; /** * The reference instance of done @@ -63,6 +70,41 @@ public class Done extends SchemaImpl { */ public final TProject T_PROJECT = de.jottyfan.timetrack.db.done.tables.TProject.T_PROJECT; + /** + * The table done.v_daily. + */ + public final VDaily V_DAILY = de.jottyfan.timetrack.db.done.tables.VDaily.V_DAILY; + + /** + * The table done.v_daylimits. + */ + public final VDaylimits V_DAYLIMITS = de.jottyfan.timetrack.db.done.tables.VDaylimits.V_DAYLIMITS; + + /** + * The table done.v_daysummary. + */ + public final VDaysummary V_DAYSUMMARY = de.jottyfan.timetrack.db.done.tables.VDaysummary.V_DAYSUMMARY; + + /** + * The table done.v_done. + */ + public final VDone V_DONE = de.jottyfan.timetrack.db.done.tables.VDone.V_DONE; + + /** + * The table done.v_duration. + */ + public final VDuration V_DURATION = de.jottyfan.timetrack.db.done.tables.VDuration.V_DURATION; + + /** + * The table done.v_hamster. + */ + public final VHamster V_HAMSTER = de.jottyfan.timetrack.db.done.tables.VHamster.V_HAMSTER; + + /** + * The table done.v_hamstersummary. + */ + public final VHamstersummary V_HAMSTERSUMMARY = de.jottyfan.timetrack.db.done.tables.VHamstersummary.V_HAMSTERSUMMARY; + /** * The table done.v_tasklist. */ @@ -81,9 +123,6 @@ public class Done extends SchemaImpl { } - /** - * {@inheritDoc} - */ @Override public Catalog getCatalog() { return DefaultCatalog.DEFAULT_CATALOG; @@ -102,6 +141,13 @@ public class Done extends SchemaImpl { TJob.T_JOB, TModule.T_MODULE, TProject.T_PROJECT, + VDaily.V_DAILY, + VDaylimits.V_DAYLIMITS, + VDaysummary.V_DAYSUMMARY, + VDone.V_DONE, + VDuration.V_DURATION, + VHamster.V_HAMSTER, + VHamstersummary.V_HAMSTERSUMMARY, VTasklist.V_TASKLIST, VTotalofday.V_TOTALOFDAY); } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/Indexes.java b/src/jooq/java/de/jottyfan/timetrack/db/done/Indexes.java index aff8631..0a7dd7b 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/Indexes.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/Indexes.java @@ -4,17 +4,17 @@ package de.jottyfan.timetrack.db.done; +import de.jottyfan.timetrack.db.done.tables.TDone; +import de.jottyfan.timetrack.db.done.tables.TJob; +import de.jottyfan.timetrack.db.done.tables.TModule; +import de.jottyfan.timetrack.db.done.tables.TProject; + import javax.annotation.Generated; import org.jooq.Index; import org.jooq.OrderField; import org.jooq.impl.Internal; -import de.jottyfan.timetrack.db.done.tables.TDone; -import de.jottyfan.timetrack.db.done.tables.TJob; -import de.jottyfan.timetrack.db.done.tables.TModule; -import de.jottyfan.timetrack.db.done.tables.TProject; - /** * A class modelling indexes of tables of the done schema. @@ -22,7 +22,7 @@ import de.jottyfan.timetrack.db.done.tables.TProject; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/Tables.java b/src/jooq/java/de/jottyfan/timetrack/db/done/Tables.java index 00e47b8..292e780 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/Tables.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/Tables.java @@ -4,15 +4,22 @@ package de.jottyfan.timetrack.db.done; -import javax.annotation.Generated; - import de.jottyfan.timetrack.db.done.tables.TDone; import de.jottyfan.timetrack.db.done.tables.TJob; import de.jottyfan.timetrack.db.done.tables.TModule; import de.jottyfan.timetrack.db.done.tables.TProject; +import de.jottyfan.timetrack.db.done.tables.VDaily; +import de.jottyfan.timetrack.db.done.tables.VDaylimits; +import de.jottyfan.timetrack.db.done.tables.VDaysummary; +import de.jottyfan.timetrack.db.done.tables.VDone; +import de.jottyfan.timetrack.db.done.tables.VDuration; +import de.jottyfan.timetrack.db.done.tables.VHamster; +import de.jottyfan.timetrack.db.done.tables.VHamstersummary; import de.jottyfan.timetrack.db.done.tables.VTasklist; import de.jottyfan.timetrack.db.done.tables.VTotalofday; +import javax.annotation.Generated; + /** * Convenience access to all tables in done @@ -20,7 +27,7 @@ import de.jottyfan.timetrack.db.done.tables.VTotalofday; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @@ -30,30 +37,65 @@ public class Tables { /** * The table done.t_done. */ - public static final TDone T_DONE = de.jottyfan.timetrack.db.done.tables.TDone.T_DONE; + public static final TDone T_DONE = TDone.T_DONE; /** * The table done.t_job. */ - public static final TJob T_JOB = de.jottyfan.timetrack.db.done.tables.TJob.T_JOB; + public static final TJob T_JOB = TJob.T_JOB; /** * The table done.t_module. */ - public static final TModule T_MODULE = de.jottyfan.timetrack.db.done.tables.TModule.T_MODULE; + public static final TModule T_MODULE = TModule.T_MODULE; /** * The table done.t_project. */ - public static final TProject T_PROJECT = de.jottyfan.timetrack.db.done.tables.TProject.T_PROJECT; + public static final TProject T_PROJECT = TProject.T_PROJECT; + + /** + * The table done.v_daily. + */ + public static final VDaily V_DAILY = VDaily.V_DAILY; + + /** + * The table done.v_daylimits. + */ + public static final VDaylimits V_DAYLIMITS = VDaylimits.V_DAYLIMITS; + + /** + * The table done.v_daysummary. + */ + public static final VDaysummary V_DAYSUMMARY = VDaysummary.V_DAYSUMMARY; + + /** + * The table done.v_done. + */ + public static final VDone V_DONE = VDone.V_DONE; + + /** + * The table done.v_duration. + */ + public static final VDuration V_DURATION = VDuration.V_DURATION; + + /** + * The table done.v_hamster. + */ + public static final VHamster V_HAMSTER = VHamster.V_HAMSTER; + + /** + * The table done.v_hamstersummary. + */ + public static final VHamstersummary V_HAMSTERSUMMARY = VHamstersummary.V_HAMSTERSUMMARY; /** * The table done.v_tasklist. */ - public static final VTasklist V_TASKLIST = de.jottyfan.timetrack.db.done.tables.VTasklist.V_TASKLIST; + public static final VTasklist V_TASKLIST = VTasklist.V_TASKLIST; /** * The table done.v_totalofday. */ - public static final VTotalofday V_TOTALOFDAY = de.jottyfan.timetrack.db.done.tables.VTotalofday.V_TOTALOFDAY; + public static final VTotalofday V_TOTALOFDAY = VTotalofday.V_TOTALOFDAY; } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TDone.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TDone.java index 7685de4..ec02b15 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TDone.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TDone.java @@ -4,6 +4,10 @@ package de.jottyfan.timetrack.db.done.tables; +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.Indexes; +import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord; + import java.sql.Timestamp; import java.util.Arrays; import java.util.List; @@ -15,16 +19,13 @@ import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row8; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.done.Done; -import de.jottyfan.timetrack.db.done.Indexes; -import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord; - /** * This class is generated by jOOQ. @@ -32,14 +33,14 @@ import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TDone extends TableImpl { - private static final long serialVersionUID = 47529789; + private static final long serialVersionUID = -2079648247; /** * The reference instance of done.t_done @@ -57,42 +58,42 @@ public class TDone extends TableImpl { /** * The column done.t_done.lastchange. */ - public final TableField LASTCHANGE = createField("lastchange", org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); + public final TableField LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); /** * The column done.t_done.pk. */ - public final TableField PK = createField("pk", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column done.t_done.time_from. */ - public final TableField TIME_FROM = createField("time_from", org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); + public final TableField TIME_FROM = createField(DSL.name("time_from"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); /** * The column done.t_done.time_until. */ - public final TableField TIME_UNTIL = createField("time_until", org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); + public final TableField TIME_UNTIL = createField(DSL.name("time_until"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); /** * The column done.t_done.fk_project. */ - public final TableField FK_PROJECT = createField("fk_project", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField FK_PROJECT = createField(DSL.name("fk_project"), org.jooq.impl.SQLDataType.INTEGER, this, ""); /** * The column done.t_done.fk_module. */ - public final TableField FK_MODULE = createField("fk_module", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField FK_MODULE = createField(DSL.name("fk_module"), org.jooq.impl.SQLDataType.INTEGER, this, ""); /** * The column done.t_done.fk_job. */ - public final TableField FK_JOB = createField("fk_job", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField FK_JOB = createField(DSL.name("fk_job"), org.jooq.impl.SQLDataType.INTEGER, this, ""); /** * The column done.t_done.fk_login. */ - public final TableField FK_LOGIN = createField("fk_login", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * Create a done.t_done table reference @@ -127,33 +128,21 @@ public class TDone extends TableImpl { super(child, key, T_DONE); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Done.DONE; } - /** - * {@inheritDoc} - */ @Override public List getIndexes() { return Arrays.asList(Indexes.T_DONE_PKEY); } - /** - * {@inheritDoc} - */ @Override public TDone as(String alias) { return new TDone(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public TDone as(Name alias) { return new TDone(alias, this); @@ -174,4 +163,13 @@ public class TDone extends TableImpl { public TDone rename(Name name) { return new TDone(name, null); } + + // ------------------------------------------------------------------------- + // Row8 type methods + // ------------------------------------------------------------------------- + + @Override + public Row8 fieldsRow() { + return (Row8) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TJob.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TJob.java index c407a6b..dad7f1a 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TJob.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TJob.java @@ -4,6 +4,10 @@ package de.jottyfan.timetrack.db.done.tables; +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.Indexes; +import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; + import java.sql.Timestamp; import java.util.Arrays; import java.util.List; @@ -15,16 +19,13 @@ import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row3; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.done.Done; -import de.jottyfan.timetrack.db.done.Indexes; -import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; - /** * This class is generated by jOOQ. @@ -32,14 +33,14 @@ import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TJob extends TableImpl { - private static final long serialVersionUID = -1617909635; + private static final long serialVersionUID = 300367621; /** * The reference instance of done.t_job @@ -57,17 +58,17 @@ public class TJob extends TableImpl { /** * The column done.t_job.lastchange. */ - public final TableField LASTCHANGE = createField("lastchange", org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); + public final TableField LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); /** * The column done.t_job.pk. */ - public final TableField PK = createField("pk", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column done.t_job.name. */ - public final TableField NAME = createField("name", org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); + public final TableField NAME = createField(DSL.name("name"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); /** * Create a done.t_job table reference @@ -102,33 +103,21 @@ public class TJob extends TableImpl { super(child, key, T_JOB); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Done.DONE; } - /** - * {@inheritDoc} - */ @Override public List getIndexes() { return Arrays.asList(Indexes.T_CATEGORY_NAME_KEY, Indexes.T_CATEGORY_PKEY); } - /** - * {@inheritDoc} - */ @Override public TJob as(String alias) { return new TJob(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public TJob as(Name alias) { return new TJob(alias, this); @@ -149,4 +138,13 @@ public class TJob extends TableImpl { public TJob rename(Name name) { return new TJob(name, null); } + + // ------------------------------------------------------------------------- + // Row3 type methods + // ------------------------------------------------------------------------- + + @Override + public Row3 fieldsRow() { + return (Row3) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TModule.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TModule.java index 37692dd..e74a4f9 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TModule.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TModule.java @@ -4,6 +4,10 @@ package de.jottyfan.timetrack.db.done.tables; +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.Indexes; +import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; + import java.sql.Timestamp; import java.util.Arrays; import java.util.List; @@ -15,16 +19,13 @@ import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row3; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.done.Done; -import de.jottyfan.timetrack.db.done.Indexes; -import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; - /** * This class is generated by jOOQ. @@ -32,14 +33,14 @@ import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TModule extends TableImpl { - private static final long serialVersionUID = -173305798; + private static final long serialVersionUID = 1907331946; /** * The reference instance of done.t_module @@ -57,17 +58,17 @@ public class TModule extends TableImpl { /** * The column done.t_module.lastchange. */ - public final TableField LASTCHANGE = createField("lastchange", org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); + public final TableField LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); /** * The column done.t_module.pk. */ - public final TableField PK = createField("pk", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column done.t_module.name. */ - public final TableField NAME = createField("name", org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); + public final TableField NAME = createField(DSL.name("name"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); /** * Create a done.t_module table reference @@ -102,33 +103,21 @@ public class TModule extends TableImpl { super(child, key, T_MODULE); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Done.DONE; } - /** - * {@inheritDoc} - */ @Override public List getIndexes() { return Arrays.asList(Indexes.T_JOB_NAME_KEY, Indexes.T_JOB_PKEY); } - /** - * {@inheritDoc} - */ @Override public TModule as(String alias) { return new TModule(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public TModule as(Name alias) { return new TModule(alias, this); @@ -149,4 +138,13 @@ public class TModule extends TableImpl { public TModule rename(Name name) { return new TModule(name, null); } + + // ------------------------------------------------------------------------- + // Row3 type methods + // ------------------------------------------------------------------------- + + @Override + public Row3 fieldsRow() { + return (Row3) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TProject.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TProject.java index 68ab7f8..ab6a717 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TProject.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TProject.java @@ -4,6 +4,10 @@ package de.jottyfan.timetrack.db.done.tables; +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.Indexes; +import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; + import java.sql.Timestamp; import java.util.Arrays; import java.util.List; @@ -15,16 +19,13 @@ import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row3; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.done.Done; -import de.jottyfan.timetrack.db.done.Indexes; -import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; - /** * This class is generated by jOOQ. @@ -32,14 +33,14 @@ import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TProject extends TableImpl { - private static final long serialVersionUID = -1855268291; + private static final long serialVersionUID = -609416251; /** * The reference instance of done.t_project @@ -57,17 +58,17 @@ public class TProject extends TableImpl { /** * The column done.t_project.lastchange. */ - public final TableField LASTCHANGE = createField("lastchange", org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); + public final TableField LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); /** * The column done.t_project.pk. */ - public final TableField PK = createField("pk", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column done.t_project.name. */ - public final TableField NAME = createField("name", org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); + public final TableField NAME = createField(DSL.name("name"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); /** * Create a done.t_project table reference @@ -102,33 +103,21 @@ public class TProject extends TableImpl { super(child, key, T_PROJECT); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Done.DONE; } - /** - * {@inheritDoc} - */ @Override public List getIndexes() { return Arrays.asList(Indexes.T_PROJECT_NAME_KEY, Indexes.T_PROJECT_PKEY); } - /** - * {@inheritDoc} - */ @Override public TProject as(String alias) { return new TProject(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public TProject as(Name alias) { return new TProject(alias, this); @@ -149,4 +138,13 @@ public class TProject extends TableImpl { public TProject rename(Name name) { return new TProject(name, null); } + + // ------------------------------------------------------------------------- + // Row3 type methods + // ------------------------------------------------------------------------- + + @Override + public Row3 fieldsRow() { + return (Row3) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaily.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaily.java new file mode 100644 index 0000000..1f691fb --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaily.java @@ -0,0 +1,145 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VDailyRecord; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row4; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDaily extends TableImpl { + + private static final long serialVersionUID = -220365849; + + /** + * The reference instance of done.v_daily + */ + public static final VDaily V_DAILY = new VDaily(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VDailyRecord.class; + } + + /** + * The column done.v_daily.worktime. + */ + public final TableField WORKTIME = createField(DSL.name("worktime"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); + + /** + * The column done.v_daily.day. + */ + public final TableField DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_daily.login. + */ + public final TableField LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_daily.fk_login. + */ + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * Create a done.v_daily table reference + */ + public VDaily() { + this(DSL.name("v_daily"), null); + } + + /** + * Create an aliased done.v_daily table reference + */ + public VDaily(String alias) { + this(DSL.name(alias), V_DAILY); + } + + /** + * Create an aliased done.v_daily table reference + */ + public VDaily(Name alias) { + this(alias, V_DAILY); + } + + private VDaily(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VDaily(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VDaily(Table child, ForeignKey key) { + super(child, key, V_DAILY); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VDaily as(String alias) { + return new VDaily(DSL.name(alias), this); + } + + @Override + public VDaily as(Name alias) { + return new VDaily(alias, this); + } + + /** + * Rename this table + */ + @Override + public VDaily rename(String name) { + return new VDaily(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VDaily rename(Name name) { + return new VDaily(name, null); + } + + // ------------------------------------------------------------------------- + // Row4 type methods + // ------------------------------------------------------------------------- + + @Override + public Row4 fieldsRow() { + return (Row4) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaylimits.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaylimits.java new file mode 100644 index 0000000..ce66486 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaylimits.java @@ -0,0 +1,147 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VDaylimitsRecord; + +import java.sql.Timestamp; +import java.time.OffsetDateTime; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row4; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDaylimits extends TableImpl { + + private static final long serialVersionUID = 1186965315; + + /** + * The reference instance of done.v_daylimits + */ + public static final VDaylimits V_DAYLIMITS = new VDaylimits(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VDaylimitsRecord.class; + } + + /** + * The column done.v_daylimits.work_start. + */ + public final TableField WORK_START = createField(DSL.name("work_start"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); + + /** + * The column done.v_daylimits.work_end. + */ + public final TableField WORK_END = createField(DSL.name("work_end"), org.jooq.impl.SQLDataType.TIMESTAMPWITHTIMEZONE, this, ""); + + /** + * The column done.v_daylimits.day. + */ + public final TableField DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_daylimits.fk_login. + */ + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * Create a done.v_daylimits table reference + */ + public VDaylimits() { + this(DSL.name("v_daylimits"), null); + } + + /** + * Create an aliased done.v_daylimits table reference + */ + public VDaylimits(String alias) { + this(DSL.name(alias), V_DAYLIMITS); + } + + /** + * Create an aliased done.v_daylimits table reference + */ + public VDaylimits(Name alias) { + this(alias, V_DAYLIMITS); + } + + private VDaylimits(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VDaylimits(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VDaylimits(Table child, ForeignKey key) { + super(child, key, V_DAYLIMITS); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VDaylimits as(String alias) { + return new VDaylimits(DSL.name(alias), this); + } + + @Override + public VDaylimits as(Name alias) { + return new VDaylimits(alias, this); + } + + /** + * Rename this table + */ + @Override + public VDaylimits rename(String name) { + return new VDaylimits(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VDaylimits rename(Name name) { + return new VDaylimits(name, null); + } + + // ------------------------------------------------------------------------- + // Row4 type methods + // ------------------------------------------------------------------------- + + @Override + public Row4 fieldsRow() { + return (Row4) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaysummary.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaysummary.java new file mode 100644 index 0000000..1af7965 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaysummary.java @@ -0,0 +1,163 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VDaysummaryRecord; + +import java.sql.Timestamp; +import java.time.OffsetDateTime; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row7; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDaysummary extends TableImpl { + + private static final long serialVersionUID = 524060696; + + /** + * The reference instance of done.v_daysummary + */ + public static final VDaysummary V_DAYSUMMARY = new VDaysummary(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VDaysummaryRecord.class; + } + + /** + * The column done.v_daysummary.breaktime. + */ + public final TableField BREAKTIME = createField(DSL.name("breaktime"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); + + /** + * The column done.v_daysummary.worktime. + */ + public final TableField WORKTIME = createField(DSL.name("worktime"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); + + /** + * The column done.v_daysummary.work_start. + */ + public final TableField WORK_START = createField(DSL.name("work_start"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); + + /** + * The column done.v_daysummary.work_end. + */ + public final TableField WORK_END = createField(DSL.name("work_end"), org.jooq.impl.SQLDataType.TIMESTAMPWITHTIMEZONE, this, ""); + + /** + * The column done.v_daysummary.day. + */ + public final TableField DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_daysummary.login. + */ + public final TableField LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_daysummary.fk_login. + */ + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * Create a done.v_daysummary table reference + */ + public VDaysummary() { + this(DSL.name("v_daysummary"), null); + } + + /** + * Create an aliased done.v_daysummary table reference + */ + public VDaysummary(String alias) { + this(DSL.name(alias), V_DAYSUMMARY); + } + + /** + * Create an aliased done.v_daysummary table reference + */ + public VDaysummary(Name alias) { + this(alias, V_DAYSUMMARY); + } + + private VDaysummary(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VDaysummary(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VDaysummary(Table child, ForeignKey key) { + super(child, key, V_DAYSUMMARY); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VDaysummary as(String alias) { + return new VDaysummary(DSL.name(alias), this); + } + + @Override + public VDaysummary as(Name alias) { + return new VDaysummary(alias, this); + } + + /** + * Rename this table + */ + @Override + public VDaysummary rename(String name) { + return new VDaysummary(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VDaysummary rename(Name name) { + return new VDaysummary(name, null); + } + + // ------------------------------------------------------------------------- + // Row7 type methods + // ------------------------------------------------------------------------- + + @Override + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDone.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDone.java new file mode 100644 index 0000000..4837691 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDone.java @@ -0,0 +1,166 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VDoneRecord; + +import java.sql.Timestamp; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row8; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDone extends TableImpl { + + private static final long serialVersionUID = -842360229; + + /** + * The reference instance of done.v_done + */ + public static final VDone V_DONE = new VDone(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VDoneRecord.class; + } + + /** + * The column done.v_done.fk_done. + */ + public final TableField FK_DONE = createField(DSL.name("fk_done"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * The column done.v_done.fk_login. + */ + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * The column done.v_done.time_from. + */ + public final TableField TIME_FROM = createField(DSL.name("time_from"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); + + /** + * The column done.v_done.time_until. + */ + public final TableField TIME_UNTIL = createField(DSL.name("time_until"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); + + /** + * The column done.v_done.project_name. + */ + public final TableField PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_done.module_name. + */ + public final TableField MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_done.job_name. + */ + public final TableField JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_done.login. + */ + public final TableField LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * Create a done.v_done table reference + */ + public VDone() { + this(DSL.name("v_done"), null); + } + + /** + * Create an aliased done.v_done table reference + */ + public VDone(String alias) { + this(DSL.name(alias), V_DONE); + } + + /** + * Create an aliased done.v_done table reference + */ + public VDone(Name alias) { + this(alias, V_DONE); + } + + private VDone(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VDone(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VDone(Table child, ForeignKey key) { + super(child, key, V_DONE); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VDone as(String alias) { + return new VDone(DSL.name(alias), this); + } + + @Override + public VDone as(Name alias) { + return new VDone(alias, this); + } + + /** + * Rename this table + */ + @Override + public VDone rename(String name) { + return new VDone(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VDone rename(Name name) { + return new VDone(name, null); + } + + // ------------------------------------------------------------------------- + // Row8 type methods + // ------------------------------------------------------------------------- + + @Override + public Row8 fieldsRow() { + return (Row8) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDuration.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDuration.java new file mode 100644 index 0000000..35f22f2 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDuration.java @@ -0,0 +1,160 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VDurationRecord; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row7; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDuration extends TableImpl { + + private static final long serialVersionUID = -578535096; + + /** + * The reference instance of done.v_duration + */ + public static final VDuration V_DURATION = new VDuration(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VDurationRecord.class; + } + + /** + * The column done.v_duration.day. + */ + public final TableField DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_duration.duration. + */ + public final TableField DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); + + /** + * The column done.v_duration.project_name. + */ + public final TableField PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_duration.module_name. + */ + public final TableField MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_duration.job_name. + */ + public final TableField JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_duration.login. + */ + public final TableField LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_duration.fk_login. + */ + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * Create a done.v_duration table reference + */ + public VDuration() { + this(DSL.name("v_duration"), null); + } + + /** + * Create an aliased done.v_duration table reference + */ + public VDuration(String alias) { + this(DSL.name(alias), V_DURATION); + } + + /** + * Create an aliased done.v_duration table reference + */ + public VDuration(Name alias) { + this(alias, V_DURATION); + } + + private VDuration(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VDuration(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VDuration(Table child, ForeignKey key) { + super(child, key, V_DURATION); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VDuration as(String alias) { + return new VDuration(DSL.name(alias), this); + } + + @Override + public VDuration as(Name alias) { + return new VDuration(alias, this); + } + + /** + * Rename this table + */ + @Override + public VDuration rename(String name) { + return new VDuration(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VDuration rename(Name name) { + return new VDuration(name, null); + } + + // ------------------------------------------------------------------------- + // Row7 type methods + // ------------------------------------------------------------------------- + + @Override + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamster.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamster.java new file mode 100644 index 0000000..e3a5274 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamster.java @@ -0,0 +1,157 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VHamsterRecord; + +import java.sql.Date; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row6; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VHamster extends TableImpl { + + private static final long serialVersionUID = -137413152; + + /** + * The reference instance of done.v_hamster + */ + public static final VHamster V_HAMSTER = new VHamster(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VHamsterRecord.class; + } + + /** + * The column done.v_hamster.workday. + */ + public final TableField WORKDAY = createField(DSL.name("workday"), org.jooq.impl.SQLDataType.DATE, this, ""); + + /** + * The column done.v_hamster.duration. + */ + public final TableField DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); + + /** + * The column done.v_hamster.project_name. + */ + public final TableField PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_hamster.module_name. + */ + public final TableField MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_hamster.job_name. + */ + public final TableField JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_hamster.login. + */ + public final TableField LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * Create a done.v_hamster table reference + */ + public VHamster() { + this(DSL.name("v_hamster"), null); + } + + /** + * Create an aliased done.v_hamster table reference + */ + public VHamster(String alias) { + this(DSL.name(alias), V_HAMSTER); + } + + /** + * Create an aliased done.v_hamster table reference + */ + public VHamster(Name alias) { + this(alias, V_HAMSTER); + } + + private VHamster(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VHamster(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VHamster(Table child, ForeignKey key) { + super(child, key, V_HAMSTER); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VHamster as(String alias) { + return new VHamster(DSL.name(alias), this); + } + + @Override + public VHamster as(Name alias) { + return new VHamster(alias, this); + } + + /** + * Rename this table + */ + @Override + public VHamster rename(String name) { + return new VHamster(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VHamster rename(Name name) { + return new VHamster(name, null); + } + + // ------------------------------------------------------------------------- + // Row6 type methods + // ------------------------------------------------------------------------- + + @Override + public Row6 fieldsRow() { + return (Row6) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamstersummary.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamstersummary.java new file mode 100644 index 0000000..c158fde --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamstersummary.java @@ -0,0 +1,156 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VHamstersummaryRecord; + +import java.sql.Date; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row6; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VHamstersummary extends TableImpl { + + private static final long serialVersionUID = -285333605; + + /** + * The reference instance of done.v_hamstersummary + */ + public static final VHamstersummary V_HAMSTERSUMMARY = new VHamstersummary(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VHamstersummaryRecord.class; + } + + /** + * The column done.v_hamstersummary.workday. + */ + public final TableField WORKDAY = createField(DSL.name("workday"), org.jooq.impl.SQLDataType.DATE, this, ""); + + /** + * The column done.v_hamstersummary.duration. + */ + public final TableField DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_hamstersummary.project_name. + */ + public final TableField PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_hamstersummary.module_name. + */ + public final TableField MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_hamstersummary.job_name. + */ + public final TableField JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_hamstersummary.login. + */ + public final TableField LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * Create a done.v_hamstersummary table reference + */ + public VHamstersummary() { + this(DSL.name("v_hamstersummary"), null); + } + + /** + * Create an aliased done.v_hamstersummary table reference + */ + public VHamstersummary(String alias) { + this(DSL.name(alias), V_HAMSTERSUMMARY); + } + + /** + * Create an aliased done.v_hamstersummary table reference + */ + public VHamstersummary(Name alias) { + this(alias, V_HAMSTERSUMMARY); + } + + private VHamstersummary(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VHamstersummary(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VHamstersummary(Table child, ForeignKey key) { + super(child, key, V_HAMSTERSUMMARY); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VHamstersummary as(String alias) { + return new VHamstersummary(DSL.name(alias), this); + } + + @Override + public VHamstersummary as(Name alias) { + return new VHamstersummary(alias, this); + } + + /** + * Rename this table + */ + @Override + public VHamstersummary rename(String name) { + return new VHamstersummary(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VHamstersummary rename(Name name) { + return new VHamstersummary(name, null); + } + + // ------------------------------------------------------------------------- + // Row6 type methods + // ------------------------------------------------------------------------- + + @Override + public Row6 fieldsRow() { + return (Row6) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTasklist.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTasklist.java index 32dbfd8..31cbca1 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTasklist.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTasklist.java @@ -4,21 +4,22 @@ package de.jottyfan.timetrack.db.done.tables; +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VTasklistRecord; + import javax.annotation.Generated; import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row6; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.done.Done; -import de.jottyfan.timetrack.db.done.tables.records.VTasklistRecord; - /** * This class is generated by jOOQ. @@ -26,14 +27,14 @@ import de.jottyfan.timetrack.db.done.tables.records.VTasklistRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VTasklist extends TableImpl { - private static final long serialVersionUID = -1582867869; + private static final long serialVersionUID = -109801723; /** * The reference instance of done.v_tasklist @@ -51,32 +52,32 @@ public class VTasklist extends TableImpl { /** * The column done.v_tasklist.day. */ - public final TableField DAY = createField("day", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_tasklist.duration. */ - public final TableField DURATION = createField("duration", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_tasklist.project_name. */ - public final TableField PROJECT_NAME = createField("project_name", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_tasklist.module_name. */ - public final TableField MODULE_NAME = createField("module_name", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_tasklist.job_name. */ - public final TableField JOB_NAME = createField("job_name", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_tasklist.fk_login. */ - public final TableField FK_LOGIN = createField("fk_login", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); /** * Create a done.v_tasklist table reference @@ -111,25 +112,16 @@ public class VTasklist extends TableImpl { super(child, key, V_TASKLIST); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Done.DONE; } - /** - * {@inheritDoc} - */ @Override public VTasklist as(String alias) { return new VTasklist(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public VTasklist as(Name alias) { return new VTasklist(alias, this); @@ -150,4 +142,13 @@ public class VTasklist extends TableImpl { public VTasklist rename(Name name) { return new VTasklist(name, null); } + + // ------------------------------------------------------------------------- + // Row6 type methods + // ------------------------------------------------------------------------- + + @Override + public Row6 fieldsRow() { + return (Row6) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTotalofday.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTotalofday.java index 9e6b0b1..b741885 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTotalofday.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTotalofday.java @@ -4,21 +4,22 @@ package de.jottyfan.timetrack.db.done.tables; +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VTotalofdayRecord; + import javax.annotation.Generated; import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row6; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.done.Done; -import de.jottyfan.timetrack.db.done.tables.records.VTotalofdayRecord; - /** * This class is generated by jOOQ. @@ -26,14 +27,14 @@ import de.jottyfan.timetrack.db.done.tables.records.VTotalofdayRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VTotalofday extends TableImpl { - private static final long serialVersionUID = -893085978; + private static final long serialVersionUID = 1381929458; /** * The reference instance of done.v_totalofday @@ -51,32 +52,32 @@ public class VTotalofday extends TableImpl { /** * The column done.v_totalofday.breaktime. */ - public final TableField BREAKTIME = createField("breaktime", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField BREAKTIME = createField(DSL.name("breaktime"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_totalofday.worktime. */ - public final TableField WORKTIME = createField("worktime", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField WORKTIME = createField(DSL.name("worktime"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_totalofday.starttime. */ - public final TableField STARTTIME = createField("starttime", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField STARTTIME = createField(DSL.name("starttime"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_totalofday.endtime. */ - public final TableField ENDTIME = createField("endtime", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField ENDTIME = createField(DSL.name("endtime"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_totalofday.day. */ - public final TableField DAY = createField("day", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column done.v_totalofday.fk_login. */ - public final TableField FK_LOGIN = createField("fk_login", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); /** * Create a done.v_totalofday table reference @@ -111,25 +112,16 @@ public class VTotalofday extends TableImpl { super(child, key, V_TOTALOFDAY); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Done.DONE; } - /** - * {@inheritDoc} - */ @Override public VTotalofday as(String alias) { return new VTotalofday(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public VTotalofday as(Name alias) { return new VTotalofday(alias, this); @@ -150,4 +142,13 @@ public class VTotalofday extends TableImpl { public VTotalofday rename(Name name) { return new VTotalofday(name, null); } + + // ------------------------------------------------------------------------- + // Row6 type methods + // ------------------------------------------------------------------------- + + @Override + public Row6 fieldsRow() { + return (Row6) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TDoneRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TDoneRecord.java index a54d495..edf6af2 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TDoneRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TDoneRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.done.tables.records; +import de.jottyfan.timetrack.db.done.tables.TDone; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -13,8 +15,6 @@ import org.jooq.Record8; import org.jooq.Row8; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.done.tables.TDone; - /** * This class is generated by jOOQ. @@ -22,14 +22,14 @@ import de.jottyfan.timetrack.db.done.tables.TDone; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TDoneRecord extends TableRecordImpl implements Record8 { - private static final long serialVersionUID = 626421558; + private static final long serialVersionUID = 254775418; /** * Setter for done.t_done.lastchange. @@ -147,289 +147,184 @@ public class TDoneRecord extends TableRecordImpl implements Record8 // Record8 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row8 fieldsRow() { return (Row8) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row8 valuesRow() { return (Row8) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return TDone.T_DONE.LASTCHANGE; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return TDone.T_DONE.PK; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return TDone.T_DONE.TIME_FROM; } - /** - * {@inheritDoc} - */ @Override public Field field4() { return TDone.T_DONE.TIME_UNTIL; } - /** - * {@inheritDoc} - */ @Override public Field field5() { return TDone.T_DONE.FK_PROJECT; } - /** - * {@inheritDoc} - */ @Override public Field field6() { return TDone.T_DONE.FK_MODULE; } - /** - * {@inheritDoc} - */ @Override public Field field7() { return TDone.T_DONE.FK_JOB; } - /** - * {@inheritDoc} - */ @Override public Field field8() { return TDone.T_DONE.FK_LOGIN; } - /** - * {@inheritDoc} - */ @Override public Timestamp component1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer component2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public Timestamp component3() { return getTimeFrom(); } - /** - * {@inheritDoc} - */ @Override public Timestamp component4() { return getTimeUntil(); } - /** - * {@inheritDoc} - */ @Override public Integer component5() { return getFkProject(); } - /** - * {@inheritDoc} - */ @Override public Integer component6() { return getFkModule(); } - /** - * {@inheritDoc} - */ @Override public Integer component7() { return getFkJob(); } - /** - * {@inheritDoc} - */ @Override public Integer component8() { return getFkLogin(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer value2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value3() { return getTimeFrom(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value4() { return getTimeUntil(); } - /** - * {@inheritDoc} - */ @Override public Integer value5() { return getFkProject(); } - /** - * {@inheritDoc} - */ @Override public Integer value6() { return getFkModule(); } - /** - * {@inheritDoc} - */ @Override public Integer value7() { return getFkJob(); } - /** - * {@inheritDoc} - */ @Override public Integer value8() { return getFkLogin(); } - /** - * {@inheritDoc} - */ @Override public TDoneRecord value1(Timestamp value) { setLastchange(value); return this; } - /** - * {@inheritDoc} - */ @Override public TDoneRecord value2(Integer value) { setPk(value); return this; } - /** - * {@inheritDoc} - */ @Override public TDoneRecord value3(Timestamp value) { setTimeFrom(value); return this; } - /** - * {@inheritDoc} - */ @Override public TDoneRecord value4(Timestamp value) { setTimeUntil(value); return this; } - /** - * {@inheritDoc} - */ @Override public TDoneRecord value5(Integer value) { setFkProject(value); return this; } - /** - * {@inheritDoc} - */ @Override public TDoneRecord value6(Integer value) { setFkModule(value); return this; } - /** - * {@inheritDoc} - */ @Override public TDoneRecord value7(Integer value) { setFkJob(value); return this; } - /** - * {@inheritDoc} - */ @Override public TDoneRecord value8(Integer value) { setFkLogin(value); return this; } - /** - * {@inheritDoc} - */ @Override public TDoneRecord values(Timestamp value1, Integer value2, Timestamp value3, Timestamp value4, Integer value5, Integer value6, Integer value7, Integer value8) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TJobRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TJobRecord.java index 84fcbdf..3f419a4 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TJobRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TJobRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.done.tables.records; +import de.jottyfan.timetrack.db.done.tables.TJob; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -13,8 +15,6 @@ import org.jooq.Record3; import org.jooq.Row3; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.done.tables.TJob; - /** * This class is generated by jOOQ. @@ -22,14 +22,14 @@ import de.jottyfan.timetrack.db.done.tables.TJob; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TJobRecord extends TableRecordImpl implements Record3 { - private static final long serialVersionUID = 2822323; + private static final long serialVersionUID = 501080223; /** * Setter for done.t_job.lastchange. @@ -77,124 +77,79 @@ public class TJobRecord extends TableRecordImpl implements Record3 fieldsRow() { return (Row3) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row3 valuesRow() { return (Row3) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return TJob.T_JOB.LASTCHANGE; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return TJob.T_JOB.PK; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return TJob.T_JOB.NAME; } - /** - * {@inheritDoc} - */ @Override public Timestamp component1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer component2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String component3() { return getName(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer value2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String value3() { return getName(); } - /** - * {@inheritDoc} - */ @Override public TJobRecord value1(Timestamp value) { setLastchange(value); return this; } - /** - * {@inheritDoc} - */ @Override public TJobRecord value2(Integer value) { setPk(value); return this; } - /** - * {@inheritDoc} - */ @Override public TJobRecord value3(String value) { setName(value); return this; } - /** - * {@inheritDoc} - */ @Override public TJobRecord values(Timestamp value1, Integer value2, String value3) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TModuleRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TModuleRecord.java index a40aed7..b4268d1 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TModuleRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TModuleRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.done.tables.records; +import de.jottyfan.timetrack.db.done.tables.TModule; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -13,8 +15,6 @@ import org.jooq.Record3; import org.jooq.Row3; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.done.tables.TModule; - /** * This class is generated by jOOQ. @@ -22,14 +22,14 @@ import de.jottyfan.timetrack.db.done.tables.TModule; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TModuleRecord extends TableRecordImpl implements Record3 { - private static final long serialVersionUID = 1076253804; + private static final long serialVersionUID = 1180844514; /** * Setter for done.t_module.lastchange. @@ -77,124 +77,79 @@ public class TModuleRecord extends TableRecordImpl implements Rec // Record3 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row3 valuesRow() { return (Row3) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return TModule.T_MODULE.LASTCHANGE; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return TModule.T_MODULE.PK; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return TModule.T_MODULE.NAME; } - /** - * {@inheritDoc} - */ @Override public Timestamp component1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer component2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String component3() { return getName(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer value2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String value3() { return getName(); } - /** - * {@inheritDoc} - */ @Override public TModuleRecord value1(Timestamp value) { setLastchange(value); return this; } - /** - * {@inheritDoc} - */ @Override public TModuleRecord value2(Integer value) { setPk(value); return this; } - /** - * {@inheritDoc} - */ @Override public TModuleRecord value3(String value) { setName(value); return this; } - /** - * {@inheritDoc} - */ @Override public TModuleRecord values(Timestamp value1, Integer value2, String value3) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TProjectRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TProjectRecord.java index f9ef8d9..e1bf472 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TProjectRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TProjectRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.done.tables.records; +import de.jottyfan.timetrack.db.done.tables.TProject; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -13,8 +15,6 @@ import org.jooq.Record3; import org.jooq.Row3; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.done.tables.TProject; - /** * This class is generated by jOOQ. @@ -22,14 +22,14 @@ import de.jottyfan.timetrack.db.done.tables.TProject; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TProjectRecord extends TableRecordImpl implements Record3 { - private static final long serialVersionUID = -1558586881; + private static final long serialVersionUID = 1864163507; /** * Setter for done.t_project.lastchange. @@ -77,124 +77,79 @@ public class TProjectRecord extends TableRecordImpl implements R // Record3 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row3 valuesRow() { return (Row3) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return TProject.T_PROJECT.LASTCHANGE; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return TProject.T_PROJECT.PK; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return TProject.T_PROJECT.NAME; } - /** - * {@inheritDoc} - */ @Override public Timestamp component1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer component2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String component3() { return getName(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer value2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String value3() { return getName(); } - /** - * {@inheritDoc} - */ @Override public TProjectRecord value1(Timestamp value) { setLastchange(value); return this; } - /** - * {@inheritDoc} - */ @Override public TProjectRecord value2(Integer value) { setPk(value); return this; } - /** - * {@inheritDoc} - */ @Override public TProjectRecord value3(String value) { setName(value); return this; } - /** - * {@inheritDoc} - */ @Override public TProjectRecord values(Timestamp value1, Integer value2, String value3) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDailyRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDailyRecord.java new file mode 100644 index 0000000..e18ff61 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDailyRecord.java @@ -0,0 +1,218 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VDaily; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.Record4; +import org.jooq.Row4; +import org.jooq.impl.TableRecordImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDailyRecord extends TableRecordImpl implements Record4 { + + private static final long serialVersionUID = 111682889; + + /** + * Setter for done.v_daily.worktime. + */ + public void setWorktime(YearToSecond value) { + set(0, value); + } + + /** + * Getter for done.v_daily.worktime. + */ + public YearToSecond getWorktime() { + return (YearToSecond) get(0); + } + + /** + * Setter for done.v_daily.day. + */ + public void setDay(String value) { + set(1, value); + } + + /** + * Getter for done.v_daily.day. + */ + public String getDay() { + return (String) get(1); + } + + /** + * Setter for done.v_daily.login. + */ + public void setLogin(String value) { + set(2, value); + } + + /** + * Getter for done.v_daily.login. + */ + public String getLogin() { + return (String) get(2); + } + + /** + * Setter for done.v_daily.fk_login. + */ + public void setFkLogin(Integer value) { + set(3, value); + } + + /** + * Getter for done.v_daily.fk_login. + */ + public Integer getFkLogin() { + return (Integer) get(3); + } + + // ------------------------------------------------------------------------- + // Record4 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row4 fieldsRow() { + return (Row4) super.fieldsRow(); + } + + @Override + public Row4 valuesRow() { + return (Row4) super.valuesRow(); + } + + @Override + public Field field1() { + return VDaily.V_DAILY.WORKTIME; + } + + @Override + public Field field2() { + return VDaily.V_DAILY.DAY; + } + + @Override + public Field field3() { + return VDaily.V_DAILY.LOGIN; + } + + @Override + public Field field4() { + return VDaily.V_DAILY.FK_LOGIN; + } + + @Override + public YearToSecond component1() { + return getWorktime(); + } + + @Override + public String component2() { + return getDay(); + } + + @Override + public String component3() { + return getLogin(); + } + + @Override + public Integer component4() { + return getFkLogin(); + } + + @Override + public YearToSecond value1() { + return getWorktime(); + } + + @Override + public String value2() { + return getDay(); + } + + @Override + public String value3() { + return getLogin(); + } + + @Override + public Integer value4() { + return getFkLogin(); + } + + @Override + public VDailyRecord value1(YearToSecond value) { + setWorktime(value); + return this; + } + + @Override + public VDailyRecord value2(String value) { + setDay(value); + return this; + } + + @Override + public VDailyRecord value3(String value) { + setLogin(value); + return this; + } + + @Override + public VDailyRecord value4(Integer value) { + setFkLogin(value); + return this; + } + + @Override + public VDailyRecord values(YearToSecond value1, String value2, String value3, Integer value4) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VDailyRecord + */ + public VDailyRecord() { + super(VDaily.V_DAILY); + } + + /** + * Create a detached, initialised VDailyRecord + */ + public VDailyRecord(YearToSecond worktime, String day, String login, Integer fkLogin) { + super(VDaily.V_DAILY); + + set(0, worktime); + set(1, day); + set(2, login); + set(3, fkLogin); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaylimitsRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaylimitsRecord.java new file mode 100644 index 0000000..e600d3f --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaylimitsRecord.java @@ -0,0 +1,220 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VDaylimits; + +import java.sql.Timestamp; +import java.time.OffsetDateTime; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.Record4; +import org.jooq.Row4; +import org.jooq.impl.TableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDaylimitsRecord extends TableRecordImpl implements Record4 { + + private static final long serialVersionUID = 1544678482; + + /** + * Setter for done.v_daylimits.work_start. + */ + public void setWorkStart(Timestamp value) { + set(0, value); + } + + /** + * Getter for done.v_daylimits.work_start. + */ + public Timestamp getWorkStart() { + return (Timestamp) get(0); + } + + /** + * Setter for done.v_daylimits.work_end. + */ + public void setWorkEnd(OffsetDateTime value) { + set(1, value); + } + + /** + * Getter for done.v_daylimits.work_end. + */ + public OffsetDateTime getWorkEnd() { + return (OffsetDateTime) get(1); + } + + /** + * Setter for done.v_daylimits.day. + */ + public void setDay(String value) { + set(2, value); + } + + /** + * Getter for done.v_daylimits.day. + */ + public String getDay() { + return (String) get(2); + } + + /** + * Setter for done.v_daylimits.fk_login. + */ + public void setFkLogin(Integer value) { + set(3, value); + } + + /** + * Getter for done.v_daylimits.fk_login. + */ + public Integer getFkLogin() { + return (Integer) get(3); + } + + // ------------------------------------------------------------------------- + // Record4 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row4 fieldsRow() { + return (Row4) super.fieldsRow(); + } + + @Override + public Row4 valuesRow() { + return (Row4) super.valuesRow(); + } + + @Override + public Field field1() { + return VDaylimits.V_DAYLIMITS.WORK_START; + } + + @Override + public Field field2() { + return VDaylimits.V_DAYLIMITS.WORK_END; + } + + @Override + public Field field3() { + return VDaylimits.V_DAYLIMITS.DAY; + } + + @Override + public Field field4() { + return VDaylimits.V_DAYLIMITS.FK_LOGIN; + } + + @Override + public Timestamp component1() { + return getWorkStart(); + } + + @Override + public OffsetDateTime component2() { + return getWorkEnd(); + } + + @Override + public String component3() { + return getDay(); + } + + @Override + public Integer component4() { + return getFkLogin(); + } + + @Override + public Timestamp value1() { + return getWorkStart(); + } + + @Override + public OffsetDateTime value2() { + return getWorkEnd(); + } + + @Override + public String value3() { + return getDay(); + } + + @Override + public Integer value4() { + return getFkLogin(); + } + + @Override + public VDaylimitsRecord value1(Timestamp value) { + setWorkStart(value); + return this; + } + + @Override + public VDaylimitsRecord value2(OffsetDateTime value) { + setWorkEnd(value); + return this; + } + + @Override + public VDaylimitsRecord value3(String value) { + setDay(value); + return this; + } + + @Override + public VDaylimitsRecord value4(Integer value) { + setFkLogin(value); + return this; + } + + @Override + public VDaylimitsRecord values(Timestamp value1, OffsetDateTime value2, String value3, Integer value4) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VDaylimitsRecord + */ + public VDaylimitsRecord() { + super(VDaylimits.V_DAYLIMITS); + } + + /** + * Create a detached, initialised VDaylimitsRecord + */ + public VDaylimitsRecord(Timestamp workStart, OffsetDateTime workEnd, String day, Integer fkLogin) { + super(VDaylimits.V_DAYLIMITS); + + set(0, workStart); + set(1, workEnd); + set(2, day); + set(3, fkLogin); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaysummaryRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaysummaryRecord.java new file mode 100644 index 0000000..9ee880a --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaysummaryRecord.java @@ -0,0 +1,332 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VDaysummary; + +import java.sql.Timestamp; +import java.time.OffsetDateTime; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.Record7; +import org.jooq.Row7; +import org.jooq.impl.TableRecordImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDaysummaryRecord extends TableRecordImpl implements Record7 { + + private static final long serialVersionUID = -531239752; + + /** + * Setter for done.v_daysummary.breaktime. + */ + public void setBreaktime(YearToSecond value) { + set(0, value); + } + + /** + * Getter for done.v_daysummary.breaktime. + */ + public YearToSecond getBreaktime() { + return (YearToSecond) get(0); + } + + /** + * Setter for done.v_daysummary.worktime. + */ + public void setWorktime(YearToSecond value) { + set(1, value); + } + + /** + * Getter for done.v_daysummary.worktime. + */ + public YearToSecond getWorktime() { + return (YearToSecond) get(1); + } + + /** + * Setter for done.v_daysummary.work_start. + */ + public void setWorkStart(Timestamp value) { + set(2, value); + } + + /** + * Getter for done.v_daysummary.work_start. + */ + public Timestamp getWorkStart() { + return (Timestamp) get(2); + } + + /** + * Setter for done.v_daysummary.work_end. + */ + public void setWorkEnd(OffsetDateTime value) { + set(3, value); + } + + /** + * Getter for done.v_daysummary.work_end. + */ + public OffsetDateTime getWorkEnd() { + return (OffsetDateTime) get(3); + } + + /** + * Setter for done.v_daysummary.day. + */ + public void setDay(String value) { + set(4, value); + } + + /** + * Getter for done.v_daysummary.day. + */ + public String getDay() { + return (String) get(4); + } + + /** + * Setter for done.v_daysummary.login. + */ + public void setLogin(String value) { + set(5, value); + } + + /** + * Getter for done.v_daysummary.login. + */ + public String getLogin() { + return (String) get(5); + } + + /** + * Setter for done.v_daysummary.fk_login. + */ + public void setFkLogin(Integer value) { + set(6, value); + } + + /** + * Getter for done.v_daysummary.fk_login. + */ + public Integer getFkLogin() { + return (Integer) get(6); + } + + // ------------------------------------------------------------------------- + // Record7 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); + } + + @Override + public Row7 valuesRow() { + return (Row7) super.valuesRow(); + } + + @Override + public Field field1() { + return VDaysummary.V_DAYSUMMARY.BREAKTIME; + } + + @Override + public Field field2() { + return VDaysummary.V_DAYSUMMARY.WORKTIME; + } + + @Override + public Field field3() { + return VDaysummary.V_DAYSUMMARY.WORK_START; + } + + @Override + public Field field4() { + return VDaysummary.V_DAYSUMMARY.WORK_END; + } + + @Override + public Field field5() { + return VDaysummary.V_DAYSUMMARY.DAY; + } + + @Override + public Field field6() { + return VDaysummary.V_DAYSUMMARY.LOGIN; + } + + @Override + public Field field7() { + return VDaysummary.V_DAYSUMMARY.FK_LOGIN; + } + + @Override + public YearToSecond component1() { + return getBreaktime(); + } + + @Override + public YearToSecond component2() { + return getWorktime(); + } + + @Override + public Timestamp component3() { + return getWorkStart(); + } + + @Override + public OffsetDateTime component4() { + return getWorkEnd(); + } + + @Override + public String component5() { + return getDay(); + } + + @Override + public String component6() { + return getLogin(); + } + + @Override + public Integer component7() { + return getFkLogin(); + } + + @Override + public YearToSecond value1() { + return getBreaktime(); + } + + @Override + public YearToSecond value2() { + return getWorktime(); + } + + @Override + public Timestamp value3() { + return getWorkStart(); + } + + @Override + public OffsetDateTime value4() { + return getWorkEnd(); + } + + @Override + public String value5() { + return getDay(); + } + + @Override + public String value6() { + return getLogin(); + } + + @Override + public Integer value7() { + return getFkLogin(); + } + + @Override + public VDaysummaryRecord value1(YearToSecond value) { + setBreaktime(value); + return this; + } + + @Override + public VDaysummaryRecord value2(YearToSecond value) { + setWorktime(value); + return this; + } + + @Override + public VDaysummaryRecord value3(Timestamp value) { + setWorkStart(value); + return this; + } + + @Override + public VDaysummaryRecord value4(OffsetDateTime value) { + setWorkEnd(value); + return this; + } + + @Override + public VDaysummaryRecord value5(String value) { + setDay(value); + return this; + } + + @Override + public VDaysummaryRecord value6(String value) { + setLogin(value); + return this; + } + + @Override + public VDaysummaryRecord value7(Integer value) { + setFkLogin(value); + return this; + } + + @Override + public VDaysummaryRecord values(YearToSecond value1, YearToSecond value2, Timestamp value3, OffsetDateTime value4, String value5, String value6, Integer value7) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + value5(value5); + value6(value6); + value7(value7); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VDaysummaryRecord + */ + public VDaysummaryRecord() { + super(VDaysummary.V_DAYSUMMARY); + } + + /** + * Create a detached, initialised VDaysummaryRecord + */ + public VDaysummaryRecord(YearToSecond breaktime, YearToSecond worktime, Timestamp workStart, OffsetDateTime workEnd, String day, String login, Integer fkLogin) { + super(VDaysummary.V_DAYSUMMARY); + + set(0, breaktime); + set(1, worktime); + set(2, workStart); + set(3, workEnd); + set(4, day); + set(5, login); + set(6, fkLogin); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDoneRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDoneRecord.java new file mode 100644 index 0000000..6a082ca --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDoneRecord.java @@ -0,0 +1,367 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VDone; + +import java.sql.Timestamp; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.Record8; +import org.jooq.Row8; +import org.jooq.impl.TableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDoneRecord extends TableRecordImpl implements Record8 { + + private static final long serialVersionUID = -311533849; + + /** + * Setter for done.v_done.fk_done. + */ + public void setFkDone(Integer value) { + set(0, value); + } + + /** + * Getter for done.v_done.fk_done. + */ + public Integer getFkDone() { + return (Integer) get(0); + } + + /** + * Setter for done.v_done.fk_login. + */ + public void setFkLogin(Integer value) { + set(1, value); + } + + /** + * Getter for done.v_done.fk_login. + */ + public Integer getFkLogin() { + return (Integer) get(1); + } + + /** + * Setter for done.v_done.time_from. + */ + public void setTimeFrom(Timestamp value) { + set(2, value); + } + + /** + * Getter for done.v_done.time_from. + */ + public Timestamp getTimeFrom() { + return (Timestamp) get(2); + } + + /** + * Setter for done.v_done.time_until. + */ + public void setTimeUntil(Timestamp value) { + set(3, value); + } + + /** + * Getter for done.v_done.time_until. + */ + public Timestamp getTimeUntil() { + return (Timestamp) get(3); + } + + /** + * Setter for done.v_done.project_name. + */ + public void setProjectName(String value) { + set(4, value); + } + + /** + * Getter for done.v_done.project_name. + */ + public String getProjectName() { + return (String) get(4); + } + + /** + * Setter for done.v_done.module_name. + */ + public void setModuleName(String value) { + set(5, value); + } + + /** + * Getter for done.v_done.module_name. + */ + public String getModuleName() { + return (String) get(5); + } + + /** + * Setter for done.v_done.job_name. + */ + public void setJobName(String value) { + set(6, value); + } + + /** + * Getter for done.v_done.job_name. + */ + public String getJobName() { + return (String) get(6); + } + + /** + * Setter for done.v_done.login. + */ + public void setLogin(String value) { + set(7, value); + } + + /** + * Getter for done.v_done.login. + */ + public String getLogin() { + return (String) get(7); + } + + // ------------------------------------------------------------------------- + // Record8 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row8 fieldsRow() { + return (Row8) super.fieldsRow(); + } + + @Override + public Row8 valuesRow() { + return (Row8) super.valuesRow(); + } + + @Override + public Field field1() { + return VDone.V_DONE.FK_DONE; + } + + @Override + public Field field2() { + return VDone.V_DONE.FK_LOGIN; + } + + @Override + public Field field3() { + return VDone.V_DONE.TIME_FROM; + } + + @Override + public Field field4() { + return VDone.V_DONE.TIME_UNTIL; + } + + @Override + public Field field5() { + return VDone.V_DONE.PROJECT_NAME; + } + + @Override + public Field field6() { + return VDone.V_DONE.MODULE_NAME; + } + + @Override + public Field field7() { + return VDone.V_DONE.JOB_NAME; + } + + @Override + public Field field8() { + return VDone.V_DONE.LOGIN; + } + + @Override + public Integer component1() { + return getFkDone(); + } + + @Override + public Integer component2() { + return getFkLogin(); + } + + @Override + public Timestamp component3() { + return getTimeFrom(); + } + + @Override + public Timestamp component4() { + return getTimeUntil(); + } + + @Override + public String component5() { + return getProjectName(); + } + + @Override + public String component6() { + return getModuleName(); + } + + @Override + public String component7() { + return getJobName(); + } + + @Override + public String component8() { + return getLogin(); + } + + @Override + public Integer value1() { + return getFkDone(); + } + + @Override + public Integer value2() { + return getFkLogin(); + } + + @Override + public Timestamp value3() { + return getTimeFrom(); + } + + @Override + public Timestamp value4() { + return getTimeUntil(); + } + + @Override + public String value5() { + return getProjectName(); + } + + @Override + public String value6() { + return getModuleName(); + } + + @Override + public String value7() { + return getJobName(); + } + + @Override + public String value8() { + return getLogin(); + } + + @Override + public VDoneRecord value1(Integer value) { + setFkDone(value); + return this; + } + + @Override + public VDoneRecord value2(Integer value) { + setFkLogin(value); + return this; + } + + @Override + public VDoneRecord value3(Timestamp value) { + setTimeFrom(value); + return this; + } + + @Override + public VDoneRecord value4(Timestamp value) { + setTimeUntil(value); + return this; + } + + @Override + public VDoneRecord value5(String value) { + setProjectName(value); + return this; + } + + @Override + public VDoneRecord value6(String value) { + setModuleName(value); + return this; + } + + @Override + public VDoneRecord value7(String value) { + setJobName(value); + return this; + } + + @Override + public VDoneRecord value8(String value) { + setLogin(value); + return this; + } + + @Override + public VDoneRecord values(Integer value1, Integer value2, Timestamp value3, Timestamp value4, String value5, String value6, String value7, String value8) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + value5(value5); + value6(value6); + value7(value7); + value8(value8); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VDoneRecord + */ + public VDoneRecord() { + super(VDone.V_DONE); + } + + /** + * Create a detached, initialised VDoneRecord + */ + public VDoneRecord(Integer fkDone, Integer fkLogin, Timestamp timeFrom, Timestamp timeUntil, String projectName, String moduleName, String jobName, String login) { + super(VDone.V_DONE); + + set(0, fkDone); + set(1, fkLogin); + set(2, timeFrom); + set(3, timeUntil); + set(4, projectName); + set(5, moduleName); + set(6, jobName); + set(7, login); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDurationRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDurationRecord.java new file mode 100644 index 0000000..5df0c4b --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDurationRecord.java @@ -0,0 +1,329 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VDuration; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.Record7; +import org.jooq.Row7; +import org.jooq.impl.TableRecordImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VDurationRecord extends TableRecordImpl implements Record7 { + + private static final long serialVersionUID = 794239622; + + /** + * Setter for done.v_duration.day. + */ + public void setDay(String value) { + set(0, value); + } + + /** + * Getter for done.v_duration.day. + */ + public String getDay() { + return (String) get(0); + } + + /** + * Setter for done.v_duration.duration. + */ + public void setDuration(YearToSecond value) { + set(1, value); + } + + /** + * Getter for done.v_duration.duration. + */ + public YearToSecond getDuration() { + return (YearToSecond) get(1); + } + + /** + * Setter for done.v_duration.project_name. + */ + public void setProjectName(String value) { + set(2, value); + } + + /** + * Getter for done.v_duration.project_name. + */ + public String getProjectName() { + return (String) get(2); + } + + /** + * Setter for done.v_duration.module_name. + */ + public void setModuleName(String value) { + set(3, value); + } + + /** + * Getter for done.v_duration.module_name. + */ + public String getModuleName() { + return (String) get(3); + } + + /** + * Setter for done.v_duration.job_name. + */ + public void setJobName(String value) { + set(4, value); + } + + /** + * Getter for done.v_duration.job_name. + */ + public String getJobName() { + return (String) get(4); + } + + /** + * Setter for done.v_duration.login. + */ + public void setLogin(String value) { + set(5, value); + } + + /** + * Getter for done.v_duration.login. + */ + public String getLogin() { + return (String) get(5); + } + + /** + * Setter for done.v_duration.fk_login. + */ + public void setFkLogin(Integer value) { + set(6, value); + } + + /** + * Getter for done.v_duration.fk_login. + */ + public Integer getFkLogin() { + return (Integer) get(6); + } + + // ------------------------------------------------------------------------- + // Record7 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); + } + + @Override + public Row7 valuesRow() { + return (Row7) super.valuesRow(); + } + + @Override + public Field field1() { + return VDuration.V_DURATION.DAY; + } + + @Override + public Field field2() { + return VDuration.V_DURATION.DURATION; + } + + @Override + public Field field3() { + return VDuration.V_DURATION.PROJECT_NAME; + } + + @Override + public Field field4() { + return VDuration.V_DURATION.MODULE_NAME; + } + + @Override + public Field field5() { + return VDuration.V_DURATION.JOB_NAME; + } + + @Override + public Field field6() { + return VDuration.V_DURATION.LOGIN; + } + + @Override + public Field field7() { + return VDuration.V_DURATION.FK_LOGIN; + } + + @Override + public String component1() { + return getDay(); + } + + @Override + public YearToSecond component2() { + return getDuration(); + } + + @Override + public String component3() { + return getProjectName(); + } + + @Override + public String component4() { + return getModuleName(); + } + + @Override + public String component5() { + return getJobName(); + } + + @Override + public String component6() { + return getLogin(); + } + + @Override + public Integer component7() { + return getFkLogin(); + } + + @Override + public String value1() { + return getDay(); + } + + @Override + public YearToSecond value2() { + return getDuration(); + } + + @Override + public String value3() { + return getProjectName(); + } + + @Override + public String value4() { + return getModuleName(); + } + + @Override + public String value5() { + return getJobName(); + } + + @Override + public String value6() { + return getLogin(); + } + + @Override + public Integer value7() { + return getFkLogin(); + } + + @Override + public VDurationRecord value1(String value) { + setDay(value); + return this; + } + + @Override + public VDurationRecord value2(YearToSecond value) { + setDuration(value); + return this; + } + + @Override + public VDurationRecord value3(String value) { + setProjectName(value); + return this; + } + + @Override + public VDurationRecord value4(String value) { + setModuleName(value); + return this; + } + + @Override + public VDurationRecord value5(String value) { + setJobName(value); + return this; + } + + @Override + public VDurationRecord value6(String value) { + setLogin(value); + return this; + } + + @Override + public VDurationRecord value7(Integer value) { + setFkLogin(value); + return this; + } + + @Override + public VDurationRecord values(String value1, YearToSecond value2, String value3, String value4, String value5, String value6, Integer value7) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + value5(value5); + value6(value6); + value7(value7); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VDurationRecord + */ + public VDurationRecord() { + super(VDuration.V_DURATION); + } + + /** + * Create a detached, initialised VDurationRecord + */ + public VDurationRecord(String day, YearToSecond duration, String projectName, String moduleName, String jobName, String login, Integer fkLogin) { + super(VDuration.V_DURATION); + + set(0, day); + set(1, duration); + set(2, projectName); + set(3, moduleName); + set(4, jobName); + set(5, login); + set(6, fkLogin); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamsterRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamsterRecord.java new file mode 100644 index 0000000..0dd9382 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamsterRecord.java @@ -0,0 +1,294 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VHamster; + +import java.sql.Date; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.Record6; +import org.jooq.Row6; +import org.jooq.impl.TableRecordImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VHamsterRecord extends TableRecordImpl implements Record6 { + + private static final long serialVersionUID = 1475398201; + + /** + * Setter for done.v_hamster.workday. + */ + public void setWorkday(Date value) { + set(0, value); + } + + /** + * Getter for done.v_hamster.workday. + */ + public Date getWorkday() { + return (Date) get(0); + } + + /** + * Setter for done.v_hamster.duration. + */ + public void setDuration(YearToSecond value) { + set(1, value); + } + + /** + * Getter for done.v_hamster.duration. + */ + public YearToSecond getDuration() { + return (YearToSecond) get(1); + } + + /** + * Setter for done.v_hamster.project_name. + */ + public void setProjectName(String value) { + set(2, value); + } + + /** + * Getter for done.v_hamster.project_name. + */ + public String getProjectName() { + return (String) get(2); + } + + /** + * Setter for done.v_hamster.module_name. + */ + public void setModuleName(String value) { + set(3, value); + } + + /** + * Getter for done.v_hamster.module_name. + */ + public String getModuleName() { + return (String) get(3); + } + + /** + * Setter for done.v_hamster.job_name. + */ + public void setJobName(String value) { + set(4, value); + } + + /** + * Getter for done.v_hamster.job_name. + */ + public String getJobName() { + return (String) get(4); + } + + /** + * Setter for done.v_hamster.login. + */ + public void setLogin(String value) { + set(5, value); + } + + /** + * Getter for done.v_hamster.login. + */ + public String getLogin() { + return (String) get(5); + } + + // ------------------------------------------------------------------------- + // Record6 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row6 fieldsRow() { + return (Row6) super.fieldsRow(); + } + + @Override + public Row6 valuesRow() { + return (Row6) super.valuesRow(); + } + + @Override + public Field field1() { + return VHamster.V_HAMSTER.WORKDAY; + } + + @Override + public Field field2() { + return VHamster.V_HAMSTER.DURATION; + } + + @Override + public Field field3() { + return VHamster.V_HAMSTER.PROJECT_NAME; + } + + @Override + public Field field4() { + return VHamster.V_HAMSTER.MODULE_NAME; + } + + @Override + public Field field5() { + return VHamster.V_HAMSTER.JOB_NAME; + } + + @Override + public Field field6() { + return VHamster.V_HAMSTER.LOGIN; + } + + @Override + public Date component1() { + return getWorkday(); + } + + @Override + public YearToSecond component2() { + return getDuration(); + } + + @Override + public String component3() { + return getProjectName(); + } + + @Override + public String component4() { + return getModuleName(); + } + + @Override + public String component5() { + return getJobName(); + } + + @Override + public String component6() { + return getLogin(); + } + + @Override + public Date value1() { + return getWorkday(); + } + + @Override + public YearToSecond value2() { + return getDuration(); + } + + @Override + public String value3() { + return getProjectName(); + } + + @Override + public String value4() { + return getModuleName(); + } + + @Override + public String value5() { + return getJobName(); + } + + @Override + public String value6() { + return getLogin(); + } + + @Override + public VHamsterRecord value1(Date value) { + setWorkday(value); + return this; + } + + @Override + public VHamsterRecord value2(YearToSecond value) { + setDuration(value); + return this; + } + + @Override + public VHamsterRecord value3(String value) { + setProjectName(value); + return this; + } + + @Override + public VHamsterRecord value4(String value) { + setModuleName(value); + return this; + } + + @Override + public VHamsterRecord value5(String value) { + setJobName(value); + return this; + } + + @Override + public VHamsterRecord value6(String value) { + setLogin(value); + return this; + } + + @Override + public VHamsterRecord values(Date value1, YearToSecond value2, String value3, String value4, String value5, String value6) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + value5(value5); + value6(value6); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VHamsterRecord + */ + public VHamsterRecord() { + super(VHamster.V_HAMSTER); + } + + /** + * Create a detached, initialised VHamsterRecord + */ + public VHamsterRecord(Date workday, YearToSecond duration, String projectName, String moduleName, String jobName, String login) { + super(VHamster.V_HAMSTER); + + set(0, workday); + set(1, duration); + set(2, projectName); + set(3, moduleName); + set(4, jobName); + set(5, login); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamstersummaryRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamstersummaryRecord.java new file mode 100644 index 0000000..899ae8c --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamstersummaryRecord.java @@ -0,0 +1,293 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VHamstersummary; + +import java.sql.Date; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.Record6; +import org.jooq.Row6; +import org.jooq.impl.TableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VHamstersummaryRecord extends TableRecordImpl implements Record6 { + + private static final long serialVersionUID = 742713887; + + /** + * Setter for done.v_hamstersummary.workday. + */ + public void setWorkday(Date value) { + set(0, value); + } + + /** + * Getter for done.v_hamstersummary.workday. + */ + public Date getWorkday() { + return (Date) get(0); + } + + /** + * Setter for done.v_hamstersummary.duration. + */ + public void setDuration(String value) { + set(1, value); + } + + /** + * Getter for done.v_hamstersummary.duration. + */ + public String getDuration() { + return (String) get(1); + } + + /** + * Setter for done.v_hamstersummary.project_name. + */ + public void setProjectName(String value) { + set(2, value); + } + + /** + * Getter for done.v_hamstersummary.project_name. + */ + public String getProjectName() { + return (String) get(2); + } + + /** + * Setter for done.v_hamstersummary.module_name. + */ + public void setModuleName(String value) { + set(3, value); + } + + /** + * Getter for done.v_hamstersummary.module_name. + */ + public String getModuleName() { + return (String) get(3); + } + + /** + * Setter for done.v_hamstersummary.job_name. + */ + public void setJobName(String value) { + set(4, value); + } + + /** + * Getter for done.v_hamstersummary.job_name. + */ + public String getJobName() { + return (String) get(4); + } + + /** + * Setter for done.v_hamstersummary.login. + */ + public void setLogin(String value) { + set(5, value); + } + + /** + * Getter for done.v_hamstersummary.login. + */ + public String getLogin() { + return (String) get(5); + } + + // ------------------------------------------------------------------------- + // Record6 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row6 fieldsRow() { + return (Row6) super.fieldsRow(); + } + + @Override + public Row6 valuesRow() { + return (Row6) super.valuesRow(); + } + + @Override + public Field field1() { + return VHamstersummary.V_HAMSTERSUMMARY.WORKDAY; + } + + @Override + public Field field2() { + return VHamstersummary.V_HAMSTERSUMMARY.DURATION; + } + + @Override + public Field field3() { + return VHamstersummary.V_HAMSTERSUMMARY.PROJECT_NAME; + } + + @Override + public Field field4() { + return VHamstersummary.V_HAMSTERSUMMARY.MODULE_NAME; + } + + @Override + public Field field5() { + return VHamstersummary.V_HAMSTERSUMMARY.JOB_NAME; + } + + @Override + public Field field6() { + return VHamstersummary.V_HAMSTERSUMMARY.LOGIN; + } + + @Override + public Date component1() { + return getWorkday(); + } + + @Override + public String component2() { + return getDuration(); + } + + @Override + public String component3() { + return getProjectName(); + } + + @Override + public String component4() { + return getModuleName(); + } + + @Override + public String component5() { + return getJobName(); + } + + @Override + public String component6() { + return getLogin(); + } + + @Override + public Date value1() { + return getWorkday(); + } + + @Override + public String value2() { + return getDuration(); + } + + @Override + public String value3() { + return getProjectName(); + } + + @Override + public String value4() { + return getModuleName(); + } + + @Override + public String value5() { + return getJobName(); + } + + @Override + public String value6() { + return getLogin(); + } + + @Override + public VHamstersummaryRecord value1(Date value) { + setWorkday(value); + return this; + } + + @Override + public VHamstersummaryRecord value2(String value) { + setDuration(value); + return this; + } + + @Override + public VHamstersummaryRecord value3(String value) { + setProjectName(value); + return this; + } + + @Override + public VHamstersummaryRecord value4(String value) { + setModuleName(value); + return this; + } + + @Override + public VHamstersummaryRecord value5(String value) { + setJobName(value); + return this; + } + + @Override + public VHamstersummaryRecord value6(String value) { + setLogin(value); + return this; + } + + @Override + public VHamstersummaryRecord values(Date value1, String value2, String value3, String value4, String value5, String value6) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + value5(value5); + value6(value6); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VHamstersummaryRecord + */ + public VHamstersummaryRecord() { + super(VHamstersummary.V_HAMSTERSUMMARY); + } + + /** + * Create a detached, initialised VHamstersummaryRecord + */ + public VHamstersummaryRecord(Date workday, String duration, String projectName, String moduleName, String jobName, String login) { + super(VHamstersummary.V_HAMSTERSUMMARY); + + set(0, workday); + set(1, duration); + set(2, projectName); + set(3, moduleName); + set(4, jobName); + set(5, login); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTasklistRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTasklistRecord.java index 756af8c..df9bd1d 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTasklistRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTasklistRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.done.tables.records; +import de.jottyfan.timetrack.db.done.tables.VTasklist; + import javax.annotation.Generated; import org.jooq.Field; @@ -11,8 +13,6 @@ import org.jooq.Record6; import org.jooq.Row6; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.done.tables.VTasklist; - /** * This class is generated by jOOQ. @@ -20,14 +20,14 @@ import de.jottyfan.timetrack.db.done.tables.VTasklist; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VTasklistRecord extends TableRecordImpl implements Record6 { - private static final long serialVersionUID = 1829630400; + private static final long serialVersionUID = -1505579480; /** * Setter for done.v_tasklist.day. @@ -117,223 +117,142 @@ public class VTasklistRecord extends TableRecordImpl implements // Record6 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row6 valuesRow() { return (Row6) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return VTasklist.V_TASKLIST.DAY; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return VTasklist.V_TASKLIST.DURATION; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return VTasklist.V_TASKLIST.PROJECT_NAME; } - /** - * {@inheritDoc} - */ @Override public Field field4() { return VTasklist.V_TASKLIST.MODULE_NAME; } - /** - * {@inheritDoc} - */ @Override public Field field5() { return VTasklist.V_TASKLIST.JOB_NAME; } - /** - * {@inheritDoc} - */ @Override public Field field6() { return VTasklist.V_TASKLIST.FK_LOGIN; } - /** - * {@inheritDoc} - */ @Override public String component1() { return getDay(); } - /** - * {@inheritDoc} - */ @Override public String component2() { return getDuration(); } - /** - * {@inheritDoc} - */ @Override public String component3() { return getProjectName(); } - /** - * {@inheritDoc} - */ @Override public String component4() { return getModuleName(); } - /** - * {@inheritDoc} - */ @Override public String component5() { return getJobName(); } - /** - * {@inheritDoc} - */ @Override public Integer component6() { return getFkLogin(); } - /** - * {@inheritDoc} - */ @Override public String value1() { return getDay(); } - /** - * {@inheritDoc} - */ @Override public String value2() { return getDuration(); } - /** - * {@inheritDoc} - */ @Override public String value3() { return getProjectName(); } - /** - * {@inheritDoc} - */ @Override public String value4() { return getModuleName(); } - /** - * {@inheritDoc} - */ @Override public String value5() { return getJobName(); } - /** - * {@inheritDoc} - */ @Override public Integer value6() { return getFkLogin(); } - /** - * {@inheritDoc} - */ @Override public VTasklistRecord value1(String value) { setDay(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTasklistRecord value2(String value) { setDuration(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTasklistRecord value3(String value) { setProjectName(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTasklistRecord value4(String value) { setModuleName(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTasklistRecord value5(String value) { setJobName(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTasklistRecord value6(Integer value) { setFkLogin(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTasklistRecord values(String value1, String value2, String value3, String value4, String value5, Integer value6) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTotalofdayRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTotalofdayRecord.java index 82cb495..52be9e2 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTotalofdayRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTotalofdayRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.done.tables.records; +import de.jottyfan.timetrack.db.done.tables.VTotalofday; + import javax.annotation.Generated; import org.jooq.Field; @@ -11,8 +13,6 @@ import org.jooq.Record6; import org.jooq.Row6; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.done.tables.VTotalofday; - /** * This class is generated by jOOQ. @@ -20,14 +20,14 @@ import de.jottyfan.timetrack.db.done.tables.VTotalofday; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VTotalofdayRecord extends TableRecordImpl implements Record6 { - private static final long serialVersionUID = 1188298937; + private static final long serialVersionUID = -383740435; /** * Setter for done.v_totalofday.breaktime. @@ -117,223 +117,142 @@ public class VTotalofdayRecord extends TableRecordImpl implem // Record6 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row6 valuesRow() { return (Row6) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return VTotalofday.V_TOTALOFDAY.BREAKTIME; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return VTotalofday.V_TOTALOFDAY.WORKTIME; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return VTotalofday.V_TOTALOFDAY.STARTTIME; } - /** - * {@inheritDoc} - */ @Override public Field field4() { return VTotalofday.V_TOTALOFDAY.ENDTIME; } - /** - * {@inheritDoc} - */ @Override public Field field5() { return VTotalofday.V_TOTALOFDAY.DAY; } - /** - * {@inheritDoc} - */ @Override public Field field6() { return VTotalofday.V_TOTALOFDAY.FK_LOGIN; } - /** - * {@inheritDoc} - */ @Override public String component1() { return getBreaktime(); } - /** - * {@inheritDoc} - */ @Override public String component2() { return getWorktime(); } - /** - * {@inheritDoc} - */ @Override public String component3() { return getStarttime(); } - /** - * {@inheritDoc} - */ @Override public String component4() { return getEndtime(); } - /** - * {@inheritDoc} - */ @Override public String component5() { return getDay(); } - /** - * {@inheritDoc} - */ @Override public Integer component6() { return getFkLogin(); } - /** - * {@inheritDoc} - */ @Override public String value1() { return getBreaktime(); } - /** - * {@inheritDoc} - */ @Override public String value2() { return getWorktime(); } - /** - * {@inheritDoc} - */ @Override public String value3() { return getStarttime(); } - /** - * {@inheritDoc} - */ @Override public String value4() { return getEndtime(); } - /** - * {@inheritDoc} - */ @Override public String value5() { return getDay(); } - /** - * {@inheritDoc} - */ @Override public Integer value6() { return getFkLogin(); } - /** - * {@inheritDoc} - */ @Override public VTotalofdayRecord value1(String value) { setBreaktime(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTotalofdayRecord value2(String value) { setWorktime(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTotalofdayRecord value3(String value) { setStarttime(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTotalofdayRecord value4(String value) { setEndtime(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTotalofdayRecord value5(String value) { setDay(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTotalofdayRecord value6(Integer value) { setFkLogin(value); return this; } - /** - * {@inheritDoc} - */ @Override public VTotalofdayRecord values(String value1, String value2, String value3, String value4, String value5, Integer value6) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/Indexes.java b/src/jooq/java/de/jottyfan/timetrack/db/note/Indexes.java index 1e7682d..02c69d2 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/Indexes.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/Indexes.java @@ -4,14 +4,14 @@ package de.jottyfan.timetrack.db.note; +import de.jottyfan.timetrack.db.note.tables.TNote; + import javax.annotation.Generated; import org.jooq.Index; import org.jooq.OrderField; import org.jooq.impl.Internal; -import de.jottyfan.timetrack.db.note.tables.TNote; - /** * A class modelling indexes of tables of the note schema. @@ -19,7 +19,7 @@ import de.jottyfan.timetrack.db.note.tables.TNote; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/Note.java b/src/jooq/java/de/jottyfan/timetrack/db/note/Note.java index f8b20e8..ffb6be6 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/Note.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/Note.java @@ -4,6 +4,9 @@ package de.jottyfan.timetrack.db.note; +import de.jottyfan.timetrack.db.DefaultCatalog; +import de.jottyfan.timetrack.db.note.tables.TNote; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -14,9 +17,6 @@ import org.jooq.Catalog; import org.jooq.Table; import org.jooq.impl.SchemaImpl; -import de.jottyfan.timetrack.db.DefaultCatalog; -import de.jottyfan.timetrack.db.note.tables.TNote; - /** * This class is generated by jOOQ. @@ -24,14 +24,14 @@ import de.jottyfan.timetrack.db.note.tables.TNote; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Note extends SchemaImpl { - private static final long serialVersionUID = -1806178126; + private static final long serialVersionUID = -1212898548; /** * The reference instance of note @@ -51,9 +51,6 @@ public class Note extends SchemaImpl { } - /** - * {@inheritDoc} - */ @Override public Catalog getCatalog() { return DefaultCatalog.DEFAULT_CATALOG; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/Tables.java b/src/jooq/java/de/jottyfan/timetrack/db/note/Tables.java index 9aac9ab..54fb5fa 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/Tables.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/Tables.java @@ -4,10 +4,10 @@ package de.jottyfan.timetrack.db.note; -import javax.annotation.Generated; - import de.jottyfan.timetrack.db.note.tables.TNote; +import javax.annotation.Generated; + /** * Convenience access to all tables in note @@ -15,7 +15,7 @@ import de.jottyfan.timetrack.db.note.tables.TNote; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @@ -25,5 +25,5 @@ public class Tables { /** * The table note.t_note. */ - public static final TNote T_NOTE = de.jottyfan.timetrack.db.note.tables.TNote.T_NOTE; + public static final TNote T_NOTE = TNote.T_NOTE; } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumCategory.java b/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumCategory.java index f9d8a56..81f0502 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumCategory.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumCategory.java @@ -4,14 +4,14 @@ package de.jottyfan.timetrack.db.note.enums; +import de.jottyfan.timetrack.db.note.Note; + import javax.annotation.Generated; import org.jooq.Catalog; import org.jooq.EnumType; import org.jooq.Schema; -import de.jottyfan.timetrack.db.note.Note; - /** * This class is generated by jOOQ. @@ -19,7 +19,7 @@ import de.jottyfan.timetrack.db.note.Note; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @@ -48,33 +48,21 @@ public enum EnumCategory implements EnumType { this.literal = literal; } - /** - * {@inheritDoc} - */ @Override public Catalog getCatalog() { return getSchema() == null ? null : getSchema().getCatalog(); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Note.NOTE; } - /** - * {@inheritDoc} - */ @Override public String getName() { return "enum_category"; } - /** - * {@inheritDoc} - */ @Override public String getLiteral() { return literal; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumNotetype.java b/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumNotetype.java index 06bf6d2..fef53a4 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumNotetype.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumNotetype.java @@ -4,14 +4,14 @@ package de.jottyfan.timetrack.db.note.enums; +import de.jottyfan.timetrack.db.note.Note; + import javax.annotation.Generated; import org.jooq.Catalog; import org.jooq.EnumType; import org.jooq.Schema; -import de.jottyfan.timetrack.db.note.Note; - /** * This class is generated by jOOQ. @@ -19,7 +19,7 @@ import de.jottyfan.timetrack.db.note.Note; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @@ -36,33 +36,21 @@ public enum EnumNotetype implements EnumType { this.literal = literal; } - /** - * {@inheritDoc} - */ @Override public Catalog getCatalog() { return getSchema() == null ? null : getSchema().getCatalog(); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Note.NOTE; } - /** - * {@inheritDoc} - */ @Override public String getName() { return "enum_notetype"; } - /** - * {@inheritDoc} - */ @Override public String getLiteral() { return literal; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/tables/TNote.java b/src/jooq/java/de/jottyfan/timetrack/db/note/tables/TNote.java index b1d04d2..cf2e4c1 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/tables/TNote.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/tables/TNote.java @@ -4,6 +4,12 @@ package de.jottyfan.timetrack.db.note.tables; +import de.jottyfan.timetrack.db.note.Indexes; +import de.jottyfan.timetrack.db.note.Note; +import de.jottyfan.timetrack.db.note.enums.EnumCategory; +import de.jottyfan.timetrack.db.note.enums.EnumNotetype; +import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord; + import java.sql.Timestamp; import java.util.Arrays; import java.util.List; @@ -15,18 +21,13 @@ import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row6; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.note.Indexes; -import de.jottyfan.timetrack.db.note.Note; -import de.jottyfan.timetrack.db.note.enums.EnumCategory; -import de.jottyfan.timetrack.db.note.enums.EnumNotetype; -import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord; - /** * This class is generated by jOOQ. @@ -34,14 +35,14 @@ import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TNote extends TableImpl { - private static final long serialVersionUID = -505401304; + private static final long serialVersionUID = 338893308; /** * The reference instance of note.t_note @@ -59,32 +60,32 @@ public class TNote extends TableImpl { /** * The column note.t_note.pk. */ - public final TableField PK = createField("pk", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column note.t_note.title. */ - public final TableField TITLE = createField("title", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField TITLE = createField(DSL.name("title"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column note.t_note.category. */ - public final TableField CATEGORY = createField("category", org.jooq.impl.SQLDataType.VARCHAR.asEnumDataType(de.jottyfan.timetrack.db.note.enums.EnumCategory.class), this, ""); + public final TableField CATEGORY = createField(DSL.name("category"), org.jooq.impl.SQLDataType.VARCHAR.asEnumDataType(de.jottyfan.timetrack.db.note.enums.EnumCategory.class), this, ""); /** * The column note.t_note.notetype. */ - public final TableField NOTETYPE = createField("notetype", org.jooq.impl.SQLDataType.VARCHAR.asEnumDataType(de.jottyfan.timetrack.db.note.enums.EnumNotetype.class), this, ""); + public final TableField NOTETYPE = createField(DSL.name("notetype"), org.jooq.impl.SQLDataType.VARCHAR.asEnumDataType(de.jottyfan.timetrack.db.note.enums.EnumNotetype.class), this, ""); /** * The column note.t_note.content. */ - public final TableField CONTENT = createField("content", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField CONTENT = createField(DSL.name("content"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column note.t_note.lastchange. */ - public final TableField LASTCHANGE = createField("lastchange", org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); + public final TableField LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); /** * Create a note.t_note table reference @@ -119,33 +120,21 @@ public class TNote extends TableImpl { super(child, key, T_NOTE); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Note.NOTE; } - /** - * {@inheritDoc} - */ @Override public List getIndexes() { return Arrays.asList(Indexes.T_NOTE_PKEY); } - /** - * {@inheritDoc} - */ @Override public TNote as(String alias) { return new TNote(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public TNote as(Name alias) { return new TNote(alias, this); @@ -166,4 +155,13 @@ public class TNote extends TableImpl { public TNote rename(Name name) { return new TNote(name, null); } + + // ------------------------------------------------------------------------- + // Row6 type methods + // ------------------------------------------------------------------------- + + @Override + public Row6 fieldsRow() { + return (Row6) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/tables/records/TNoteRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/note/tables/records/TNoteRecord.java index dc73e78..a68ef8c 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/tables/records/TNoteRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/tables/records/TNoteRecord.java @@ -4,6 +4,10 @@ package de.jottyfan.timetrack.db.note.tables.records; +import de.jottyfan.timetrack.db.note.enums.EnumCategory; +import de.jottyfan.timetrack.db.note.enums.EnumNotetype; +import de.jottyfan.timetrack.db.note.tables.TNote; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -13,10 +17,6 @@ import org.jooq.Record6; import org.jooq.Row6; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.note.enums.EnumCategory; -import de.jottyfan.timetrack.db.note.enums.EnumNotetype; -import de.jottyfan.timetrack.db.note.tables.TNote; - /** * This class is generated by jOOQ. @@ -24,14 +24,14 @@ import de.jottyfan.timetrack.db.note.tables.TNote; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TNoteRecord extends TableRecordImpl implements Record6 { - private static final long serialVersionUID = -1124958042; + private static final long serialVersionUID = -1917591496; /** * Setter for note.t_note.pk. @@ -121,223 +121,142 @@ public class TNoteRecord extends TableRecordImpl implements Record6 // Record6 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row6 valuesRow() { return (Row6) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return TNote.T_NOTE.PK; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return TNote.T_NOTE.TITLE; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return TNote.T_NOTE.CATEGORY; } - /** - * {@inheritDoc} - */ @Override public Field field4() { return TNote.T_NOTE.NOTETYPE; } - /** - * {@inheritDoc} - */ @Override public Field field5() { return TNote.T_NOTE.CONTENT; } - /** - * {@inheritDoc} - */ @Override public Field field6() { return TNote.T_NOTE.LASTCHANGE; } - /** - * {@inheritDoc} - */ @Override public Integer component1() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String component2() { return getTitle(); } - /** - * {@inheritDoc} - */ @Override public EnumCategory component3() { return getCategory(); } - /** - * {@inheritDoc} - */ @Override public EnumNotetype component4() { return getNotetype(); } - /** - * {@inheritDoc} - */ @Override public String component5() { return getContent(); } - /** - * {@inheritDoc} - */ @Override public Timestamp component6() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer value1() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String value2() { return getTitle(); } - /** - * {@inheritDoc} - */ @Override public EnumCategory value3() { return getCategory(); } - /** - * {@inheritDoc} - */ @Override public EnumNotetype value4() { return getNotetype(); } - /** - * {@inheritDoc} - */ @Override public String value5() { return getContent(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value6() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public TNoteRecord value1(Integer value) { setPk(value); return this; } - /** - * {@inheritDoc} - */ @Override public TNoteRecord value2(String value) { setTitle(value); return this; } - /** - * {@inheritDoc} - */ @Override public TNoteRecord value3(EnumCategory value) { setCategory(value); return this; } - /** - * {@inheritDoc} - */ @Override public TNoteRecord value4(EnumNotetype value) { setNotetype(value); return this; } - /** - * {@inheritDoc} - */ @Override public TNoteRecord value5(String value) { setContent(value); return this; } - /** - * {@inheritDoc} - */ @Override public TNoteRecord value6(Timestamp value) { setLastchange(value); return this; } - /** - * {@inheritDoc} - */ @Override public TNoteRecord values(Integer value1, String value2, EnumCategory value3, EnumNotetype value4, String value5, Timestamp value6) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/Indexes.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/Indexes.java index 07f92bd..24508a3 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/Indexes.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/Indexes.java @@ -4,16 +4,16 @@ package de.jottyfan.timetrack.db.profile; +import de.jottyfan.timetrack.db.profile.tables.TLogin; +import de.jottyfan.timetrack.db.profile.tables.TLoginrole; +import de.jottyfan.timetrack.db.profile.tables.TRole; + import javax.annotation.Generated; import org.jooq.Index; import org.jooq.OrderField; import org.jooq.impl.Internal; -import de.jottyfan.timetrack.db.profile.tables.TLogin; -import de.jottyfan.timetrack.db.profile.tables.TLoginrole; -import de.jottyfan.timetrack.db.profile.tables.TRole; - /** * A class modelling indexes of tables of the profile schema. @@ -21,7 +21,7 @@ import de.jottyfan.timetrack.db.profile.tables.TRole; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/Profile.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/Profile.java index 4d51f3b..151caaa 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/Profile.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/Profile.java @@ -4,6 +4,12 @@ package de.jottyfan.timetrack.db.profile; +import de.jottyfan.timetrack.db.DefaultCatalog; +import de.jottyfan.timetrack.db.profile.tables.TLogin; +import de.jottyfan.timetrack.db.profile.tables.TLoginrole; +import de.jottyfan.timetrack.db.profile.tables.TRole; +import de.jottyfan.timetrack.db.profile.tables.VLoginrole; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -14,12 +20,6 @@ import org.jooq.Catalog; import org.jooq.Table; import org.jooq.impl.SchemaImpl; -import de.jottyfan.timetrack.db.DefaultCatalog; -import de.jottyfan.timetrack.db.profile.tables.TLogin; -import de.jottyfan.timetrack.db.profile.tables.TLoginrole; -import de.jottyfan.timetrack.db.profile.tables.TRole; -import de.jottyfan.timetrack.db.profile.tables.VLoginrole; - /** * This class is generated by jOOQ. @@ -27,14 +27,14 @@ import de.jottyfan.timetrack.db.profile.tables.VLoginrole; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Profile extends SchemaImpl { - private static final long serialVersionUID = 1056847603; + private static final long serialVersionUID = -1284423911; /** * The reference instance of profile @@ -69,9 +69,6 @@ public class Profile extends SchemaImpl { } - /** - * {@inheritDoc} - */ @Override public Catalog getCatalog() { return DefaultCatalog.DEFAULT_CATALOG; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/Tables.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/Tables.java index 0c5af88..c077a49 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/Tables.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/Tables.java @@ -4,13 +4,13 @@ package de.jottyfan.timetrack.db.profile; -import javax.annotation.Generated; - import de.jottyfan.timetrack.db.profile.tables.TLogin; import de.jottyfan.timetrack.db.profile.tables.TLoginrole; import de.jottyfan.timetrack.db.profile.tables.TRole; import de.jottyfan.timetrack.db.profile.tables.VLoginrole; +import javax.annotation.Generated; + /** * Convenience access to all tables in profile @@ -18,7 +18,7 @@ import de.jottyfan.timetrack.db.profile.tables.VLoginrole; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @@ -28,20 +28,20 @@ public class Tables { /** * The table profile.t_login. */ - public static final TLogin T_LOGIN = de.jottyfan.timetrack.db.profile.tables.TLogin.T_LOGIN; + public static final TLogin T_LOGIN = TLogin.T_LOGIN; /** * The table profile.t_loginrole. */ - public static final TLoginrole T_LOGINROLE = de.jottyfan.timetrack.db.profile.tables.TLoginrole.T_LOGINROLE; + public static final TLoginrole T_LOGINROLE = TLoginrole.T_LOGINROLE; /** * The table profile.t_role. */ - public static final TRole T_ROLE = de.jottyfan.timetrack.db.profile.tables.TRole.T_ROLE; + public static final TRole T_ROLE = TRole.T_ROLE; /** * The table profile.v_loginrole. */ - public static final VLoginrole V_LOGINROLE = de.jottyfan.timetrack.db.profile.tables.VLoginrole.V_LOGINROLE; + public static final VLoginrole V_LOGINROLE = VLoginrole.V_LOGINROLE; } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLogin.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLogin.java index f40b7f1..ae6768d 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLogin.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLogin.java @@ -4,6 +4,10 @@ package de.jottyfan.timetrack.db.profile.tables; +import de.jottyfan.timetrack.db.profile.Indexes; +import de.jottyfan.timetrack.db.profile.Profile; +import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord; + import java.sql.Timestamp; import java.util.Arrays; import java.util.List; @@ -15,16 +19,13 @@ import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row7; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.profile.Indexes; -import de.jottyfan.timetrack.db.profile.Profile; -import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord; - /** * This class is generated by jOOQ. @@ -32,14 +33,14 @@ import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TLogin extends TableImpl { - private static final long serialVersionUID = -417515373; + private static final long serialVersionUID = 950956330; /** * The reference instance of profile.t_login @@ -57,37 +58,37 @@ public class TLogin extends TableImpl { /** * The column profile.t_login.lastchange. */ - public final TableField LASTCHANGE = createField("lastchange", org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); + public final TableField LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); /** * The column profile.t_login.pk. */ - public final TableField PK = createField("pk", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column profile.t_login.login. */ - public final TableField LOGIN = createField("login", org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); + public final TableField LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); /** * The column profile.t_login.forename. */ - public final TableField FORENAME = createField("forename", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField FORENAME = createField(DSL.name("forename"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column profile.t_login.surname. */ - public final TableField SURNAME = createField("surname", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField SURNAME = createField(DSL.name("surname"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column profile.t_login.duedate. */ - public final TableField DUEDATE = createField("duedate", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false), this, ""); + public final TableField DUEDATE = createField(DSL.name("duedate"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false), this, ""); /** * The column profile.t_login.password. */ - public final TableField PASSWORD = createField("password", org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); + public final TableField PASSWORD = createField(DSL.name("password"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); /** * Create a profile.t_login table reference @@ -122,33 +123,21 @@ public class TLogin extends TableImpl { super(child, key, T_LOGIN); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Profile.PROFILE; } - /** - * {@inheritDoc} - */ @Override public List getIndexes() { return Arrays.asList(Indexes.T_LOGIN_LOGIN_KEY, Indexes.T_LOGIN_PKEY); } - /** - * {@inheritDoc} - */ @Override public TLogin as(String alias) { return new TLogin(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public TLogin as(Name alias) { return new TLogin(alias, this); @@ -169,4 +158,13 @@ public class TLogin extends TableImpl { public TLogin rename(Name name) { return new TLogin(name, null); } + + // ------------------------------------------------------------------------- + // Row7 type methods + // ------------------------------------------------------------------------- + + @Override + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLoginrole.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLoginrole.java index c64450d..b1e7554 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLoginrole.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLoginrole.java @@ -4,6 +4,10 @@ package de.jottyfan.timetrack.db.profile.tables; +import de.jottyfan.timetrack.db.profile.Indexes; +import de.jottyfan.timetrack.db.profile.Profile; +import de.jottyfan.timetrack.db.profile.tables.records.TLoginroleRecord; + import java.sql.Timestamp; import java.util.Arrays; import java.util.List; @@ -15,16 +19,13 @@ import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row4; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.profile.Indexes; -import de.jottyfan.timetrack.db.profile.Profile; -import de.jottyfan.timetrack.db.profile.tables.records.TLoginroleRecord; - /** * This class is generated by jOOQ. @@ -32,14 +33,14 @@ import de.jottyfan.timetrack.db.profile.tables.records.TLoginroleRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TLoginrole extends TableImpl { - private static final long serialVersionUID = -808655490; + private static final long serialVersionUID = 1800752164; /** * The reference instance of profile.t_loginrole @@ -57,22 +58,22 @@ public class TLoginrole extends TableImpl { /** * The column profile.t_loginrole.lastchange. */ - public final TableField LASTCHANGE = createField("lastchange", org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); + public final TableField LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); /** * The column profile.t_loginrole.pk. */ - public final TableField PK = createField("pk", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column profile.t_loginrole.fk_login. */ - public final TableField FK_LOGIN = createField("fk_login", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column profile.t_loginrole.fk_role. */ - public final TableField FK_ROLE = createField("fk_role", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField FK_ROLE = createField(DSL.name("fk_role"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * Create a profile.t_loginrole table reference @@ -107,33 +108,21 @@ public class TLoginrole extends TableImpl { super(child, key, T_LOGINROLE); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Profile.PROFILE; } - /** - * {@inheritDoc} - */ @Override public List getIndexes() { return Arrays.asList(Indexes.T_LOGINROLE_FK_LOGIN_FK_ROLE_KEY, Indexes.T_LOGINROLE_PKEY); } - /** - * {@inheritDoc} - */ @Override public TLoginrole as(String alias) { return new TLoginrole(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public TLoginrole as(Name alias) { return new TLoginrole(alias, this); @@ -154,4 +143,13 @@ public class TLoginrole extends TableImpl { public TLoginrole rename(Name name) { return new TLoginrole(name, null); } + + // ------------------------------------------------------------------------- + // Row4 type methods + // ------------------------------------------------------------------------- + + @Override + public Row4 fieldsRow() { + return (Row4) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TRole.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TRole.java index 95fe108..96c26d4 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TRole.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TRole.java @@ -4,6 +4,10 @@ package de.jottyfan.timetrack.db.profile.tables; +import de.jottyfan.timetrack.db.profile.Indexes; +import de.jottyfan.timetrack.db.profile.Profile; +import de.jottyfan.timetrack.db.profile.tables.records.TRoleRecord; + import java.sql.Timestamp; import java.util.Arrays; import java.util.List; @@ -15,16 +19,13 @@ import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row3; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.profile.Indexes; -import de.jottyfan.timetrack.db.profile.Profile; -import de.jottyfan.timetrack.db.profile.tables.records.TRoleRecord; - /** * This class is generated by jOOQ. @@ -32,14 +33,14 @@ import de.jottyfan.timetrack.db.profile.tables.records.TRoleRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TRole extends TableImpl { - private static final long serialVersionUID = -1679621514; + private static final long serialVersionUID = 482541526; /** * The reference instance of profile.t_role @@ -57,17 +58,17 @@ public class TRole extends TableImpl { /** * The column profile.t_role.lastchange. */ - public final TableField LASTCHANGE = createField("lastchange", org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); + public final TableField LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); /** * The column profile.t_role.pk. */ - public final TableField PK = createField("pk", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column profile.t_role.name. */ - public final TableField NAME = createField("name", org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); + public final TableField NAME = createField(DSL.name("name"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); /** * Create a profile.t_role table reference @@ -102,33 +103,21 @@ public class TRole extends TableImpl { super(child, key, T_ROLE); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Profile.PROFILE; } - /** - * {@inheritDoc} - */ @Override public List getIndexes() { return Arrays.asList(Indexes.T_ROLE_NAME_KEY, Indexes.T_ROLE_PKEY); } - /** - * {@inheritDoc} - */ @Override public TRole as(String alias) { return new TRole(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public TRole as(Name alias) { return new TRole(alias, this); @@ -149,4 +138,13 @@ public class TRole extends TableImpl { public TRole rename(Name name) { return new TRole(name, null); } + + // ------------------------------------------------------------------------- + // Row3 type methods + // ------------------------------------------------------------------------- + + @Override + public Row3 fieldsRow() { + return (Row3) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/VLoginrole.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/VLoginrole.java index 98336b2..a7a4f4a 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/VLoginrole.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/VLoginrole.java @@ -4,6 +4,9 @@ package de.jottyfan.timetrack.db.profile.tables; +import de.jottyfan.timetrack.db.profile.Profile; +import de.jottyfan.timetrack.db.profile.tables.records.VLoginroleRecord; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -12,15 +15,13 @@ import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Name; import org.jooq.Record; +import org.jooq.Row5; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import de.jottyfan.timetrack.db.profile.Profile; -import de.jottyfan.timetrack.db.profile.tables.records.VLoginroleRecord; - /** * This class is generated by jOOQ. @@ -28,14 +29,14 @@ import de.jottyfan.timetrack.db.profile.tables.records.VLoginroleRecord; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VLoginrole extends TableImpl { - private static final long serialVersionUID = 1191046808; + private static final long serialVersionUID = 964647722; /** * The reference instance of profile.v_loginrole @@ -53,27 +54,27 @@ public class VLoginrole extends TableImpl { /** * The column profile.v_loginrole.login. */ - public final TableField LOGIN = createField("login", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column profile.v_loginrole.forename. */ - public final TableField FORENAME = createField("forename", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField FORENAME = createField(DSL.name("forename"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column profile.v_loginrole.surname. */ - public final TableField SURNAME = createField("surname", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField SURNAME = createField(DSL.name("surname"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * The column profile.v_loginrole.duedate. */ - public final TableField DUEDATE = createField("duedate", org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); + public final TableField DUEDATE = createField(DSL.name("duedate"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); /** * The column profile.v_loginrole.role_name. */ - public final TableField ROLE_NAME = createField("role_name", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField ROLE_NAME = createField(DSL.name("role_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); /** * Create a profile.v_loginrole table reference @@ -108,25 +109,16 @@ public class VLoginrole extends TableImpl { super(child, key, V_LOGINROLE); } - /** - * {@inheritDoc} - */ @Override public Schema getSchema() { return Profile.PROFILE; } - /** - * {@inheritDoc} - */ @Override public VLoginrole as(String alias) { return new VLoginrole(DSL.name(alias), this); } - /** - * {@inheritDoc} - */ @Override public VLoginrole as(Name alias) { return new VLoginrole(alias, this); @@ -147,4 +139,13 @@ public class VLoginrole extends TableImpl { public VLoginrole rename(Name name) { return new VLoginrole(name, null); } + + // ------------------------------------------------------------------------- + // Row5 type methods + // ------------------------------------------------------------------------- + + @Override + public Row5 fieldsRow() { + return (Row5) super.fieldsRow(); + } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginRecord.java index aecadf0..57a2429 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.profile.tables.records; +import de.jottyfan.timetrack.db.profile.tables.TLogin; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -13,8 +15,6 @@ import org.jooq.Record7; import org.jooq.Row7; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.profile.tables.TLogin; - /** * This class is generated by jOOQ. @@ -22,14 +22,14 @@ import de.jottyfan.timetrack.db.profile.tables.TLogin; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TLoginRecord extends TableRecordImpl implements Record7 { - private static final long serialVersionUID = 1603391159; + private static final long serialVersionUID = 1230282197; /** * Setter for profile.t_login.lastchange. @@ -133,256 +133,163 @@ public class TLoginRecord extends TableRecordImpl implements Recor // Record7 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row7 fieldsRow() { return (Row7) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row7 valuesRow() { return (Row7) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return TLogin.T_LOGIN.LASTCHANGE; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return TLogin.T_LOGIN.PK; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return TLogin.T_LOGIN.LOGIN; } - /** - * {@inheritDoc} - */ @Override public Field field4() { return TLogin.T_LOGIN.FORENAME; } - /** - * {@inheritDoc} - */ @Override public Field field5() { return TLogin.T_LOGIN.SURNAME; } - /** - * {@inheritDoc} - */ @Override public Field field6() { return TLogin.T_LOGIN.DUEDATE; } - /** - * {@inheritDoc} - */ @Override public Field field7() { return TLogin.T_LOGIN.PASSWORD; } - /** - * {@inheritDoc} - */ @Override public Timestamp component1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer component2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String component3() { return getLogin(); } - /** - * {@inheritDoc} - */ @Override public String component4() { return getForename(); } - /** - * {@inheritDoc} - */ @Override public String component5() { return getSurname(); } - /** - * {@inheritDoc} - */ @Override public Timestamp component6() { return getDuedate(); } - /** - * {@inheritDoc} - */ @Override public String component7() { return getPassword(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer value2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String value3() { return getLogin(); } - /** - * {@inheritDoc} - */ @Override public String value4() { return getForename(); } - /** - * {@inheritDoc} - */ @Override public String value5() { return getSurname(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value6() { return getDuedate(); } - /** - * {@inheritDoc} - */ @Override public String value7() { return getPassword(); } - /** - * {@inheritDoc} - */ @Override public TLoginRecord value1(Timestamp value) { setLastchange(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginRecord value2(Integer value) { setPk(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginRecord value3(String value) { setLogin(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginRecord value4(String value) { setForename(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginRecord value5(String value) { setSurname(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginRecord value6(Timestamp value) { setDuedate(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginRecord value7(String value) { setPassword(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginRecord values(Timestamp value1, Integer value2, String value3, String value4, String value5, Timestamp value6, String value7) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginroleRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginroleRecord.java index 9e73621..17c362d 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginroleRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginroleRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.profile.tables.records; +import de.jottyfan.timetrack.db.profile.tables.TLoginrole; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -13,8 +15,6 @@ import org.jooq.Record4; import org.jooq.Row4; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.profile.tables.TLoginrole; - /** * This class is generated by jOOQ. @@ -22,14 +22,14 @@ import de.jottyfan.timetrack.db.profile.tables.TLoginrole; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TLoginroleRecord extends TableRecordImpl implements Record4 { - private static final long serialVersionUID = -558353766; + private static final long serialVersionUID = 440650070; /** * Setter for profile.t_loginrole.lastchange. @@ -91,157 +91,100 @@ public class TLoginroleRecord extends TableRecordImpl implemen // Record4 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row4 valuesRow() { return (Row4) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return TLoginrole.T_LOGINROLE.LASTCHANGE; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return TLoginrole.T_LOGINROLE.PK; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return TLoginrole.T_LOGINROLE.FK_LOGIN; } - /** - * {@inheritDoc} - */ @Override public Field field4() { return TLoginrole.T_LOGINROLE.FK_ROLE; } - /** - * {@inheritDoc} - */ @Override public Timestamp component1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer component2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public Integer component3() { return getFkLogin(); } - /** - * {@inheritDoc} - */ @Override public Integer component4() { return getFkRole(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer value2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public Integer value3() { return getFkLogin(); } - /** - * {@inheritDoc} - */ @Override public Integer value4() { return getFkRole(); } - /** - * {@inheritDoc} - */ @Override public TLoginroleRecord value1(Timestamp value) { setLastchange(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginroleRecord value2(Integer value) { setPk(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginroleRecord value3(Integer value) { setFkLogin(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginroleRecord value4(Integer value) { setFkRole(value); return this; } - /** - * {@inheritDoc} - */ @Override public TLoginroleRecord values(Timestamp value1, Integer value2, Integer value3, Integer value4) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TRoleRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TRoleRecord.java index 03c83e3..a347fdd 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TRoleRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TRoleRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.profile.tables.records; +import de.jottyfan.timetrack.db.profile.tables.TRole; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -13,8 +15,6 @@ import org.jooq.Record3; import org.jooq.Row3; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.profile.tables.TRole; - /** * This class is generated by jOOQ. @@ -22,14 +22,14 @@ import de.jottyfan.timetrack.db.profile.tables.TRole; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TRoleRecord extends TableRecordImpl implements Record3 { - private static final long serialVersionUID = -1670931490; + private static final long serialVersionUID = -108760046; /** * Setter for profile.t_role.lastchange. @@ -77,124 +77,79 @@ public class TRoleRecord extends TableRecordImpl implements Record3 // Record3 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row3 valuesRow() { return (Row3) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return TRole.T_ROLE.LASTCHANGE; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return TRole.T_ROLE.PK; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return TRole.T_ROLE.NAME; } - /** - * {@inheritDoc} - */ @Override public Timestamp component1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer component2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String component3() { return getName(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value1() { return getLastchange(); } - /** - * {@inheritDoc} - */ @Override public Integer value2() { return getPk(); } - /** - * {@inheritDoc} - */ @Override public String value3() { return getName(); } - /** - * {@inheritDoc} - */ @Override public TRoleRecord value1(Timestamp value) { setLastchange(value); return this; } - /** - * {@inheritDoc} - */ @Override public TRoleRecord value2(Integer value) { setPk(value); return this; } - /** - * {@inheritDoc} - */ @Override public TRoleRecord value3(String value) { setName(value); return this; } - /** - * {@inheritDoc} - */ @Override public TRoleRecord values(Timestamp value1, Integer value2, String value3) { value1(value1); diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/VLoginroleRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/VLoginroleRecord.java index 20da953..9ef1330 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/VLoginroleRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/VLoginroleRecord.java @@ -4,6 +4,8 @@ package de.jottyfan.timetrack.db.profile.tables.records; +import de.jottyfan.timetrack.db.profile.tables.VLoginrole; + import java.sql.Timestamp; import javax.annotation.Generated; @@ -13,8 +15,6 @@ import org.jooq.Record5; import org.jooq.Row5; import org.jooq.impl.TableRecordImpl; -import de.jottyfan.timetrack.db.profile.tables.VLoginrole; - /** * This class is generated by jOOQ. @@ -22,14 +22,14 @@ import de.jottyfan.timetrack.db.profile.tables.VLoginrole; @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.11.9" + "jOOQ version:3.12.1" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VLoginroleRecord extends TableRecordImpl implements Record5 { - private static final long serialVersionUID = 1656842842; + private static final long serialVersionUID = 1784395796; /** * Setter for profile.v_loginrole.login. @@ -105,190 +105,121 @@ public class VLoginroleRecord extends TableRecordImpl implemen // Record5 type implementation // ------------------------------------------------------------------------- - /** - * {@inheritDoc} - */ @Override public Row5 fieldsRow() { return (Row5) super.fieldsRow(); } - /** - * {@inheritDoc} - */ @Override public Row5 valuesRow() { return (Row5) super.valuesRow(); } - /** - * {@inheritDoc} - */ @Override public Field field1() { return VLoginrole.V_LOGINROLE.LOGIN; } - /** - * {@inheritDoc} - */ @Override public Field field2() { return VLoginrole.V_LOGINROLE.FORENAME; } - /** - * {@inheritDoc} - */ @Override public Field field3() { return VLoginrole.V_LOGINROLE.SURNAME; } - /** - * {@inheritDoc} - */ @Override public Field field4() { return VLoginrole.V_LOGINROLE.DUEDATE; } - /** - * {@inheritDoc} - */ @Override public Field field5() { return VLoginrole.V_LOGINROLE.ROLE_NAME; } - /** - * {@inheritDoc} - */ @Override public String component1() { return getLogin(); } - /** - * {@inheritDoc} - */ @Override public String component2() { return getForename(); } - /** - * {@inheritDoc} - */ @Override public String component3() { return getSurname(); } - /** - * {@inheritDoc} - */ @Override public Timestamp component4() { return getDuedate(); } - /** - * {@inheritDoc} - */ @Override public String component5() { return getRoleName(); } - /** - * {@inheritDoc} - */ @Override public String value1() { return getLogin(); } - /** - * {@inheritDoc} - */ @Override public String value2() { return getForename(); } - /** - * {@inheritDoc} - */ @Override public String value3() { return getSurname(); } - /** - * {@inheritDoc} - */ @Override public Timestamp value4() { return getDuedate(); } - /** - * {@inheritDoc} - */ @Override public String value5() { return getRoleName(); } - /** - * {@inheritDoc} - */ @Override public VLoginroleRecord value1(String value) { setLogin(value); return this; } - /** - * {@inheritDoc} - */ @Override public VLoginroleRecord value2(String value) { setForename(value); return this; } - /** - * {@inheritDoc} - */ @Override public VLoginroleRecord value3(String value) { setSurname(value); return this; } - /** - * {@inheritDoc} - */ @Override public VLoginroleRecord value4(Timestamp value) { setDuedate(value); return this; } - /** - * {@inheritDoc} - */ @Override public VLoginroleRecord value5(String value) { setRoleName(value); return this; } - /** - * {@inheritDoc} - */ @Override public VLoginroleRecord values(String value1, String value2, String value3, Timestamp value4, String value5) { value1(value1); diff --git a/src/main/java/de/jottyfan/timetrack/help/ThemeBean.java b/src/main/java/de/jottyfan/timetrack/help/ThemeBean.java index c675266..70aa494 100644 --- a/src/main/java/de/jottyfan/timetrack/help/ThemeBean.java +++ b/src/main/java/de/jottyfan/timetrack/help/ThemeBean.java @@ -32,6 +32,7 @@ public class ThemeBean implements Serializable list.add("lumen"); list.add("other"); list.add("paper"); + list.add("patternfly"); list.add("readable"); list.add("sandstone"); list.add("simplex"); diff --git a/src/main/java/de/jottyfan/timetrack/modules/JooqGateway.java b/src/main/java/de/jottyfan/timetrack/modules/JooqGateway.java index 5655931..843dec1 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/JooqGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/JooqGateway.java @@ -1,44 +1,43 @@ package de.jottyfan.timetrack.modules; -import javax.faces.context.FacesContext; +import java.sql.SQLException; import org.jooq.DSLContext; import org.jooq.TableLike; -import de.jooqFaces.EJooqApplicationScope; +import de.jooqFaces.JooqFacesContext; /** * * @author henkej * */ -public class JooqGateway -{ - private final FacesContext facesContext; +public class JooqGateway { + private final JooqFacesContext facesContext; - public JooqGateway(FacesContext facesContext) - { + public JooqGateway(JooqFacesContext facesContext) { this.facesContext = facesContext; } - public DSLContext getJooq() - { - return (DSLContext) facesContext.getExternalContext().getApplicationMap().get(EJooqApplicationScope.JOOQ_FACES_DSLCONTEXT.get()); + public DSLContext getJooq() throws ClassNotFoundException, SQLException { + return (DSLContext) facesContext.getJooq(); } - + public Integer getFkLogin() { - // TODO: make a login, add the profile id to the session and read it here from facesContext + // TODO: make a login, add the profile id to the session and read it here from + // facesContext return 1; } - + /** * return amount of "select count(1) as amount " + subQuery * * @param subQuery * @return number of entries + * @throws ClassNotFoundException + * @throws SQLException */ - public Long getAmount(TableLike table) - { + public Long getAmount(TableLike table) throws ClassNotFoundException, SQLException { return getJooq().selectCount().from(table).fetchOne(0, long.class); } } diff --git a/src/main/java/de/jottyfan/timetrack/modules/SessionControl.java b/src/main/java/de/jottyfan/timetrack/modules/SessionControl.java index 8ba89a6..c6a28ad 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/SessionControl.java +++ b/src/main/java/de/jottyfan/timetrack/modules/SessionControl.java @@ -5,6 +5,7 @@ import javax.faces.context.FacesContext; import javax.inject.Inject; import javax.inject.Named; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.help.Pages; /** @@ -21,7 +22,7 @@ public class SessionControl { public String doLogin() { SessionModel model = new SessionModel(); - model.doLogin(FacesContext.getCurrentInstance(), sessionBean); + model.doLogin((JooqFacesContext) FacesContext.getCurrentInstance(), sessionBean); return Pages.START.get(); } diff --git a/src/main/java/de/jottyfan/timetrack/modules/SessionGateway.java b/src/main/java/de/jottyfan/timetrack/modules/SessionGateway.java index d248ae6..7c587a3 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/SessionGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/SessionGateway.java @@ -2,14 +2,17 @@ package de.jottyfan.timetrack.modules; import static de.jottyfan.timetrack.db.profile.Tables.T_LOGIN; -import javax.faces.context.FacesContext; +import java.sql.SQLException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jooq.DSLContext; import org.jooq.Record4; import org.jooq.SelectConditionStep; import org.jooq.exception.DataAccessException; +import de.jooqFaces.JooqFacesContext; + /** * * @author henkej @@ -18,7 +21,7 @@ import org.jooq.exception.DataAccessException; public class SessionGateway extends JooqGateway { private static final Logger LOGGER = LogManager.getLogger(); - public SessionGateway(FacesContext facesContext) { + public SessionGateway(JooqFacesContext facesContext) { super(facesContext); } @@ -28,31 +31,36 @@ public class SessionGateway extends JooqGateway { * @param bean * the bean * @return true or false + * @throws SQLException + * @throws ClassNotFoundException + * @throws DataAccessException */ - public boolean seekAndSetLogin(SessionBean bean) { - SelectConditionStep> sql = getJooq() - // @formatter:off - .select(T_LOGIN.PK, - T_LOGIN.FORENAME, - T_LOGIN.SURNAME, - T_LOGIN.PASSWORD) - .from(T_LOGIN) - .where(T_LOGIN.LOGIN.eq(bean.getUsername())); - // @formatter:on - LOGGER.debug(sql.toString()); - Record4 r = sql.fetchOne(); - if (r != null) { - String encrypted = r.get(T_LOGIN.PASSWORD); - if (bean.checkSecret(encrypted)) { - bean.setLogin(r.get(T_LOGIN.PK)); - bean.setForename(r.get(T_LOGIN.FORENAME)); - bean.setSurname(r.get(T_LOGIN.SURNAME)); - return true; + public boolean seekAndSetLogin(SessionBean bean) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + SelectConditionStep> sql = jooq + // @formatter:off + .select(T_LOGIN.PK, + T_LOGIN.FORENAME, + T_LOGIN.SURNAME, + T_LOGIN.PASSWORD) + .from(T_LOGIN) + .where(T_LOGIN.LOGIN.eq(bean.getUsername())); + // @formatter:on + LOGGER.debug(sql.toString()); + Record4 r = sql.fetchOne(); + if (r != null) { + String encrypted = r.get(T_LOGIN.PASSWORD); + if (bean.checkSecret(encrypted)) { + bean.setLogin(r.get(T_LOGIN.PK)); + bean.setForename(r.get(T_LOGIN.FORENAME)); + bean.setSurname(r.get(T_LOGIN.SURNAME)); + return true; + } else { + throw new DataAccessException("wrong password"); + } } else { - throw new DataAccessException("wrong password"); + return false; } - } else { - return false; } } diff --git a/src/main/java/de/jottyfan/timetrack/modules/SessionModel.java b/src/main/java/de/jottyfan/timetrack/modules/SessionModel.java index 35a9284..5a34443 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/SessionModel.java +++ b/src/main/java/de/jottyfan/timetrack/modules/SessionModel.java @@ -1,10 +1,13 @@ package de.jottyfan.timetrack.modules; +import java.sql.SQLException; + import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import org.jooq.exception.DataAccessException; +import de.jooqFaces.JooqFacesContext; + /** * * @author henkej @@ -12,10 +15,10 @@ import org.jooq.exception.DataAccessException; */ public class SessionModel { - public boolean doLogin(FacesContext facesContext, SessionBean bean) { + public boolean doLogin(JooqFacesContext facesContext, SessionBean bean) { try { return new SessionGateway(facesContext).seekAndSetLogin(bean); - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { FacesMessage msg = new FacesMessage(FacesMessage.SEVERITY_ERROR, "error on login", e.getMessage()); facesContext.addMessage(null, msg); return false; diff --git a/src/main/java/de/jottyfan/timetrack/modules/contact/ContactControl.java b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactControl.java index f662b66..5d43eb0 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/contact/ContactControl.java +++ b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactControl.java @@ -7,6 +7,7 @@ import javax.faces.context.FacesContext; import javax.inject.Inject; import javax.inject.Named; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.help.Navigation; import de.jottyfan.timetrack.help.Pages; import de.jottyfan.timetrack.modules.ControlInterface; @@ -30,7 +31,7 @@ public class ContactControl extends Navigation implements ControlInterface, Seri } public String toList() { - boolean ready = model.init(FacesContext.getCurrentInstance()); + boolean ready = model.init((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? navigateTo(Pages.CONTACT_LIST) : toStart(); } @@ -45,21 +46,21 @@ public class ContactControl extends Navigation implements ControlInterface, Seri } public String doAdd() { - boolean ready = model.add(FacesContext.getCurrentInstance()); + boolean ready = model.add((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? toList() : navigateTo(Pages.CONTACT_ITEM); } public String doUpdate() { - boolean ready = model.update(FacesContext.getCurrentInstance()); + boolean ready = model.update((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? toList() : navigateTo(Pages.CONTACT_ITEM); } public String doDelete() { - boolean ready = model.delete(FacesContext.getCurrentInstance()); + boolean ready = model.delete((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? toList() : navigateTo(Pages.CONTACT_ITEM); } public Integer getAmount() { - return model.getAmount(FacesContext.getCurrentInstance()); + return model.getAmount((JooqFacesContext) FacesContext.getCurrentInstance()); } } diff --git a/src/main/java/de/jottyfan/timetrack/modules/contact/ContactGateway.java b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactGateway.java index 3321fc9..db445bb 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/contact/ContactGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactGateway.java @@ -2,22 +2,24 @@ package de.jottyfan.timetrack.modules.contact; import static de.jottyfan.timetrack.db.contact.Tables.T_CONTACT; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.faces.context.FacesContext; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jooq.DSLContext; import org.jooq.DeleteConditionStep; import org.jooq.InsertValuesStep4; import org.jooq.Record1; import org.jooq.Record5; import org.jooq.SelectJoinStep; import org.jooq.UpdateConditionStep; +import org.jooq.exception.DataAccessException; import org.jooq.impl.DSL; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord; import de.jottyfan.timetrack.modules.JooqGateway; @@ -30,7 +32,7 @@ import de.jottyfan.timetrack.modules.JooqGateway; public class ContactGateway extends JooqGateway { private static final Logger LOGGER = LogManager.getLogger(ContactGateway.class); - public ContactGateway(FacesContext facesContext) { + public ContactGateway(JooqFacesContext facesContext) { super(facesContext); } @@ -38,29 +40,34 @@ public class ContactGateway extends JooqGateway { * get sorted list of contacts * * @return a list (an empty one at least) + * @throws SQLException + * @throws ClassNotFoundException + * @throws DataAccessException */ - public List getAll() { - SelectJoinStep> sql = getJooq() - // @formatter:off - .select(T_CONTACT.PK, - T_CONTACT.FORENAME, - T_CONTACT.SURNAME, - T_CONTACT.CONTACT, - T_CONTACT.TYPE) - .from(T_CONTACT); - // @formatter:on - LOGGER.debug("{}", sql.toString()); - List list = new ArrayList<>(); - for (Record5 r : sql.fetch()) { - ContactBean bean = new ContactBean(r.get(T_CONTACT.PK)); - bean.setForename(r.get(T_CONTACT.FORENAME)); - bean.setSurname(r.get(T_CONTACT.SURNAME)); - bean.setContact(r.get(T_CONTACT.CONTACT)); - bean.setType(r.get(T_CONTACT.TYPE)); - list.add(bean); + public List getAll() throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + SelectJoinStep> sql = jooq + // @formatter:off + .select(T_CONTACT.PK, + T_CONTACT.FORENAME, + T_CONTACT.SURNAME, + T_CONTACT.CONTACT, + T_CONTACT.TYPE) + .from(T_CONTACT); + // @formatter:on + LOGGER.debug("{}", sql.toString()); + List list = new ArrayList<>(); + for (Record5 r : sql.fetch()) { + ContactBean bean = new ContactBean(r.get(T_CONTACT.PK)); + bean.setForename(r.get(T_CONTACT.FORENAME)); + bean.setSurname(r.get(T_CONTACT.SURNAME)); + bean.setContact(r.get(T_CONTACT.CONTACT)); + bean.setType(r.get(T_CONTACT.TYPE)); + list.add(bean); + } + list.sort((o1, o2) -> o1 == null ? 0 : o1.compareTo(o2)); + return list; } - list.sort((o1, o2) -> o1 == null ? 0 : o1.compareTo(o2)); - return list; } /** @@ -69,15 +76,20 @@ public class ContactGateway extends JooqGateway { * @param pk * the id of the contact * @return the number of affected database rows, should be 1 + * @throws SQLException + * @throws ClassNotFoundException + * @throws DataAccessException */ - public Integer delete(Integer pk) { - DeleteConditionStep sql = getJooq() - // @formatter:off - .deleteFrom(T_CONTACT) - .where(T_CONTACT.PK.eq(pk)); - // @formatter:on - LOGGER.debug("{}", sql.toString()); - return sql.execute(); + public Integer delete(Integer pk) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + DeleteConditionStep sql = jooq + // @formatter:off + .deleteFrom(T_CONTACT) + .where(T_CONTACT.PK.eq(pk)); + // @formatter:on + LOGGER.debug("{}", sql.toString()); + return sql.execute(); + } } @@ -87,19 +99,24 @@ public class ContactGateway extends JooqGateway { * @param bean * the contact information * @return the number of affected database rows, should be 1 + * @throws SQLException + * @throws ClassNotFoundException + * @throws DataAccessException */ - public Integer add(ContactBean bean) { - InsertValuesStep4 sql = getJooq() - // @formatter:off - .insertInto(T_CONTACT, - T_CONTACT.FORENAME, - T_CONTACT.SURNAME, - T_CONTACT.CONTACT, - T_CONTACT.TYPE) - .values(bean.getForename(), bean.getSurname(), bean.getContact(), bean.getType()); - // @formatter:on - LOGGER.debug("{}", sql.toString()); - return sql.execute(); + public Integer add(ContactBean bean) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + InsertValuesStep4 sql = jooq + // @formatter:off + .insertInto(T_CONTACT, + T_CONTACT.FORENAME, + T_CONTACT.SURNAME, + T_CONTACT.CONTACT, + T_CONTACT.TYPE) + .values(bean.getForename(), bean.getSurname(), bean.getContact(), bean.getType()); + // @formatter:on + LOGGER.debug("{}", sql.toString()); + return sql.execute(); + } } /** @@ -108,34 +125,44 @@ public class ContactGateway extends JooqGateway { * @param bean * the contact information * @return the number of affected database rows, should be 1 + * @throws SQLException + * @throws ClassNotFoundException + * @throws DataAccessException */ - public Integer update(ContactBean bean) { - UpdateConditionStep sql = getJooq() - // @formatter:off - .update(T_CONTACT) - .set(T_CONTACT.FORENAME, bean.getForename()) - .set(T_CONTACT.SURNAME, bean.getSurname()) - .set(T_CONTACT.CONTACT, bean.getContact()) - .set(T_CONTACT.TYPE, bean.getType()) - .where(T_CONTACT.PK.eq(bean.getPk())); - // @formatter:on - LOGGER.debug("{}", sql.toString()); - return sql.execute(); + public Integer update(ContactBean bean) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + UpdateConditionStep sql = jooq + // @formatter:off + .update(T_CONTACT) + .set(T_CONTACT.FORENAME, bean.getForename()) + .set(T_CONTACT.SURNAME, bean.getSurname()) + .set(T_CONTACT.CONTACT, bean.getContact()) + .set(T_CONTACT.TYPE, bean.getType()) + .where(T_CONTACT.PK.eq(bean.getPk())); + // @formatter:on + LOGGER.debug("{}", sql.toString()); + return sql.execute(); + } } /** * get number of entries in t_contact * * @return number of entries + * @throws SQLException + * @throws ClassNotFoundException + * @throws DataAccessException */ - public Integer getAmount() { - SelectJoinStep> sql = getJooq() - // @formatter:off - .selectCount() - .from(T_CONTACT); - // @formatter:on - LOGGER.debug("{}", sql.toString()); - return sql.fetchOne(DSL.count()); + public Integer getAmount() throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + SelectJoinStep> sql = jooq + // @formatter:off + .selectCount() + .from(T_CONTACT); + // @formatter:on + LOGGER.debug("{}", sql.toString()); + return sql.fetchOne(DSL.count()); + } } /** diff --git a/src/main/java/de/jottyfan/timetrack/modules/contact/ContactModel.java b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactModel.java index 5153467..9eb8a9a 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/contact/ContactModel.java +++ b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactModel.java @@ -1,16 +1,17 @@ package de.jottyfan.timetrack.modules.contact; import java.io.Serializable; +import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import javax.enterprise.context.SessionScoped; import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import javax.inject.Named; import org.jooq.exception.DataAccessException; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; import de.jottyfan.timetrack.modules.Model; @@ -28,14 +29,14 @@ public class ContactModel implements Model, Serializable { private List list; private List types; - public boolean init(FacesContext facesContext) { + public boolean init(JooqFacesContext facesContext) { bean = new ContactBean(null); try { ContactGateway gw = new ContactGateway(facesContext); list = gw.getAll(); types = gw.getTypes(); return true; - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error on loading data from db", e.getMessage())); list = new ArrayList<>(); @@ -44,46 +45,46 @@ public class ContactModel implements Model, Serializable { } } - public boolean delete(FacesContext facesContext) { + public boolean delete(JooqFacesContext facesContext) { try { Integer affected = new ContactGateway(facesContext).delete(bean.getPk()); return affected.equals(1); - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error on deleting data from db", e.getMessage())); return false; } } - public boolean add(FacesContext facesContext) { + public boolean add(JooqFacesContext facesContext) { try { Integer affected = new ContactGateway(facesContext).add(bean); return affected.equals(1); - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error on adding data to db", e.getMessage())); return false; } } - public boolean update(FacesContext facesContext) { + public boolean update(JooqFacesContext facesContext) { try { Integer affected = new ContactGateway(facesContext).update(bean); return affected.equals(1); - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error on updating data to db", e.getMessage())); return false; } } - public Integer getAmount(FacesContext facesContext) { + public Integer getAmount(JooqFacesContext facesContext) { try { return new ContactGateway(facesContext).getAmount(); - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error on getting size of contacts", e.getMessage())); - return 0; + return -1; } } diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneControl.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneControl.java index 1995d4b..c39a727 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneControl.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneControl.java @@ -10,6 +10,7 @@ import javax.faces.context.FacesContext; import javax.inject.Inject; import javax.inject.Named; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.help.Navigation; import de.jottyfan.timetrack.help.Pages; import de.jottyfan.timetrack.modules.ControlInterface; @@ -33,7 +34,7 @@ public class DoneControl extends Navigation implements ControlInterface, Seriali } public String toList() { - boolean ready = model.init(FacesContext.getCurrentInstance()); + boolean ready = model.init((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? navigateTo(Pages.DONE_INIT) : toStart(); } @@ -41,13 +42,13 @@ public class DoneControl extends Navigation implements ControlInterface, Seriali DoneBean bean = new DoneBean(); bean.setTimeFrom(getCurrentDate()); model.setBean(bean); - boolean ready = model.loadDefaults(FacesContext.getCurrentInstance()); + boolean ready = model.loadDefaults((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? navigateTo(Pages.DONE_ADD) : toList(); } public String toEdit(DoneBean bean) { model.setBean(bean); - boolean ready = model.loadDefaults(FacesContext.getCurrentInstance()); + boolean ready = model.loadDefaults((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? navigateTo(Pages.DONE_EDIT) : toList(); } @@ -57,17 +58,17 @@ public class DoneControl extends Navigation implements ControlInterface, Seriali } public String doUpdate() { - boolean ready = model.update(FacesContext.getCurrentInstance()); + boolean ready = model.update((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? toList() : toEdit(model.getBean()); } public String doDelete() { - boolean ready = model.delete(FacesContext.getCurrentInstance()); + boolean ready = model.delete((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? toList() : toDelete(model.getBean()); } public String doAdd() { - boolean ready = model.insert(FacesContext.getCurrentInstance()); + boolean ready = model.insert((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? toList() : toAdd(); } diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java index ce5aae4..e9c8211 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java @@ -7,6 +7,7 @@ import static de.jottyfan.timetrack.db.done.Tables.T_PROJECT; import static de.jottyfan.timetrack.db.done.Tables.V_TASKLIST; import static de.jottyfan.timetrack.db.done.Tables.V_TOTALOFDAY; +import java.sql.SQLException; import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.time.LocalDateTime; @@ -16,10 +17,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.faces.context.FacesContext; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jooq.DSLContext; import org.jooq.DeleteConditionStep; import org.jooq.InsertValuesStep6; import org.jooq.Record; @@ -30,6 +30,7 @@ import org.jooq.SelectWhereStep; import org.jooq.UpdateConditionStep; import org.jooq.exception.DataAccessException; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord; import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; @@ -46,7 +47,7 @@ import net.bootsfaces.component.fullCalendar.FullCalendarEventList; public class DoneGateway extends JooqGateway { private final static Logger LOGGER = LogManager.getLogger(DoneGateway.class); - public DoneGateway(FacesContext facesContext) { + public DoneGateway(JooqFacesContext facesContext) { super(facesContext); } @@ -54,51 +55,63 @@ public class DoneGateway extends JooqGateway { * get all modules from db * * @return modules + * @throws SQLException + * @throws ClassNotFoundException */ - public List getAllModules() throws DataAccessException { - List list = new ArrayList<>(); - SelectWhereStep sql = getJooq().selectFrom(T_MODULE); - LOGGER.debug(sql.toString()); - for (TModuleRecord r : sql.fetch()) { - list.add(r); + public List getAllModules() throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + List list = new ArrayList<>(); + SelectWhereStep sql = jooq.selectFrom(T_MODULE); + LOGGER.debug(sql.toString()); + for (TModuleRecord r : sql.fetch()) { + list.add(r); + } + list.sort((o1, o2) -> o1 == null || o2 == null || o1.getName() == null || o2.getName() == null ? 0 + : o1.getName().compareTo(o2.getName())); + return list; } - list.sort((o1, o2) -> o1 == null || o2 == null || o1.getName() == null || o2.getName() == null ? 0 - : o1.getName().compareTo(o2.getName())); - return list; } /** * get all activities from db * * @return activities + * @throws SQLException + * @throws ClassNotFoundException */ - public List getAllActivities() throws DataAccessException { - List list = new ArrayList<>(); - SelectWhereStep sql = getJooq().selectFrom(T_JOB); - LOGGER.debug(sql.toString()); - for (TJobRecord r : sql.fetch()) { - list.add(r); + public List getAllActivities() throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + List list = new ArrayList<>(); + SelectWhereStep sql = jooq.selectFrom(T_JOB); + LOGGER.debug(sql.toString()); + for (TJobRecord r : sql.fetch()) { + list.add(r); + } + list.sort((o1, o2) -> o1 == null || o2 == null || o1.getName() == null || o2.getName() == null ? 0 + : o1.getName().compareTo(o2.getName())); + return list; } - list.sort((o1, o2) -> o1 == null || o2 == null || o1.getName() == null || o2.getName() == null ? 0 - : o1.getName().compareTo(o2.getName())); - return list; } /** * get all projects from db * * @return projects + * @throws SQLException + * @throws ClassNotFoundException */ - public List getAllProjects() throws DataAccessException { - List list = new ArrayList<>(); - SelectWhereStep sql = getJooq().selectFrom(T_PROJECT); - LOGGER.debug(sql.toString()); - for (TProjectRecord r : sql.fetch()) { - list.add(r); + public List getAllProjects() throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + List list = new ArrayList<>(); + SelectWhereStep sql = jooq.selectFrom(T_PROJECT); + LOGGER.debug(sql.toString()); + for (TProjectRecord r : sql.fetch()) { + list.add(r); + } + list.sort((o1, o2) -> o1 == null || o2 == null || o1.getName() == null || o2.getName() == null ? 0 + : o1.getName().compareTo(o2.getName())); + return list; } - list.sort((o1, o2) -> o1 == null || o2 == null || o1.getName() == null || o2.getName() == null ? 0 - : o1.getName().compareTo(o2.getName())); - return list; } private Map generateProjectMap(List list) { @@ -132,8 +145,10 @@ public class DoneGateway extends JooqGateway { * the day; if null, the current date is used * * @return a list of found times, an empty one at least + * @throws SQLException + * @throws ClassNotFoundException */ - public List getAll(LocalDateTime day) throws DataAccessException { + public List getAll(LocalDateTime day) throws DataAccessException, ClassNotFoundException, SQLException { Map projectMap = generateProjectMap(getAllProjects()); Map moduleMap = generateModuleMap(getAllModules()); Map jobMap = generateJobMap(getAllActivities()); @@ -145,20 +160,22 @@ public class DoneGateway extends JooqGateway { LocalDateTime tomorrow = day.plusDays(1).withHour(0).withMinute(0).withSecond(0).withNano(0); List list = new ArrayList<>(); - SelectConditionStep sql = getJooq() - // @formatter:off - .selectFrom(T_DONE) - .where(T_DONE.FK_LOGIN.eq(getFkLogin())) - .and(T_DONE.TIME_FROM.isNull() - .or(T_DONE.TIME_FROM.greaterThan(Timestamp.valueOf(yesterday)) - .and(T_DONE.TIME_FROM.lessThan(Timestamp.valueOf(tomorrow))))) - .and(T_DONE.TIME_UNTIL.isNull() - .or(T_DONE.TIME_UNTIL.lessThan(Timestamp.valueOf(tomorrow)) - .and(T_DONE.TIME_UNTIL.greaterThan(Timestamp.valueOf(yesterday))))); - // @formatter:on - LOGGER.debug(sql.toString()); - for (TDoneRecord r : sql.fetch()) { - list.add(new DoneBean(r, projectMap, moduleMap, jobMap)); + try (DSLContext jooq = getJooq()) { + SelectConditionStep sql = getJooq() + // @formatter:off + .selectFrom(T_DONE) + .where(T_DONE.FK_LOGIN.eq(getFkLogin())) + .and(T_DONE.TIME_FROM.isNull() + .or(T_DONE.TIME_FROM.greaterThan(Timestamp.valueOf(yesterday)) + .and(T_DONE.TIME_FROM.lessThan(Timestamp.valueOf(tomorrow))))) + .and(T_DONE.TIME_UNTIL.isNull() + .or(T_DONE.TIME_UNTIL.lessThan(Timestamp.valueOf(tomorrow)) + .and(T_DONE.TIME_UNTIL.greaterThan(Timestamp.valueOf(yesterday))))); + // @formatter:on + LOGGER.debug(sql.toString()); + for (TDoneRecord r : sql.fetch()) { + list.add(new DoneBean(r, projectMap, moduleMap, jobMap)); + } } list.sort((o1, o2) -> o1 == null || o2 == null ? 0 : o1.compareTo(o2)); return list; @@ -168,57 +185,69 @@ public class DoneGateway extends JooqGateway { * insert data into t_done * * @param bean + * @throws SQLException + * @throws ClassNotFoundException */ - public void insert(DoneBean bean) throws DataAccessException { + public void insert(DoneBean bean) throws DataAccessException, ClassNotFoundException, SQLException { Integer fkProject = bean.getProject() == null ? null : bean.getProject().getPk(); Integer fkModule = bean.getModule() == null ? null : bean.getModule().getPk(); Integer fkJob = bean.getActivity() == null ? null : bean.getActivity().getPk(); Integer fkLogin = getFkLogin(); - InsertValuesStep6 sql = getJooq() - // @formatter:off - .insertInto(T_DONE, - T_DONE.TIME_FROM, - T_DONE.TIME_UNTIL, - T_DONE.FK_PROJECT, - T_DONE.FK_MODULE, - T_DONE.FK_JOB, - T_DONE.FK_LOGIN) - .values(bean.getTimeFrom(), bean.getTimeUntil(), fkProject, fkModule, fkJob, fkLogin); - // @formatter:on - LOGGER.debug(sql.toString()); - sql.execute(); + try (DSLContext jooq = getJooq()) { + InsertValuesStep6 sql = jooq + // @formatter:off + .insertInto(T_DONE, + T_DONE.TIME_FROM, + T_DONE.TIME_UNTIL, + T_DONE.FK_PROJECT, + T_DONE.FK_MODULE, + T_DONE.FK_JOB, + T_DONE.FK_LOGIN) + .values(bean.getTimeFrom(), bean.getTimeUntil(), fkProject, fkModule, fkJob, fkLogin); + // @formatter:on + LOGGER.debug(sql.toString()); + sql.execute(); + } } /** * update bean in t_done * * @param bean + * @throws SQLException + * @throws ClassNotFoundException */ - public void update(DoneBean bean) throws DataAccessException { - UpdateConditionStep sql = getJooq() - // @formatter:off - .update(T_DONE) - .set(T_DONE.TIME_FROM, bean.getTimeFrom()) - .set(T_DONE.TIME_UNTIL, bean.getTimeUntil()) - .set(T_DONE.FK_PROJECT, bean.getProject() == null ? null : bean.getProject().getPk()) - .set(T_DONE.FK_JOB, bean.getActivity() == null ? null : bean.getActivity().getPk()) - .set(T_DONE.FK_MODULE, bean.getModule() == null ? null : bean.getModule().getPk()) - .where(T_DONE.PK.eq(bean.getPk())); - // @formatter:on - LOGGER.debug(sql.toString()); - sql.execute(); + public void update(DoneBean bean) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + UpdateConditionStep sql = jooq + // @formatter:off + .update(T_DONE) + .set(T_DONE.TIME_FROM, bean.getTimeFrom()) + .set(T_DONE.TIME_UNTIL, bean.getTimeUntil()) + .set(T_DONE.FK_PROJECT, bean.getProject() == null ? null : bean.getProject().getPk()) + .set(T_DONE.FK_JOB, bean.getActivity() == null ? null : bean.getActivity().getPk()) + .set(T_DONE.FK_MODULE, bean.getModule() == null ? null : bean.getModule().getPk()) + .where(T_DONE.PK.eq(bean.getPk())); + // @formatter:on + LOGGER.debug(sql.toString()); + sql.execute(); + } } /** * delete bean from t_done * * @param bean + * @throws SQLException + * @throws ClassNotFoundException */ - public void delete(DoneBean bean) throws DataAccessException { - DeleteConditionStep sql = getJooq().deleteFrom(T_DONE).where(T_DONE.PK.eq(bean.getPk())); - LOGGER.debug(sql.toString()); - sql.execute(); + public void delete(DoneBean bean) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + DeleteConditionStep sql = jooq.deleteFrom(T_DONE).where(T_DONE.PK.eq(bean.getPk())); + LOGGER.debug(sql.toString()); + sql.execute(); + } } /** @@ -227,28 +256,33 @@ public class DoneGateway extends JooqGateway { * @param day * the day * @return the day summary if found, an empty map otherwise + * @throws SQLException + * @throws ClassNotFoundException + * @throws DataAccessException */ - public WholeDaySummaryBean getDaySummary(Date day) { - SelectConditionStep> sql = getJooq() - // @formatter:off - .select(V_TOTALOFDAY.STARTTIME, - V_TOTALOFDAY.ENDTIME, - V_TOTALOFDAY.WORKTIME, - V_TOTALOFDAY.BREAKTIME) - .from(V_TOTALOFDAY) - .where(V_TOTALOFDAY.DAY.eq(new SimpleDateFormat("yyyy-MM-dd").format(day))) - .and(V_TOTALOFDAY.FK_LOGIN.eq(getFkLogin())); - // @formatter:on - LOGGER.debug(sql.toString()); - Record r = sql.fetchOne(); - if (r != null) { - String startTime = r.get(V_TOTALOFDAY.STARTTIME); - String endTime = r.get(V_TOTALOFDAY.ENDTIME); - String workTime = r.get(V_TOTALOFDAY.WORKTIME); - String breakTime = r.get(V_TOTALOFDAY.BREAKTIME); - return new WholeDaySummaryBean(startTime, endTime, workTime, breakTime); + public WholeDaySummaryBean getDaySummary(Date day) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + SelectConditionStep> sql = jooq + // @formatter:off + .select(V_TOTALOFDAY.STARTTIME, + V_TOTALOFDAY.ENDTIME, + V_TOTALOFDAY.WORKTIME, + V_TOTALOFDAY.BREAKTIME) + .from(V_TOTALOFDAY) + .where(V_TOTALOFDAY.DAY.eq(new SimpleDateFormat("yyyy-MM-dd").format(day))) + .and(V_TOTALOFDAY.FK_LOGIN.eq(getFkLogin())); + // @formatter:on + LOGGER.debug(sql.toString()); + Record r = sql.fetchOne(); + if (r != null) { + String startTime = r.get(V_TOTALOFDAY.STARTTIME); + String endTime = r.get(V_TOTALOFDAY.ENDTIME); + String workTime = r.get(V_TOTALOFDAY.WORKTIME); + String breakTime = r.get(V_TOTALOFDAY.BREAKTIME); + return new WholeDaySummaryBean(startTime, endTime, workTime, breakTime); + } + return new WholeDaySummaryBean("", "", "", ""); } - return new WholeDaySummaryBean("", "", "", ""); } /** @@ -257,76 +291,86 @@ public class DoneGateway extends JooqGateway { * @param day * the day * @return list of found jobs; an empty list at least + * @throws SQLException + * @throws ClassNotFoundException + * @throws DataAccessException */ - public List getAllJobs(Date day) { - SelectConditionStep> sql = getJooq() - // @formatter:off - .select(V_TASKLIST.DURATION, - V_TASKLIST.PROJECT_NAME, - V_TASKLIST.MODULE_NAME, - V_TASKLIST.JOB_NAME) - .from(V_TASKLIST) - .where(V_TASKLIST.DAY.eq(new SimpleDateFormat("yyyy-MM-dd").format(day))) - .and(V_TASKLIST.FK_LOGIN.eq(getFkLogin())); - // @formatter:on - LOGGER.debug(sql.toString()); - List list = new ArrayList<>(); - for (Record4 r : sql.fetch()) { - String duration = r.get(V_TASKLIST.DURATION); - String projectName = r.get(V_TASKLIST.PROJECT_NAME); - String moduleName = r.get(V_TASKLIST.MODULE_NAME); - String jobName = r.get(V_TASKLIST.JOB_NAME); - list.add(new DailySummaryBean(projectName, moduleName, jobName, duration)); + public List getAllJobs(Date day) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + SelectConditionStep> sql = jooq + // @formatter:off + .select(V_TASKLIST.DURATION, + V_TASKLIST.PROJECT_NAME, + V_TASKLIST.MODULE_NAME, + V_TASKLIST.JOB_NAME) + .from(V_TASKLIST) + .where(V_TASKLIST.DAY.eq(new SimpleDateFormat("yyyy-MM-dd").format(day))) + .and(V_TASKLIST.FK_LOGIN.eq(getFkLogin())); + // @formatter:on + LOGGER.debug(sql.toString()); + List list = new ArrayList<>(); + for (Record4 r : sql.fetch()) { + String duration = r.get(V_TASKLIST.DURATION); + String projectName = r.get(V_TASKLIST.PROJECT_NAME); + String moduleName = r.get(V_TASKLIST.MODULE_NAME); + String jobName = r.get(V_TASKLIST.JOB_NAME); + list.add(new DailySummaryBean(projectName, moduleName, jobName, duration)); + } + return list; } - return list; } /** * get json representation of all calendar events of user * * @return + * @throws SQLException + * @throws ClassNotFoundException + * @throws DataAccessException */ - public String getAllCalendarEvents() { - SelectConditionStep> sql = getJooq() - // @formatter:off - .select(T_DONE.TIME_FROM, - T_DONE.TIME_UNTIL, - T_PROJECT.NAME, - T_MODULE.NAME, - T_JOB.NAME) - .from(T_DONE) - .leftJoin(T_PROJECT).on(T_PROJECT.PK.eq(T_DONE.FK_PROJECT)) - .leftJoin(T_MODULE).on(T_MODULE.PK.eq(T_DONE.FK_MODULE)) - .leftJoin(T_JOB).on(T_JOB.PK.eq(T_DONE.FK_JOB)) - .where(T_DONE.FK_LOGIN.eq(getFkLogin())); - // @formatter:on - LOGGER.debug(sql.toString()); - FullCalendarEventList list = new FullCalendarEventList(); - for (Record r : sql.fetch()) { - String projectName = r.get(T_PROJECT.NAME); - String moduleName = r.get(T_MODULE.NAME); - String jobName = r.get(T_JOB.NAME); - Date timeFrom = r.get(T_DONE.TIME_FROM); - Date timeUntil = r.get(T_DONE.TIME_UNTIL); + public String getAllCalendarEvents() throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + SelectConditionStep> sql = jooq + // @formatter:off + .select(T_DONE.TIME_FROM, + T_DONE.TIME_UNTIL, + T_PROJECT.NAME, + T_MODULE.NAME, + T_JOB.NAME) + .from(T_DONE) + .leftJoin(T_PROJECT).on(T_PROJECT.PK.eq(T_DONE.FK_PROJECT)) + .leftJoin(T_MODULE).on(T_MODULE.PK.eq(T_DONE.FK_MODULE)) + .leftJoin(T_JOB).on(T_JOB.PK.eq(T_DONE.FK_JOB)) + .where(T_DONE.FK_LOGIN.eq(getFkLogin())); + // @formatter:on + LOGGER.debug(sql.toString()); + FullCalendarEventList list = new FullCalendarEventList(); + for (Record r : sql.fetch()) { + String projectName = r.get(T_PROJECT.NAME); + String moduleName = r.get(T_MODULE.NAME); + String jobName = r.get(T_JOB.NAME); + Date timeFrom = r.get(T_DONE.TIME_FROM); + Date timeUntil = r.get(T_DONE.TIME_UNTIL); - StringBuilder buf = new StringBuilder(); - buf.append(projectName); - buf.append(", "); - buf.append(moduleName); - buf.append(": "); - buf.append(jobName); + StringBuilder buf = new StringBuilder(); + buf.append(projectName); + buf.append(", "); + buf.append(moduleName); + buf.append(": "); + buf.append(jobName); - FullCalendarEventBean bean = new FullCalendarEventBean(buf.toString(), timeFrom) { - private static final long serialVersionUID = 1L; + FullCalendarEventBean bean = new FullCalendarEventBean(buf.toString(), timeFrom) { + private static final long serialVersionUID = 1L; - @Override - public void addExtendedFields(StringBuilder buf) { - } - }; - bean.setEnd(timeUntil); - bean.setColor(new RgbColor().determineRgbColor(projectName, moduleName, jobName)); - list.getList().add(bean); + @Override + public void addExtendedFields(StringBuilder buf) { + } + }; + bean.setEnd(timeUntil); + bean.setColor(new RgbColor().determineRgbColor(projectName, moduleName, jobName)); + list.getList().add(bean); + } + return list.toJson(); } - return list.toJson(); } } diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java index fafde7f..d7a454a 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java @@ -1,6 +1,7 @@ package de.jottyfan.timetrack.modules.done; import java.io.Serializable; +import java.sql.SQLException; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneId; @@ -13,11 +14,11 @@ import java.util.TimeZone; import javax.enterprise.context.SessionScoped; import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import javax.inject.Named; import org.jooq.exception.DataAccessException; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; @@ -44,7 +45,7 @@ public class DoneModel implements Model, Serializable { private Date day; private String calendarEvents; - public boolean init(FacesContext facesContext) { + public boolean init(JooqFacesContext facesContext) { try { day = day == null ? new Date() : day; beans = getAllOfDay(facesContext, day); @@ -56,13 +57,13 @@ public class DoneModel implements Model, Serializable { allJobs = gw.getAllJobs(day); calendarEvents = gw.getAllCalendarEvents(); return true; - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error", e.getMessage())); return false; } } - public boolean loadDefaults(FacesContext facesContext) { + public boolean loadDefaults(JooqFacesContext facesContext) { try { defineTimes(); return true; @@ -126,37 +127,39 @@ public class DoneModel implements Model, Serializable { * @param login * the user to look up for * @return all entries + * @throws SQLException + * @throws ClassNotFoundException */ - private List getAllOfDay(FacesContext facesContext, Date day) throws DataAccessException { + private List getAllOfDay(JooqFacesContext facesContext, Date day) throws DataAccessException, ClassNotFoundException, SQLException { LocalDateTime ldt = day.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); return new DoneGateway(facesContext).getAll(ldt); } - public boolean insert(FacesContext facesContext) { + public boolean insert(JooqFacesContext facesContext) { try { new DoneGateway(facesContext).insert(bean); return true; - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error", e.getMessage())); return false; } } - public boolean update(FacesContext facesContext) { + public boolean update(JooqFacesContext facesContext) { try { new DoneGateway(facesContext).update(bean); return true; - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error", e.getMessage())); return false; } } - public boolean delete(FacesContext facesContext) { + public boolean delete(JooqFacesContext facesContext) { try { new DoneGateway(facesContext).delete(bean); return true; - } catch (DataAccessException e) { + } catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error", e.getMessage())); return false; } diff --git a/src/main/java/de/jottyfan/timetrack/modules/note/NoteControl.java b/src/main/java/de/jottyfan/timetrack/modules/note/NoteControl.java index 458d66c..d0bf82a 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/note/NoteControl.java +++ b/src/main/java/de/jottyfan/timetrack/modules/note/NoteControl.java @@ -7,6 +7,7 @@ import javax.faces.context.FacesContext; import javax.inject.Inject; import javax.inject.Named; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.help.Navigation; import de.jottyfan.timetrack.help.Pages; import de.jottyfan.timetrack.modules.ControlInterface; @@ -33,7 +34,7 @@ public class NoteControl extends Navigation implements ControlInterface, Seriali public String toList() { - boolean ready = model.init(FacesContext.getCurrentInstance()); + boolean ready = model.init((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? navigateTo(Pages.NOTE_LIST) : ""; } @@ -50,19 +51,19 @@ public class NoteControl extends Navigation implements ControlInterface, Seriali public String doAdd() { - boolean ready = model.add(FacesContext.getCurrentInstance()); + boolean ready = model.add((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? toList() : toItem(model.getBean()); } public String doUpdate() { - boolean ready = model.update(FacesContext.getCurrentInstance()); + boolean ready = model.update((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? toList() : toItem(model.getBean()); } public String doDelete() { - boolean ready = model.delete(FacesContext.getCurrentInstance()); + boolean ready = model.delete((JooqFacesContext) FacesContext.getCurrentInstance()); return ready ? toList() : toItem(model.getBean()); } @@ -98,6 +99,6 @@ public class NoteControl extends Navigation implements ControlInterface, Seriali } public Long getAmount() { - return model.getAmount(FacesContext.getCurrentInstance()); + return model.getAmount((JooqFacesContext) FacesContext.getCurrentInstance()); } } diff --git a/src/main/java/de/jottyfan/timetrack/modules/note/NoteGateway.java b/src/main/java/de/jottyfan/timetrack/modules/note/NoteGateway.java index bcb865b..4f8e1a7 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/note/NoteGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/note/NoteGateway.java @@ -2,13 +2,13 @@ package de.jottyfan.timetrack.modules.note; import static de.jottyfan.timetrack.db.note.Tables.T_NOTE; +import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import javax.faces.context.FacesContext; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jooq.DSLContext; import org.jooq.DeleteConditionStep; import org.jooq.InsertValuesStep4; import org.jooq.Record; @@ -16,6 +16,7 @@ import org.jooq.SelectJoinStep; import org.jooq.UpdateConditionStep; import org.jooq.exception.DataAccessException; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.db.note.enums.EnumCategory; import de.jottyfan.timetrack.db.note.enums.EnumNotetype; import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord; @@ -26,12 +27,10 @@ import de.jottyfan.timetrack.modules.JooqGateway; * @author henkej * */ -public class NoteGateway extends JooqGateway -{ +public class NoteGateway extends JooqGateway { private static final Logger LOGGER = LogManager.getLogger(NoteGateway.class); - public NoteGateway(FacesContext facesContext) - { + public NoteGateway(JooqFacesContext facesContext) { super(facesContext); } @@ -40,14 +39,24 @@ public class NoteGateway extends JooqGateway * * @param noteBean * @throws DataAccessException + * @throws SQLException + * @throws ClassNotFoundException * @returns amount of affected rows in db */ - public void insert(NoteBean bean) throws DataAccessException - { - InsertValuesStep4 sql = getJooq().insertInto(T_NOTE, T_NOTE.TITLE, T_NOTE.CATEGORY, T_NOTE.NOTETYPE, T_NOTE.CONTENT).values(bean.getTitle(), bean.getCategory(), bean.getType(), - bean.getContent()); - LOGGER.debug(sql.toString()); - sql.execute(); + public void insert(NoteBean bean) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + InsertValuesStep4 sql = jooq + // @formatter:off + .insertInto(T_NOTE, + T_NOTE.TITLE, + T_NOTE.CATEGORY, + T_NOTE.NOTETYPE, + T_NOTE.CONTENT) + .values(bean.getTitle(), bean.getCategory(), bean.getType(), bean.getContent()); + // @formatter:on + LOGGER.debug(sql.toString()); + sql.execute(); + } } /** @@ -55,12 +64,21 @@ public class NoteGateway extends JooqGateway * * @param bean * @throws DataAccessException + * @throws SQLException + * @throws ClassNotFoundException */ - public void update(NoteBean bean) throws DataAccessException - { - UpdateConditionStep sql = getJooq().update(T_NOTE).set(T_NOTE.TITLE, bean.getTitle()).set(T_NOTE.CONTENT, bean.getContent()).where(T_NOTE.PK.eq(bean.getPk())); - LOGGER.debug(sql.toString()); - sql.execute(); + public void update(NoteBean bean) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + UpdateConditionStep sql = jooq + // @formatter:off + .update(T_NOTE) + .set(T_NOTE.TITLE, bean.getTitle()) + .set(T_NOTE.CONTENT, bean.getContent()) + .where(T_NOTE.PK.eq(bean.getPk())); + // @formatter:on + LOGGER.debug(sql.toString()); + sql.execute(); + } } /** @@ -68,12 +86,15 @@ public class NoteGateway extends JooqGateway * * @param pk * @throws DataAccessException + * @throws SQLException + * @throws ClassNotFoundException */ - public void delete(Integer pk) throws DataAccessException - { - DeleteConditionStep sql = getJooq().deleteFrom(T_NOTE).where(T_NOTE.PK.eq(pk)); - LOGGER.debug(sql.toString()); - sql.execute(); + public void delete(Integer pk) throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + DeleteConditionStep sql = jooq.deleteFrom(T_NOTE).where(T_NOTE.PK.eq(pk)); + LOGGER.debug(sql.toString()); + sql.execute(); + } } /** @@ -81,22 +102,24 @@ public class NoteGateway extends JooqGateway * * @return * @throws DataAccessException + * @throws SQLException + * @throws ClassNotFoundException */ - public List getAll() throws DataAccessException - { - SelectJoinStep sql = getJooq().select().from(T_NOTE); - LOGGER.debug(sql.toString()); - List list = new ArrayList<>(); - for (Record r : sql.fetch()) - { - NoteBean bean = new NoteBean(r.get(T_NOTE.PK)); - bean.setTitle(r.get(T_NOTE.TITLE)); - bean.setCategory(r.get(T_NOTE.CATEGORY)); - bean.setContent(r.get(T_NOTE.CONTENT)); - bean.setType(r.get(T_NOTE.NOTETYPE)); - bean.setLastchange(r.get(T_NOTE.LASTCHANGE)); - list.add(bean); + public List getAll() throws DataAccessException, ClassNotFoundException, SQLException { + try (DSLContext jooq = getJooq()) { + SelectJoinStep sql = jooq.select().from(T_NOTE); + LOGGER.debug(sql.toString()); + List list = new ArrayList<>(); + for (Record r : sql.fetch()) { + NoteBean bean = new NoteBean(r.get(T_NOTE.PK)); + bean.setTitle(r.get(T_NOTE.TITLE)); + bean.setCategory(r.get(T_NOTE.CATEGORY)); + bean.setContent(r.get(T_NOTE.CONTENT)); + bean.setType(r.get(T_NOTE.NOTETYPE)); + bean.setLastchange(r.get(T_NOTE.LASTCHANGE)); + list.add(bean); + } + return list; } - return list; } } diff --git a/src/main/java/de/jottyfan/timetrack/modules/note/NoteModel.java b/src/main/java/de/jottyfan/timetrack/modules/note/NoteModel.java index b189b34..a353153 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/note/NoteModel.java +++ b/src/main/java/de/jottyfan/timetrack/modules/note/NoteModel.java @@ -1,15 +1,16 @@ package de.jottyfan.timetrack.modules.note; import java.io.Serializable; +import java.sql.SQLException; import java.util.List; import javax.enterprise.context.SessionScoped; import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import javax.inject.Named; import org.jooq.exception.DataAccessException; +import de.jooqFaces.JooqFacesContext; import de.jottyfan.timetrack.db.note.Tables; import de.jottyfan.timetrack.modules.Model; @@ -27,65 +28,70 @@ public class NoteModel implements Model, Serializable private List beans; private NoteBean bean; - public boolean init(FacesContext facesContext) + public boolean init(JooqFacesContext facesContext) { try { beans = new NoteGateway(facesContext).getAll(); return true; } - catch (DataAccessException e) + catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error", e.getMessage())); return false; } } - public boolean add(FacesContext facesContext) + public boolean add(JooqFacesContext facesContext) { try { new NoteGateway(facesContext).insert(bean); return true; } - catch (DataAccessException e) + catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error", e.getMessage())); return false; } } - public boolean update(FacesContext facesContext) + public boolean update(JooqFacesContext facesContext) { try { new NoteGateway(facesContext).update(bean); return true; } - catch (DataAccessException e) + catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error", e.getMessage())); return false; } } - public boolean delete(FacesContext facesContext) + public boolean delete(JooqFacesContext facesContext) { try { new NoteGateway(facesContext).delete(bean.getPk()); return true; } - catch (DataAccessException e) + catch (DataAccessException | ClassNotFoundException | SQLException e) { facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error", e.getMessage())); return false; } } - public Long getAmount(FacesContext facesContext) + public Long getAmount(JooqFacesContext facesContext) { - return new NoteGateway(facesContext).getAmount(Tables.T_NOTE); + try { + return new NoteGateway(facesContext).getAmount(Tables.T_NOTE); + } catch (ClassNotFoundException | SQLException e) { + facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "error", e.getMessage())); + return -1l; + } } @Override diff --git a/src/main/webapp/WEB-INF/faces-config.xml b/src/main/webapp/WEB-INF/faces-config.xml index 21a1a2a..680a241 100644 --- a/src/main/webapp/WEB-INF/faces-config.xml +++ b/src/main/webapp/WEB-INF/faces-config.xml @@ -4,10 +4,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" version="2.0"> - - de.jooqFaces.JooqFacesRenderResponsePhaseListener - de.jooqFaces.JooqFacesRestoreViewPhaseListener - de.jooqFaces.JooqFacesContextFactory diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index c5c8ca2..2eb5734 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -61,7 +61,7 @@ jooqFacesProperties - /etc/tomcat8#/timetrack.properties + /etc/timetrack.properties de.jooqFaces.PropertiesDeploymentListener diff --git a/src/main/webapp/pages/done/init.xhtml b/src/main/webapp/pages/done/init.xhtml index 9d3faff..9490a88 100644 --- a/src/main/webapp/pages/done/init.xhtml +++ b/src/main/webapp/pages/done/init.xhtml @@ -19,18 +19,17 @@ - - + + - - - - + + + + - + diff --git a/src/main/webapp/resources/css/style.css b/src/main/webapp/resources/css/style.css index 23aed88..f914e23 100644 --- a/src/main/webapp/resources/css/style.css +++ b/src/main/webapp/resources/css/style.css @@ -6,11 +6,6 @@ !important; } -.doneoverview { - max-width: 850px !important; - width: 850px !important; -} - .doneoverviewtext { font-size: 120%; } diff --git a/src/test/java/de/jottyfan/timetrack/moduls/done/TestDoneBean.java b/src/test/java/de/jottyfan/timetrack/moduls/done/TestDoneBean.java index 2805ef0..f573e86 100644 --- a/src/test/java/de/jottyfan/timetrack/moduls/done/TestDoneBean.java +++ b/src/test/java/de/jottyfan/timetrack/moduls/done/TestDoneBean.java @@ -1,10 +1,10 @@ package de.jottyfan.timetrack.moduls.done; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.time.LocalDateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import de.jottyfan.timetrack.modules.done.DoneBean; diff --git a/src/test/java/de/jottyfan/timetrack/moduls/done/TestRgbColor.java b/src/test/java/de/jottyfan/timetrack/moduls/done/TestRgbColor.java index fe2cc4f..ac1cf89 100644 --- a/src/test/java/de/jottyfan/timetrack/moduls/done/TestRgbColor.java +++ b/src/test/java/de/jottyfan/timetrack/moduls/done/TestRgbColor.java @@ -1,8 +1,8 @@ package de.jottyfan.timetrack.moduls.done; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import de.jottyfan.timetrack.modules.done.RgbColor; diff --git a/src/test/java/de/jottyfan/timetrack/moduls/done/TestWholeDaySummaryBean.java b/src/test/java/de/jottyfan/timetrack/moduls/done/TestWholeDaySummaryBean.java index ec6a5d9..3345f9d 100644 --- a/src/test/java/de/jottyfan/timetrack/moduls/done/TestWholeDaySummaryBean.java +++ b/src/test/java/de/jottyfan/timetrack/moduls/done/TestWholeDaySummaryBean.java @@ -1,8 +1,8 @@ package de.jottyfan.timetrack.moduls.done; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import de.jottyfan.timetrack.modules.done.WholeDaySummaryBean;