added views

.classpath

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/java">
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" output="bin/main" path="src/main/resources">
 		<attributes>
 			<attribute name="gradle_scope" value="main"/>
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/">
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21

build.gradle

@@ -7,10 +7,10 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath 'org.jooq:jooq-codegen:3.18.6'
+        classpath 'org.jooq:jooq-codegen:3.19.15'
-		classpath 'org.postgresql:postgresql:42.6.0'
+        classpath 'org.postgresql:postgresql:latest.release'
-		classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release'
-		classpath 'nu.studer.jooq:nu.studer.jooq.gradle.plugin:8.2.1'
+        classpath 'nu.studer:gradle-jooq-plugin:8.0'
 	}
 }
 
@@ -23,14 +23,16 @@ apply plugin: 'maven-publish'
 apply plugin: 'eclipse'
 
 group = 'de.jottyfan'
-version = '20240109'
+version = '20260119'
 def artifactId = 'timetrackjooq'
 def versionNumber = version
 
 description = """timetrackjooq"""
 
-sourceCompatibility = 17
+java{
-targetCompatibility = 17
+  sourceCompatibility = 21
+  targetCompatibility = 21
+}
 
 tasks.withType(JavaCompile) {
 	options.encoding = 'UTF-8'
@@ -43,21 +45,22 @@ repositories {
 }
 
 dependencies {
-	implementation 'org.jooq:jooq:3.18.6'
+    implementation 'org.jooq:jooq:3.19.15'
-	implementation 'org.jooq:jooq-codegen:3.18.6'
+    implementation 'org.jooq:jooq-codegen:3.19.15'
 	
-	implementation 'org.postgresql:postgresql:42.6.0'
+	implementation 'org.postgresql:postgresql:latest.release'
 	
-	jooqGenerator 'org.postgresql:postgresql:42.6.0'
+	jooqGenerator 'org.postgresql:postgresql:latest.release'
 }
 
 jooq {
 	edition = nu.studer.gradle.jooq.JooqEdition.OSS
-	version = '3.18.6'
+	version = '3.19.15'
 	configurations {
 	  timetrack {
 	    generateSchemaSourceOnCompilation = false
 	    generationTool {
+	      onError = 'LOG'
 	      logging = org.jooq.meta.jaxb.Logging.WARN 
 		    jdbc {
 			    driver = 'org.postgresql.Driver'
@@ -82,6 +85,12 @@ jooq {
 		    			schema {
 		    				inputSchema = 'note'
 		    			}
+		    			schema {
+		    			    inputSchema = 'project'
+		    			}
+		    			schema {
+		    			    inputSchema = 'public' 
+		    			}
 		    		}
 		    		includes = '.*'
 		    	}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/de/jottyfan/timetrack/db/DefaultCatalog.java

@@ -8,6 +8,8 @@ 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 de.jottyfan.timetrack.db.project.Project;
+import de.jottyfan.timetrack.db.public_.Public;
 
 import java.util.Arrays;
 import java.util.List;
@@ -20,7 +22,7 @@ import org.jooq.impl.CatalogImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class DefaultCatalog extends CatalogImpl {
 
     private static final long serialVersionUID = 1L;
@@ -50,6 +52,16 @@ public class DefaultCatalog extends CatalogImpl {
      */
     public final Profile PROFILE = Profile.PROFILE;
 
+    /**
+     * The schema <code>project</code>.
+     */
+    public final Project PROJECT = Project.PROJECT;
+
+    /**
+     * The schema <code>public</code>.
+     */
+    public final Public PUBLIC = Public.PUBLIC;
+
     /**
      * No further instances allowed
      */
@@ -63,15 +75,17 @@ public class DefaultCatalog extends CatalogImpl {
             Contact.CONTACT,
             Done.DONE,
             Note.NOTE,
-            Profile.PROFILE
+            Profile.PROFILE,
+            Project.PROJECT,
+            Public.PUBLIC
         );
     }
 
     /**
-     * A reference to the 3.18 minor release of the code generator. If this
+     * A reference to the 3.19 minor release of the code generator. If this
      * doesn't compile, it's because the runtime library uses an older minor
-     * release, namely: 3.18. You can turn off the generation of this reference
+     * release, namely: 3.19. You can turn off the generation of this reference
      * by specifying /configuration/generator/generate/jooqVersionReference
      */
-    private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_18;
+    private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_19;
 }

src/main/java/de/jottyfan/timetrack/db/contact/Contact.java

@@ -18,7 +18,7 @@ import org.jooq.impl.SchemaImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Contact extends SchemaImpl {
 
     private static final long serialVersionUID = 1L;

src/main/java/de/jottyfan/timetrack/db/contact/Keys.java

@@ -17,7 +17,7 @@ import org.jooq.impl.Internal;
  * A class modelling foreign key relationships and constraints of tables in
  * contact.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Keys {
 
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/contact/Tables.java

@@ -10,7 +10,7 @@ import de.jottyfan.timetrack.db.contact.tables.TContact;
 /**
  * Convenience access to all tables in contact.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Tables {
 
     /**

src/main/java/de/jottyfan/timetrack/db/contact/enums/EnumContacttype.java

@@ -14,7 +14,7 @@ import org.jooq.Schema;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public enum EnumContacttype implements EnumType {
 
     privat("privat"),
@@ -54,7 +54,9 @@ public enum EnumContacttype implements EnumType {
     }
 
     /**
-     * Lookup a value of this EnumType by its literal
+     * Lookup a value of this EnumType by its literal. Returns
+     * <code>null</code>, if no such value could be found, see {@link
+     * EnumType#lookupLiteral(Class, String)}.
      */
     public static EnumContacttype lookupLiteral(String literal) {
         return EnumType.lookupLiteral(EnumContacttype.class, literal);

src/main/java/de/jottyfan/timetrack/db/contact/tables/TContact.java

@@ -9,18 +9,18 @@ import de.jottyfan.timetrack.db.contact.Keys;
 import de.jottyfan.timetrack.db.contact.enums.EnumContacttype;
 import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord;
 
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function5;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row5;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -33,7 +33,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TContact extends TableImpl<TContactRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -74,14 +74,14 @@ public class TContact extends TableImpl<TContactRecord> {
     /**
      * The column <code>contact.t_contact.type</code>.
      */
-    public final TableField<TContactRecord, EnumContacttype> TYPE = createField(DSL.name("type"), SQLDataType.VARCHAR.nullable(false).asEnumDataType(de.jottyfan.timetrack.db.contact.enums.EnumContacttype.class), this, "");
+    public final TableField<TContactRecord, EnumContacttype> TYPE = createField(DSL.name("type"), SQLDataType.VARCHAR.nullable(false).asEnumDataType(EnumContacttype.class), this, "");
 
     private TContact(Name alias, Table<TContactRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TContact(Name alias, Table<TContactRecord> aliased, Field<?>[] parameters) {
+    private TContact(Name alias, Table<TContactRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -105,10 +105,6 @@ public class TContact extends TableImpl<TContactRecord> {
         this(DSL.name("t_contact"), null);
     }
 
-    public <O extends Record> TContact(Table<O> child, ForeignKey<O, TContactRecord> key) {
-        super(child, key, T_CONTACT);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Contact.CONTACT;
@@ -163,27 +159,87 @@ public class TContact extends TableImpl<TContactRecord> {
         return new TContact(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row5 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row5<Integer, String, String, String, EnumContacttype> fieldsRow() {
+    public TContact where(Condition condition) {
-        return (Row5) super.fieldsRow();
+        return new TContact(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function5<? super Integer, ? super String, ? super String, ? super String, ? super EnumContacttype, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TContact where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function5<? super Integer, ? super String, ? super String, ? super String, ? super EnumContacttype, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TContact where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TContact where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TContact where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TContact where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TContact where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TContact where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TContact whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TContact whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/contact/tables/records/TContactRecord.java

@@ -7,18 +7,15 @@ 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 org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record5;
-import org.jooq.Row5;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TContactRecord extends UpdatableRecordImpl<TContactRecord> implements Record5<Integer, String, String, String, EnumContacttype> {
+public class TContactRecord extends UpdatableRecordImpl<TContactRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -101,135 +98,6 @@ public class TContactRecord extends UpdatableRecordImpl<TContactRecord> implemen
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record5 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row5<Integer, String, String, String, EnumContacttype> fieldsRow() {
-        return (Row5) super.fieldsRow();
-    }
-
-    @Override
-    public Row5<Integer, String, String, String, EnumContacttype> valuesRow() {
-        return (Row5) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return TContact.T_CONTACT.PK;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return TContact.T_CONTACT.FORENAME;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return TContact.T_CONTACT.SURNAME;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return TContact.T_CONTACT.CONTACT;
-    }
-
-    @Override
-    public Field<EnumContacttype> field5() {
-        return TContact.T_CONTACT.TYPE;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPk();
-    }
-
-    @Override
-    public String component2() {
-        return getForename();
-    }
-
-    @Override
-    public String component3() {
-        return getSurname();
-    }
-
-    @Override
-    public String component4() {
-        return getContact();
-    }
-
-    @Override
-    public EnumContacttype component5() {
-        return getType();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPk();
-    }
-
-    @Override
-    public String value2() {
-        return getForename();
-    }
-
-    @Override
-    public String value3() {
-        return getSurname();
-    }
-
-    @Override
-    public String value4() {
-        return getContact();
-    }
-
-    @Override
-    public EnumContacttype value5() {
-        return getType();
-    }
-
-    @Override
-    public TContactRecord value1(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TContactRecord value2(String value) {
-        setForename(value);
-        return this;
-    }
-
-    @Override
-    public TContactRecord value3(String value) {
-        setSurname(value);
-        return this;
-    }
-
-    @Override
-    public TContactRecord value4(String value) {
-        setContact(value);
-        return this;
-    }
-
-    @Override
-    public TContactRecord value5(EnumContacttype value) {
-        setType(value);
-        return this;
-    }
-
-    @Override
-    public TContactRecord values(Integer value1, String value2, String value3, String value4, EnumContacttype value5) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/Done.java

@@ -44,7 +44,7 @@ import org.jooq.impl.SchemaImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Done extends SchemaImpl {
 
     private static final long serialVersionUID = 1L;

src/main/java/de/jottyfan/timetrack/db/done/Keys.java

@@ -22,10 +22,7 @@ import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord;
 import de.jottyfan.timetrack.db.done.tables.records.TOvertimeRecord;
 import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord;
 import de.jottyfan.timetrack.db.done.tables.records.TRequiredWorktimeRecord;
-import de.jottyfan.timetrack.db.profile.tables.TLogin;
-import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord;
 
-import org.jooq.ForeignKey;
 import org.jooq.TableField;
 import org.jooq.UniqueKey;
 import org.jooq.impl.DSL;
@@ -36,7 +33,7 @@ import org.jooq.impl.Internal;
  * A class modelling foreign key relationships and constraints of tables in
  * done.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Keys {
 
     // -------------------------------------------------------------------------
@@ -60,22 +57,4 @@ public class Keys {
     public static final UniqueKey<TProjectRecord> T_PROJECT_PKEY = Internal.createUniqueKey(TProject.T_PROJECT, DSL.name("t_project_pkey"), new TableField[] { TProject.T_PROJECT.PK }, true);
     public static final UniqueKey<TRequiredWorktimeRecord> T_REQUIRED_WORKTIME_DAY_FK_LOGIN_KEY = Internal.createUniqueKey(TRequiredWorktime.T_REQUIRED_WORKTIME, DSL.name("t_required_worktime_day_fk_login_key"), new TableField[] { TRequiredWorktime.T_REQUIRED_WORKTIME.DAY, TRequiredWorktime.T_REQUIRED_WORKTIME.FK_LOGIN }, true);
     public static final UniqueKey<TRequiredWorktimeRecord> T_REQUIRED_WORKTIME_PKEY = Internal.createUniqueKey(TRequiredWorktime.T_REQUIRED_WORKTIME, DSL.name("t_required_worktime_pkey"), new TableField[] { TRequiredWorktime.T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME }, true);
-
-    // -------------------------------------------------------------------------
-    // FOREIGN KEY definitions
-    // -------------------------------------------------------------------------
-
-    public static final ForeignKey<TDoneRecord, TBillingRecord> T_DONE__T_DONE_FK_BILLING_FKEY = Internal.createForeignKey(TDone.T_DONE, DSL.name("t_done_fk_billing_fkey"), new TableField[] { TDone.T_DONE.FK_BILLING }, Keys.T_BILLING_PKEY, new TableField[] { TBilling.T_BILLING.PK }, true);
-    public static final ForeignKey<TDoneRecord, TJobRecord> T_DONE__T_DONE_FK_CATEGORY_FKEY = Internal.createForeignKey(TDone.T_DONE, DSL.name("t_done_fk_category_fkey"), new TableField[] { TDone.T_DONE.FK_JOB }, Keys.T_CATEGORY_PKEY, new TableField[] { TJob.T_JOB.PK }, true);
-    public static final ForeignKey<TDoneRecord, TModuleRecord> T_DONE__T_DONE_FK_JOB_FKEY = Internal.createForeignKey(TDone.T_DONE, DSL.name("t_done_fk_job_fkey"), new TableField[] { TDone.T_DONE.FK_MODULE }, Keys.T_JOB_PKEY, new TableField[] { TModule.T_MODULE.PK }, true);
-    public static final ForeignKey<TDoneRecord, TLoginRecord> T_DONE__T_DONE_FK_LOGIN_FKEY = Internal.createForeignKey(TDone.T_DONE, DSL.name("t_done_fk_login_fkey"), new TableField[] { TDone.T_DONE.FK_LOGIN }, de.jottyfan.timetrack.db.profile.Keys.T_LOGIN_PKEY, new TableField[] { TLogin.T_LOGIN.PK }, true);
-    public static final ForeignKey<TDoneRecord, TProjectRecord> T_DONE__T_DONE_FK_PROJECT_FKEY = Internal.createForeignKey(TDone.T_DONE, DSL.name("t_done_fk_project_fkey"), new TableField[] { TDone.T_DONE.FK_PROJECT }, Keys.T_PROJECT_PKEY, new TableField[] { TProject.T_PROJECT.PK }, true);
-    public static final ForeignKey<TFavoriteRecord, TBillingRecord> T_FAVORITE__T_FAVORITE_FK_BILLING_FKEY = Internal.createForeignKey(TFavorite.T_FAVORITE, DSL.name("t_favorite_fk_billing_fkey"), new TableField[] { TFavorite.T_FAVORITE.FK_BILLING }, Keys.T_BILLING_PKEY, new TableField[] { TBilling.T_BILLING.PK }, true);
-    public static final ForeignKey<TFavoriteRecord, TJobRecord> T_FAVORITE__T_FAVORITE_FK_JOB_FKEY = Internal.createForeignKey(TFavorite.T_FAVORITE, DSL.name("t_favorite_fk_job_fkey"), new TableField[] { TFavorite.T_FAVORITE.FK_JOB }, Keys.T_CATEGORY_PKEY, new TableField[] { TJob.T_JOB.PK }, true);
-    public static final ForeignKey<TFavoriteRecord, TLoginRecord> T_FAVORITE__T_FAVORITE_FK_LOGIN_FKEY = Internal.createForeignKey(TFavorite.T_FAVORITE, DSL.name("t_favorite_fk_login_fkey"), new TableField[] { TFavorite.T_FAVORITE.FK_LOGIN }, de.jottyfan.timetrack.db.profile.Keys.T_LOGIN_PKEY, new TableField[] { TLogin.T_LOGIN.PK }, true);
-    public static final ForeignKey<TFavoriteRecord, TModuleRecord> T_FAVORITE__T_FAVORITE_FK_MODULE_FKEY = Internal.createForeignKey(TFavorite.T_FAVORITE, DSL.name("t_favorite_fk_module_fkey"), new TableField[] { TFavorite.T_FAVORITE.FK_MODULE }, Keys.T_JOB_PKEY, new TableField[] { TModule.T_MODULE.PK }, true);
-    public static final ForeignKey<TFavoriteRecord, TProjectRecord> T_FAVORITE__T_FAVORITE_FK_PROJECT_FKEY = Internal.createForeignKey(TFavorite.T_FAVORITE, DSL.name("t_favorite_fk_project_fkey"), new TableField[] { TFavorite.T_FAVORITE.FK_PROJECT }, Keys.T_PROJECT_PKEY, new TableField[] { TProject.T_PROJECT.PK }, true);
-    public static final ForeignKey<TFreetimeRecord, TLoginRecord> T_FREETIME__T_FREETIME_FK_LOGIN_FKEY = Internal.createForeignKey(TFreetime.T_FREETIME, DSL.name("t_freetime_fk_login_fkey"), new TableField[] { TFreetime.T_FREETIME.FK_LOGIN }, de.jottyfan.timetrack.db.profile.Keys.T_LOGIN_PKEY, new TableField[] { TLogin.T_LOGIN.PK }, true);
-    public static final ForeignKey<TOvertimeRecord, TLoginRecord> T_OVERTIME__T_OVERTIME_FK_LOGIN_FKEY = Internal.createForeignKey(TOvertime.T_OVERTIME, DSL.name("t_overtime_fk_login_fkey"), new TableField[] { TOvertime.T_OVERTIME.FK_LOGIN }, de.jottyfan.timetrack.db.profile.Keys.T_LOGIN_PKEY, new TableField[] { TLogin.T_LOGIN.PK }, true);
-    public static final ForeignKey<TRequiredWorktimeRecord, TLoginRecord> T_REQUIRED_WORKTIME__T_REQUIRED_WORKTIME_FK_LOGIN_FKEY = Internal.createForeignKey(TRequiredWorktime.T_REQUIRED_WORKTIME, DSL.name("t_required_worktime_fk_login_fkey"), new TableField[] { TRequiredWorktime.T_REQUIRED_WORKTIME.FK_LOGIN }, de.jottyfan.timetrack.db.profile.Keys.T_LOGIN_PKEY, new TableField[] { TLogin.T_LOGIN.PK }, true);
 }

src/main/java/de/jottyfan/timetrack/db/done/Tables.java

@@ -36,7 +36,7 @@ import de.jottyfan.timetrack.db.done.tables.VWorktime;
 /**
  * Convenience access to all tables in done.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Tables {
 
     /**

src/main/java/de/jottyfan/timetrack/db/done/tables/TBilling.java

@@ -10,19 +10,19 @@ import de.jottyfan.timetrack.db.done.tables.records.TBillingRecord;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function5;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row5;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -35,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TBilling extends TableImpl<TBillingRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -79,11 +79,11 @@ public class TBilling extends TableImpl<TBillingRecord> {
     public final TableField<TBillingRecord, String> CSSKEY = createField(DSL.name("csskey"), SQLDataType.CLOB, this, "");
 
     private TBilling(Name alias, Table<TBillingRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TBilling(Name alias, Table<TBillingRecord> aliased, Field<?>[] parameters) {
+    private TBilling(Name alias, Table<TBillingRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -107,10 +107,6 @@ public class TBilling extends TableImpl<TBillingRecord> {
         this(DSL.name("t_billing"), null);
     }
 
-    public <O extends Record> TBilling(Table<O> child, ForeignKey<O, TBillingRecord> key) {
-        super(child, key, T_BILLING);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -170,27 +166,87 @@ public class TBilling extends TableImpl<TBillingRecord> {
         return new TBilling(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row5 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row5<LocalDateTime, Integer, String, String, String> fieldsRow() {
+    public TBilling where(Condition condition) {
-        return (Row5) super.fieldsRow();
+        return new TBilling(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function5<? super LocalDateTime, ? super Integer, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TBilling where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function5<? super LocalDateTime, ? super Integer, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TBilling where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TBilling where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TBilling where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TBilling where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TBilling where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TBilling where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TBilling whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TBilling whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/TDone.java

@@ -7,23 +7,20 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.Keys;
 import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord;
-import de.jottyfan.timetrack.db.profile.tables.TLogin;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
+import java.util.Collection;
-import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function9;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row9;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -36,7 +33,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TDone extends TableImpl<TDoneRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -100,11 +97,11 @@ public class TDone extends TableImpl<TDoneRecord> {
     public final TableField<TDoneRecord, Integer> FK_BILLING = createField(DSL.name("fk_billing"), SQLDataType.INTEGER, this, "");
 
     private TDone(Name alias, Table<TDoneRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TDone(Name alias, Table<TDoneRecord> aliased, Field<?>[] parameters) {
+    private TDone(Name alias, Table<TDoneRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -128,10 +125,6 @@ public class TDone extends TableImpl<TDoneRecord> {
         this(DSL.name("t_done"), null);
     }
 
-    public <O extends Record> TDone(Table<O> child, ForeignKey<O, TDoneRecord> key) {
-        super(child, key, T_DONE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -147,67 +140,6 @@ public class TDone extends TableImpl<TDoneRecord> {
         return Keys.T_DONE_PKEY;
     }
 
-    @Override
-    public List<ForeignKey<TDoneRecord, ?>> getReferences() {
-        return Arrays.asList(Keys.T_DONE__T_DONE_FK_PROJECT_FKEY, Keys.T_DONE__T_DONE_FK_JOB_FKEY, Keys.T_DONE__T_DONE_FK_CATEGORY_FKEY, Keys.T_DONE__T_DONE_FK_LOGIN_FKEY, Keys.T_DONE__T_DONE_FK_BILLING_FKEY);
-    }
-
-    private transient TProject _tProject;
-    private transient TModule _tModule;
-    private transient TJob _tJob;
-    private transient TLogin _tLogin;
-    private transient TBilling _tBilling;
-
-    /**
-     * Get the implicit join path to the <code>done.t_project</code> table.
-     */
-    public TProject tProject() {
-        if (_tProject == null)
-            _tProject = new TProject(this, Keys.T_DONE__T_DONE_FK_PROJECT_FKEY);
-
-        return _tProject;
-    }
-
-    /**
-     * Get the implicit join path to the <code>done.t_module</code> table.
-     */
-    public TModule tModule() {
-        if (_tModule == null)
-            _tModule = new TModule(this, Keys.T_DONE__T_DONE_FK_JOB_FKEY);
-
-        return _tModule;
-    }
-
-    /**
-     * Get the implicit join path to the <code>done.t_job</code> table.
-     */
-    public TJob tJob() {
-        if (_tJob == null)
-            _tJob = new TJob(this, Keys.T_DONE__T_DONE_FK_CATEGORY_FKEY);
-
-        return _tJob;
-    }
-
-    /**
-     * Get the implicit join path to the <code>profile.t_login</code> table.
-     */
-    public TLogin tLogin() {
-        if (_tLogin == null)
-            _tLogin = new TLogin(this, Keys.T_DONE__T_DONE_FK_LOGIN_FKEY);
-
-        return _tLogin;
-    }
-
-    /**
-     * Get the implicit join path to the <code>done.t_billing</code> table.
-     */
-    public TBilling tBilling() {
-        if (_tBilling == null)
-            _tBilling = new TBilling(this, Keys.T_DONE__T_DONE_FK_BILLING_FKEY);
-
-        return _tBilling;
-    }
-
     @Override
     public TDone as(String alias) {
         return new TDone(DSL.name(alias), this);
@@ -247,27 +179,87 @@ public class TDone extends TableImpl<TDoneRecord> {
         return new TDone(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row9 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row9<LocalDateTime, Integer, LocalDateTime, LocalDateTime, Integer, Integer, Integer, Integer, Integer> fieldsRow() {
+    public TDone where(Condition condition) {
-        return (Row9) super.fieldsRow();
+        return new TDone(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function9<? super LocalDateTime, ? super Integer, ? super LocalDateTime, ? super LocalDateTime, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TDone where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function9<? super LocalDateTime, ? super Integer, ? super LocalDateTime, ? super LocalDateTime, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TDone where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TDone where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TDone where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TDone where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TDone where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TDone where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TDone whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TDone whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/TFavorite.java

@@ -7,23 +7,20 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.Keys;
 import de.jottyfan.timetrack.db.done.tables.records.TFavoriteRecord;
-import de.jottyfan.timetrack.db.profile.tables.TLogin;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
+import java.util.Collection;
-import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function7;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row7;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -36,7 +33,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TFavorite extends TableImpl<TFavoriteRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -90,11 +87,11 @@ public class TFavorite extends TableImpl<TFavoriteRecord> {
     public final TableField<TFavoriteRecord, Integer> FK_BILLING = createField(DSL.name("fk_billing"), SQLDataType.INTEGER, this, "");
 
     private TFavorite(Name alias, Table<TFavoriteRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TFavorite(Name alias, Table<TFavoriteRecord> aliased, Field<?>[] parameters) {
+    private TFavorite(Name alias, Table<TFavoriteRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -118,10 +115,6 @@ public class TFavorite extends TableImpl<TFavoriteRecord> {
         this(DSL.name("t_favorite"), null);
     }
 
-    public <O extends Record> TFavorite(Table<O> child, ForeignKey<O, TFavoriteRecord> key) {
-        super(child, key, T_FAVORITE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -137,67 +130,6 @@ public class TFavorite extends TableImpl<TFavoriteRecord> {
         return Keys.T_FAVORITE_PKEY;
     }
 
-    @Override
-    public List<ForeignKey<TFavoriteRecord, ?>> getReferences() {
-        return Arrays.asList(Keys.T_FAVORITE__T_FAVORITE_FK_LOGIN_FKEY, Keys.T_FAVORITE__T_FAVORITE_FK_PROJECT_FKEY, Keys.T_FAVORITE__T_FAVORITE_FK_MODULE_FKEY, Keys.T_FAVORITE__T_FAVORITE_FK_JOB_FKEY, Keys.T_FAVORITE__T_FAVORITE_FK_BILLING_FKEY);
-    }
-
-    private transient TLogin _tLogin;
-    private transient TProject _tProject;
-    private transient TModule _tModule;
-    private transient TJob _tJob;
-    private transient TBilling _tBilling;
-
-    /**
-     * Get the implicit join path to the <code>profile.t_login</code> table.
-     */
-    public TLogin tLogin() {
-        if (_tLogin == null)
-            _tLogin = new TLogin(this, Keys.T_FAVORITE__T_FAVORITE_FK_LOGIN_FKEY);
-
-        return _tLogin;
-    }
-
-    /**
-     * Get the implicit join path to the <code>done.t_project</code> table.
-     */
-    public TProject tProject() {
-        if (_tProject == null)
-            _tProject = new TProject(this, Keys.T_FAVORITE__T_FAVORITE_FK_PROJECT_FKEY);
-
-        return _tProject;
-    }
-
-    /**
-     * Get the implicit join path to the <code>done.t_module</code> table.
-     */
-    public TModule tModule() {
-        if (_tModule == null)
-            _tModule = new TModule(this, Keys.T_FAVORITE__T_FAVORITE_FK_MODULE_FKEY);
-
-        return _tModule;
-    }
-
-    /**
-     * Get the implicit join path to the <code>done.t_job</code> table.
-     */
-    public TJob tJob() {
-        if (_tJob == null)
-            _tJob = new TJob(this, Keys.T_FAVORITE__T_FAVORITE_FK_JOB_FKEY);
-
-        return _tJob;
-    }
-
-    /**
-     * Get the implicit join path to the <code>done.t_billing</code> table.
-     */
-    public TBilling tBilling() {
-        if (_tBilling == null)
-            _tBilling = new TBilling(this, Keys.T_FAVORITE__T_FAVORITE_FK_BILLING_FKEY);
-
-        return _tBilling;
-    }
-
     @Override
     public TFavorite as(String alias) {
         return new TFavorite(DSL.name(alias), this);
@@ -237,27 +169,87 @@ public class TFavorite extends TableImpl<TFavoriteRecord> {
         return new TFavorite(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row7 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row7<LocalDateTime, Integer, Integer, Integer, Integer, Integer, Integer> fieldsRow() {
+    public TFavorite where(Condition condition) {
-        return (Row7) super.fieldsRow();
+        return new TFavorite(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function7<? super LocalDateTime, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TFavorite where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function7<? super LocalDateTime, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TFavorite where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFavorite where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFavorite where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFavorite where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFavorite where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFavorite where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFavorite whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFavorite whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/TFreetime.java

@@ -7,24 +7,23 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.Keys;
 import de.jottyfan.timetrack.db.done.tables.records.TFreetimeRecord;
-import de.jottyfan.timetrack.db.profile.tables.TLogin;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function5;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row5;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -37,7 +36,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TFreetime extends TableImpl<TFreetimeRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -81,11 +80,11 @@ public class TFreetime extends TableImpl<TFreetimeRecord> {
     public final TableField<TFreetimeRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER.nullable(false), this, "");
 
     private TFreetime(Name alias, Table<TFreetimeRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TFreetime(Name alias, Table<TFreetimeRecord> aliased, Field<?>[] parameters) {
+    private TFreetime(Name alias, Table<TFreetimeRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -109,10 +108,6 @@ public class TFreetime extends TableImpl<TFreetimeRecord> {
         this(DSL.name("t_freetime"), null);
     }
 
-    public <O extends Record> TFreetime(Table<O> child, ForeignKey<O, TFreetimeRecord> key) {
-        super(child, key, T_FREETIME);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -133,23 +128,6 @@ public class TFreetime extends TableImpl<TFreetimeRecord> {
         return Arrays.asList(Keys.T_FREETIME_DAY_FK_LOGIN_KEY);
     }
 
-    @Override
-    public List<ForeignKey<TFreetimeRecord, ?>> getReferences() {
-        return Arrays.asList(Keys.T_FREETIME__T_FREETIME_FK_LOGIN_FKEY);
-    }
-
-    private transient TLogin _tLogin;
-
-    /**
-     * Get the implicit join path to the <code>profile.t_login</code> table.
-     */
-    public TLogin tLogin() {
-        if (_tLogin == null)
-            _tLogin = new TLogin(this, Keys.T_FREETIME__T_FREETIME_FK_LOGIN_FKEY);
-
-        return _tLogin;
-    }
-
     @Override
     public TFreetime as(String alias) {
         return new TFreetime(DSL.name(alias), this);
@@ -189,27 +167,87 @@ public class TFreetime extends TableImpl<TFreetimeRecord> {
         return new TFreetime(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row5 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row5<Integer, LocalDate, LocalTime, String, Integer> fieldsRow() {
+    public TFreetime where(Condition condition) {
-        return (Row5) super.fieldsRow();
+        return new TFreetime(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function5<? super Integer, ? super LocalDate, ? super LocalTime, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TFreetime where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function5<? super Integer, ? super LocalDate, ? super LocalTime, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TFreetime where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFreetime where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFreetime where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFreetime where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFreetime where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFreetime where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFreetime whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFreetime whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/TJob.java

@@ -10,19 +10,19 @@ import de.jottyfan.timetrack.db.done.tables.records.TJobRecord;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function3;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row3;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -35,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TJob extends TableImpl<TJobRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -69,11 +69,11 @@ public class TJob extends TableImpl<TJobRecord> {
     public final TableField<TJobRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
 
     private TJob(Name alias, Table<TJobRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TJob(Name alias, Table<TJobRecord> aliased, Field<?>[] parameters) {
+    private TJob(Name alias, Table<TJobRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -97,10 +97,6 @@ public class TJob extends TableImpl<TJobRecord> {
         this(DSL.name("t_job"), null);
     }
 
-    public <O extends Record> TJob(Table<O> child, ForeignKey<O, TJobRecord> key) {
-        super(child, key, T_JOB);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -160,27 +156,87 @@ public class TJob extends TableImpl<TJobRecord> {
         return new TJob(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row3 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row3<LocalDateTime, Integer, String> fieldsRow() {
+    public TJob where(Condition condition) {
-        return (Row3) super.fieldsRow();
+        return new TJob(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function3<? super LocalDateTime, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TJob where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function3<? super LocalDateTime, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TJob where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TJob where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TJob where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TJob where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TJob where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TJob where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TJob whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TJob whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/TModule.java

@@ -10,19 +10,19 @@ import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function3;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row3;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -35,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TModule extends TableImpl<TModuleRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -69,11 +69,11 @@ public class TModule extends TableImpl<TModuleRecord> {
     public final TableField<TModuleRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
 
     private TModule(Name alias, Table<TModuleRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TModule(Name alias, Table<TModuleRecord> aliased, Field<?>[] parameters) {
+    private TModule(Name alias, Table<TModuleRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -97,10 +97,6 @@ public class TModule extends TableImpl<TModuleRecord> {
         this(DSL.name("t_module"), null);
     }
 
-    public <O extends Record> TModule(Table<O> child, ForeignKey<O, TModuleRecord> key) {
-        super(child, key, T_MODULE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -160,27 +156,87 @@ public class TModule extends TableImpl<TModuleRecord> {
         return new TModule(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row3 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row3<LocalDateTime, Integer, String> fieldsRow() {
+    public TModule where(Condition condition) {
-        return (Row3) super.fieldsRow();
+        return new TModule(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function3<? super LocalDateTime, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TModule where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function3<? super LocalDateTime, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TModule where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TModule where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TModule where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TModule where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TModule where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TModule where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TModule whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TModule whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/TOvertime.java

@@ -7,23 +7,22 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.Keys;
 import de.jottyfan.timetrack.db.done.tables.records.TOvertimeRecord;
-import de.jottyfan.timetrack.db.profile.tables.TLogin;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function4;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row4;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -36,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TOvertime extends TableImpl<TOvertimeRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -75,11 +74,11 @@ public class TOvertime extends TableImpl<TOvertimeRecord> {
     public final TableField<TOvertimeRecord, Integer> OVERTIME_MINUTES = createField(DSL.name("overtime_minutes"), SQLDataType.INTEGER.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.INTEGER)), this, "");
 
     private TOvertime(Name alias, Table<TOvertimeRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TOvertime(Name alias, Table<TOvertimeRecord> aliased, Field<?>[] parameters) {
+    private TOvertime(Name alias, Table<TOvertimeRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -103,10 +102,6 @@ public class TOvertime extends TableImpl<TOvertimeRecord> {
         this(DSL.name("t_overtime"), null);
     }
 
-    public <O extends Record> TOvertime(Table<O> child, ForeignKey<O, TOvertimeRecord> key) {
-        super(child, key, T_OVERTIME);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -127,23 +122,6 @@ public class TOvertime extends TableImpl<TOvertimeRecord> {
         return Arrays.asList(Keys.T_OVERTIME_FK_LOGIN_KEY);
     }
 
-    @Override
-    public List<ForeignKey<TOvertimeRecord, ?>> getReferences() {
-        return Arrays.asList(Keys.T_OVERTIME__T_OVERTIME_FK_LOGIN_FKEY);
-    }
-
-    private transient TLogin _tLogin;
-
-    /**
-     * Get the implicit join path to the <code>profile.t_login</code> table.
-     */
-    public TLogin tLogin() {
-        if (_tLogin == null)
-            _tLogin = new TLogin(this, Keys.T_OVERTIME__T_OVERTIME_FK_LOGIN_FKEY);
-
-        return _tLogin;
-    }
-
     @Override
     public TOvertime as(String alias) {
         return new TOvertime(DSL.name(alias), this);
@@ -183,27 +161,87 @@ public class TOvertime extends TableImpl<TOvertimeRecord> {
         return new TOvertime(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row4 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row4<Integer, LocalDateTime, Integer, Integer> fieldsRow() {
+    public TOvertime where(Condition condition) {
-        return (Row4) super.fieldsRow();
+        return new TOvertime(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function4<? super Integer, ? super LocalDateTime, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TOvertime where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function4<? super Integer, ? super LocalDateTime, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TOvertime where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TOvertime where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TOvertime where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TOvertime where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TOvertime where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TOvertime where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TOvertime whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TOvertime whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/TProject.java

@@ -10,19 +10,19 @@ import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function3;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row3;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -35,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TProject extends TableImpl<TProjectRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -69,11 +69,11 @@ public class TProject extends TableImpl<TProjectRecord> {
     public final TableField<TProjectRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
 
     private TProject(Name alias, Table<TProjectRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TProject(Name alias, Table<TProjectRecord> aliased, Field<?>[] parameters) {
+    private TProject(Name alias, Table<TProjectRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -97,10 +97,6 @@ public class TProject extends TableImpl<TProjectRecord> {
         this(DSL.name("t_project"), null);
     }
 
-    public <O extends Record> TProject(Table<O> child, ForeignKey<O, TProjectRecord> key) {
-        super(child, key, T_PROJECT);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -160,27 +156,87 @@ public class TProject extends TableImpl<TProjectRecord> {
         return new TProject(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row3 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row3<LocalDateTime, Integer, String> fieldsRow() {
+    public TProject where(Condition condition) {
-        return (Row3) super.fieldsRow();
+        return new TProject(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function3<? super LocalDateTime, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TProject where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function3<? super LocalDateTime, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TProject where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProject where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProject where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProject where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProject where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProject where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProject whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProject whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/TRequiredWorktime.java

@@ -7,23 +7,22 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.Keys;
 import de.jottyfan.timetrack.db.done.tables.records.TRequiredWorktimeRecord;
-import de.jottyfan.timetrack.db.profile.tables.TLogin;
 
 import java.time.LocalDate;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function5;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row5;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -36,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TRequiredWorktime extends TableImpl<TRequiredWorktimeRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -80,11 +79,11 @@ public class TRequiredWorktime extends TableImpl<TRequiredWorktimeRecord> {
     public final TableField<TRequiredWorktimeRecord, String> REASON = createField(DSL.name("reason"), SQLDataType.CLOB, this, "");
 
     private TRequiredWorktime(Name alias, Table<TRequiredWorktimeRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TRequiredWorktime(Name alias, Table<TRequiredWorktimeRecord> aliased, Field<?>[] parameters) {
+    private TRequiredWorktime(Name alias, Table<TRequiredWorktimeRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -108,10 +107,6 @@ public class TRequiredWorktime extends TableImpl<TRequiredWorktimeRecord> {
         this(DSL.name("t_required_worktime"), null);
     }
 
-    public <O extends Record> TRequiredWorktime(Table<O> child, ForeignKey<O, TRequiredWorktimeRecord> key) {
-        super(child, key, T_REQUIRED_WORKTIME);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -132,23 +127,6 @@ public class TRequiredWorktime extends TableImpl<TRequiredWorktimeRecord> {
         return Arrays.asList(Keys.T_REQUIRED_WORKTIME_DAY_FK_LOGIN_KEY);
     }
 
-    @Override
-    public List<ForeignKey<TRequiredWorktimeRecord, ?>> getReferences() {
-        return Arrays.asList(Keys.T_REQUIRED_WORKTIME__T_REQUIRED_WORKTIME_FK_LOGIN_FKEY);
-    }
-
-    private transient TLogin _tLogin;
-
-    /**
-     * Get the implicit join path to the <code>profile.t_login</code> table.
-     */
-    public TLogin tLogin() {
-        if (_tLogin == null)
-            _tLogin = new TLogin(this, Keys.T_REQUIRED_WORKTIME__T_REQUIRED_WORKTIME_FK_LOGIN_FKEY);
-
-        return _tLogin;
-    }
-
     @Override
     public TRequiredWorktime as(String alias) {
         return new TRequiredWorktime(DSL.name(alias), this);
@@ -188,27 +166,87 @@ public class TRequiredWorktime extends TableImpl<TRequiredWorktimeRecord> {
         return new TRequiredWorktime(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row5 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row5<Integer, LocalDate, Integer, Integer, String> fieldsRow() {
+    public TRequiredWorktime where(Condition condition) {
-        return (Row5) super.fieldsRow();
+        return new TRequiredWorktime(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function5<? super Integer, ? super LocalDate, ? super Integer, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TRequiredWorktime where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function5<? super Integer, ? super LocalDate, ? super Integer, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TRequiredWorktime where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TRequiredWorktime where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TRequiredWorktime where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TRequiredWorktime where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TRequiredWorktime where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TRequiredWorktime where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TRequiredWorktime whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TRequiredWorktime whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VBilling.java

@@ -8,17 +8,17 @@ import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VBillingRecord;
 
 import java.math.BigDecimal;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function5;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row5;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VBilling extends TableImpl<VBillingRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -74,11 +74,26 @@ public class VBilling extends TableImpl<VBillingRecord> {
     public final TableField<VBillingRecord, BigDecimal> PERCENT_USAGE = createField(DSL.name("percent_usage"), SQLDataType.NUMERIC, this, "");
 
     private VBilling(Name alias, Table<VBillingRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VBilling(Name alias, Table<VBillingRecord> aliased, Field<?>[] parameters) {
+    private VBilling(Name alias, Table<VBillingRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_billing" as  WITH x(total) AS (
+                SELECT COALESCE(NULLIF(count(1), 0), (1)::bigint) AS count
+                  FROM done.t_done
+               )
+        SELECT b.pk,
+           b.name,
+           b.shortcut,
+           b.csskey,
+           round(((((count(db.*))::double precision / (x.total)::double precision) * (100)::double precision))::numeric, 2) AS percent_usage
+          FROM ((x
+            LEFT JOIN done.t_billing b ON (true))
+            LEFT JOIN done.t_done db ON ((db.fk_project = b.pk)))
+         GROUP BY b.pk, b.name, b.shortcut, b.csskey, x.total
+         ORDER BY b.pk;
+        """), where);
     }
 
     /**
@@ -102,10 +117,6 @@ public class VBilling extends TableImpl<VBillingRecord> {
         this(DSL.name("v_billing"), null);
     }
 
-    public <O extends Record> VBilling(Table<O> child, ForeignKey<O, VBillingRecord> key) {
-        super(child, key, V_BILLING);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -150,27 +161,87 @@ public class VBilling extends TableImpl<VBillingRecord> {
         return new VBilling(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row5 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row5<Integer, String, String, String, BigDecimal> fieldsRow() {
+    public VBilling where(Condition condition) {
-        return (Row5) super.fieldsRow();
+        return new VBilling(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function5<? super Integer, ? super String, ? super String, ? super String, ? super BigDecimal, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VBilling where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function5<? super Integer, ? super String, ? super String, ? super String, ? super BigDecimal, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VBilling where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VBilling where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VBilling where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VBilling where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VBilling where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VBilling where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VBilling whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VBilling whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VCurrentOvertime.java

@@ -8,17 +8,17 @@ import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VCurrentOvertimeRecord;
 
 import java.math.BigDecimal;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function3;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row3;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VCurrentOvertime extends TableImpl<VCurrentOvertimeRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -64,11 +64,20 @@ public class VCurrentOvertime extends TableImpl<VCurrentOvertimeRecord> {
     public final TableField<VCurrentOvertimeRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VCurrentOvertime(Name alias, Table<VCurrentOvertimeRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VCurrentOvertime(Name alias, Table<VCurrentOvertimeRecord> aliased, Field<?>[] parameters) {
+    private VCurrentOvertime(Name alias, Table<VCurrentOvertimeRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_current_overtime" as  SELECT ((x.overtime_minutes)::numeric + sum((EXTRACT(minute FROM l.dayworktime) - (r.required_minutes)::numeric))) AS overtime,
+          to_char(now(), 'DD.MM.YYYY HH24:MI'::text) AS impact,
+          x.fk_login
+         FROM ((done.t_overtime x
+           LEFT JOIN done.v_daylimit l ON (((l.fk_login = x.fk_login) AND (l.day >= x.impact))))
+           LEFT JOIN done.t_required_worktime r ON (((r.fk_login = x.fk_login) AND (r.day = l.day))))
+        WHERE (l.day < now())
+        GROUP BY x.overtime_minutes, x.fk_login;
+        """), where);
     }
 
     /**
@@ -92,10 +101,6 @@ public class VCurrentOvertime extends TableImpl<VCurrentOvertimeRecord> {
         this(DSL.name("v_current_overtime"), null);
     }
 
-    public <O extends Record> VCurrentOvertime(Table<O> child, ForeignKey<O, VCurrentOvertimeRecord> key) {
-        super(child, key, V_CURRENT_OVERTIME);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -140,27 +145,87 @@ public class VCurrentOvertime extends TableImpl<VCurrentOvertimeRecord> {
         return new VCurrentOvertime(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row3 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row3<BigDecimal, String, Integer> fieldsRow() {
+    public VCurrentOvertime where(Condition condition) {
-        return (Row3) super.fieldsRow();
+        return new VCurrentOvertime(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function3<? super BigDecimal, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VCurrentOvertime where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function3<? super BigDecimal, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VCurrentOvertime where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VCurrentOvertime where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VCurrentOvertime where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VCurrentOvertime where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VCurrentOvertime where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VCurrentOvertime where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VCurrentOvertime whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VCurrentOvertime whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VDaily.java

@@ -7,17 +7,17 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VDailyRecord;
 
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function4;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row4;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VDaily extends TableImpl<VDailyRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -69,11 +69,18 @@ public class VDaily extends TableImpl<VDailyRecord> {
     public final TableField<VDailyRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VDaily(Name alias, Table<VDailyRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VDaily(Name alias, Table<VDailyRecord> aliased, Field<?>[] parameters) {
+    private VDaily(Name alias, Table<VDailyRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_daily" as  SELECT sum(duration) AS worktime,
+          day,
+          login,
+          fk_login
+         FROM done.v_duration
+        GROUP BY day, login, fk_login;
+        """), where);
     }
 
     /**
@@ -97,10 +104,6 @@ public class VDaily extends TableImpl<VDailyRecord> {
         this(DSL.name("v_daily"), null);
     }
 
-    public <O extends Record> VDaily(Table<O> child, ForeignKey<O, VDailyRecord> key) {
-        super(child, key, V_DAILY);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -145,27 +148,87 @@ public class VDaily extends TableImpl<VDailyRecord> {
         return new VDaily(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row4 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row4<YearToSecond, String, String, Integer> fieldsRow() {
+    public VDaily where(Condition condition) {
-        return (Row4) super.fieldsRow();
+        return new VDaily(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function4<? super YearToSecond, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VDaily where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function4<? super YearToSecond, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VDaily where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaily where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaily where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaily where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaily where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaily where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaily whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaily whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VDay.java

@@ -9,17 +9,17 @@ import de.jottyfan.timetrack.db.done.tables.records.VDayRecord;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function7;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row7;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -32,7 +32,7 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VDay extends TableImpl<VDayRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -86,11 +86,32 @@ public class VDay extends TableImpl<VDayRecord> {
     public final TableField<VDayRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VDay(Name alias, Table<VDayRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VDay(Name alias, Table<VDayRecord> aliased, Field<?>[] parameters) {
+    private VDay(Name alias, Table<VDayRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_day" as  WITH x(dayworktime, day, fk_login, required, starttime, endtime) AS (
+                SELECT sum((d.dayworktime)::interval) AS sum,
+                   d.day,
+                   d.fk_login,
+                   make_interval(mins => r.required_minutes) AS make_interval,
+                   min(d.daytime_from) AS min,
+                   max(d.daytime_until) AS max
+                  FROM (done.v_daylimit d
+                    LEFT JOIN done.t_required_worktime r ON (((r.day = d.day) AND (r.fk_login = d.fk_login))))
+                 GROUP BY d.day, d.fk_login, r.required_minutes
+               )
+        SELECT day,
+           starttime,
+           endtime,
+           dayworktime AS worktime,
+           ((endtime - starttime) - dayworktime) AS breaktime,
+           (dayworktime - required) AS day_overtime,
+           fk_login
+          FROM x
+         ORDER BY day DESC, fk_login;
+        """), where);
     }
 
     /**
@@ -114,10 +135,6 @@ public class VDay extends TableImpl<VDayRecord> {
         this(DSL.name("v_day"), null);
     }
 
-    public <O extends Record> VDay(Table<O> child, ForeignKey<O, VDayRecord> key) {
-        super(child, key, V_DAY);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -162,27 +179,87 @@ public class VDay extends TableImpl<VDayRecord> {
         return new VDay(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row7 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row7<LocalDate, LocalTime, LocalTime, YearToSecond, YearToSecond, YearToSecond, Integer> fieldsRow() {
+    public VDay where(Condition condition) {
-        return (Row7) super.fieldsRow();
+        return new VDay(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function7<? super LocalDate, ? super LocalTime, ? super LocalTime, ? super YearToSecond, ? super YearToSecond, ? super YearToSecond, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VDay where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function7<? super LocalDate, ? super LocalTime, ? super LocalTime, ? super YearToSecond, ? super YearToSecond, ? super YearToSecond, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VDay where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDay where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDay where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDay where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDay where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDay where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDay whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDay whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VDaylimit.java

@@ -9,17 +9,17 @@ import de.jottyfan.timetrack.db.done.tables.records.VDaylimitRecord;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function6;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row6;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -32,7 +32,7 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VDaylimit extends TableImpl<VDaylimitRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -81,11 +81,35 @@ public class VDaylimit extends TableImpl<VDaylimitRecord> {
     public final TableField<VDaylimitRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VDaylimit(Name alias, Table<VDaylimitRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VDaylimit(Name alias, Table<VDaylimitRecord> aliased, Field<?>[] parameters) {
+    private VDaylimit(Name alias, Table<VDaylimitRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_daylimit" as  WITH x(dayworktime, day, fk_login) AS (
+                SELECT COALESCE((t_done.time_until - t_done.time_from), '00:00:00'::interval) AS "coalesce",
+                   t_done.time_from,
+                   t_done.fk_login
+                  FROM done.t_done
+               ), y(daytime_from, daytime_until, day, fk_login) AS (
+                SELECT min(t_done.time_from) AS min,
+                   max(t_done.time_until) AS max,
+                   t_done.time_from,
+                   t_done.fk_login
+                  FROM done.t_done
+                 GROUP BY t_done.time_from, t_done.fk_login
+               )
+        SELECT (y.daytime_from)::time without time zone AS daytime_from,
+           (y.daytime_until)::time without time zone AS daytime_until,
+           (sum(x.dayworktime))::time without time zone AS dayworktime,
+           ((y.daytime_until - y.daytime_from) - sum(x.dayworktime)) AS breaks,
+           (y.day)::date AS day,
+           y.fk_login
+          FROM (x
+            LEFT JOIN y ON (((y.day = x.day) AND (y.fk_login = x.fk_login))))
+         GROUP BY y.daytime_from, y.daytime_until, y.day, y.fk_login
+         ORDER BY y.day DESC;
+        """), where);
     }
 
     /**
@@ -109,10 +133,6 @@ public class VDaylimit extends TableImpl<VDaylimitRecord> {
         this(DSL.name("v_daylimit"), null);
     }
 
-    public <O extends Record> VDaylimit(Table<O> child, ForeignKey<O, VDaylimitRecord> key) {
-        super(child, key, V_DAYLIMIT);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -157,27 +177,87 @@ public class VDaylimit extends TableImpl<VDaylimitRecord> {
         return new VDaylimit(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row6 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row6<LocalTime, LocalTime, LocalTime, YearToSecond, LocalDate, Integer> fieldsRow() {
+    public VDaylimit where(Condition condition) {
-        return (Row6) super.fieldsRow();
+        return new VDaylimit(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function6<? super LocalTime, ? super LocalTime, ? super LocalTime, ? super YearToSecond, ? super LocalDate, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VDaylimit where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function6<? super LocalTime, ? super LocalTime, ? super LocalTime, ? super YearToSecond, ? super LocalDate, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VDaylimit where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaylimit where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaylimit where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaylimit where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaylimit where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaylimit where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaylimit whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaylimit whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VDaylimits.java

@@ -9,17 +9,17 @@ import de.jottyfan.timetrack.db.done.tables.records.VDaylimitsRecord;
 
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function4;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row4;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -31,7 +31,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VDaylimits extends TableImpl<VDaylimitsRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -70,11 +70,25 @@ public class VDaylimits extends TableImpl<VDaylimitsRecord> {
     public final TableField<VDaylimitsRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VDaylimits(Name alias, Table<VDaylimitsRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VDaylimits(Name alias, Table<VDaylimitsRecord> aliased, Field<?>[] parameters) {
+    private VDaylimits(Name alias, Table<VDaylimitsRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_daylimits" as  WITH x(time_from, time_until, day, fk_login) AS (
+                SELECT t_done.time_from,
+                   COALESCE((t_done.time_until)::timestamp with time zone, now()) AS "coalesce",
+                   to_char(t_done.time_from, 'yyyy-MM-dd'::text) AS day,
+                   t_done.fk_login
+                  FROM done.t_done
+               )
+        SELECT min(time_from) AS work_start,
+           max(time_until) AS work_end,
+           day,
+           fk_login
+          FROM x
+         GROUP BY day, fk_login;
+        """), where);
     }
 
     /**
@@ -98,10 +112,6 @@ public class VDaylimits extends TableImpl<VDaylimitsRecord> {
         this(DSL.name("v_daylimits"), null);
     }
 
-    public <O extends Record> VDaylimits(Table<O> child, ForeignKey<O, VDaylimitsRecord> key) {
-        super(child, key, V_DAYLIMITS);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -146,27 +156,87 @@ public class VDaylimits extends TableImpl<VDaylimitsRecord> {
         return new VDaylimits(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row4 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row4<LocalDateTime, OffsetDateTime, String, Integer> fieldsRow() {
+    public VDaylimits where(Condition condition) {
-        return (Row4) super.fieldsRow();
+        return new VDaylimits(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function4<? super LocalDateTime, ? super OffsetDateTime, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VDaylimits where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function4<? super LocalDateTime, ? super OffsetDateTime, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VDaylimits where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaylimits where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaylimits where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaylimits where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaylimits where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaylimits where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaylimits whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaylimits whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VDaysummary.java

@@ -9,17 +9,17 @@ import de.jottyfan.timetrack.db.done.tables.records.VDaysummaryRecord;
 
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function7;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row7;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -32,7 +32,7 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VDaysummary extends TableImpl<VDaysummaryRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -86,11 +86,21 @@ public class VDaysummary extends TableImpl<VDaysummaryRecord> {
     public final TableField<VDaysummaryRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VDaysummary(Name alias, Table<VDaysummaryRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VDaysummary(Name alias, Table<VDaysummaryRecord> aliased, Field<?>[] parameters) {
+    private VDaysummary(Name alias, Table<VDaysummaryRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_daysummary" as  SELECT ((v_daylimits.work_end - (v_daylimits.work_start)::timestamp with time zone) - v_daily.worktime) AS breaktime,
+         v_daily.worktime,
+         v_daylimits.work_start,
+         v_daylimits.work_end,
+         v_daily.day,
+         v_daily.login,
+         v_daily.fk_login
+        FROM (done.v_daily
+          LEFT JOIN done.v_daylimits ON ((v_daylimits.day = v_daily.day)));
+        """), where);
     }
 
     /**
@@ -114,10 +124,6 @@ public class VDaysummary extends TableImpl<VDaysummaryRecord> {
         this(DSL.name("v_daysummary"), null);
     }
 
-    public <O extends Record> VDaysummary(Table<O> child, ForeignKey<O, VDaysummaryRecord> key) {
-        super(child, key, V_DAYSUMMARY);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -162,27 +168,87 @@ public class VDaysummary extends TableImpl<VDaysummaryRecord> {
         return new VDaysummary(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row7 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row7<YearToSecond, YearToSecond, LocalDateTime, OffsetDateTime, String, String, Integer> fieldsRow() {
+    public VDaysummary where(Condition condition) {
-        return (Row7) super.fieldsRow();
+        return new VDaysummary(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function7<? super YearToSecond, ? super YearToSecond, ? super LocalDateTime, ? super OffsetDateTime, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VDaysummary where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function7<? super YearToSecond, ? super YearToSecond, ? super LocalDateTime, ? super OffsetDateTime, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VDaysummary where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaysummary where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaysummary where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaysummary where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaysummary where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDaysummary where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaysummary whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDaysummary whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VDone.java

@@ -8,17 +8,17 @@ import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VDoneRecord;
 
 import java.time.LocalDateTime;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function8;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row8;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VDone extends TableImpl<VDoneRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -89,11 +89,25 @@ public class VDone extends TableImpl<VDoneRecord> {
     public final TableField<VDoneRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB, this, "");
 
     private VDone(Name alias, Table<VDoneRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VDone(Name alias, Table<VDoneRecord> aliased, Field<?>[] parameters) {
+    private VDone(Name alias, Table<VDoneRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_done" as  SELECT d.pk AS fk_done,
+         l.pk AS fk_login,
+         d.time_from,
+         d.time_until,
+         p.name AS project_name,
+         m.name AS module_name,
+         j.name AS job_name,
+         l.login
+        FROM ((((done.t_done d
+          LEFT JOIN done.t_project p ON ((p.pk = d.fk_project)))
+          LEFT JOIN done.t_module m ON ((m.pk = d.fk_module)))
+          LEFT JOIN done.t_job j ON ((j.pk = d.fk_job)))
+          LEFT JOIN profile.t_login l ON ((l.pk = d.fk_login)));
+        """), where);
     }
 
     /**
@@ -117,10 +131,6 @@ public class VDone extends TableImpl<VDoneRecord> {
         this(DSL.name("v_done"), null);
     }
 
-    public <O extends Record> VDone(Table<O> child, ForeignKey<O, VDoneRecord> key) {
-        super(child, key, V_DONE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -165,27 +175,87 @@ public class VDone extends TableImpl<VDoneRecord> {
         return new VDone(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row8 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row8<Integer, Integer, LocalDateTime, LocalDateTime, String, String, String, String> fieldsRow() {
+    public VDone where(Condition condition) {
-        return (Row8) super.fieldsRow();
+        return new VDone(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function8<? super Integer, ? super Integer, ? super LocalDateTime, ? super LocalDateTime, ? super String, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VDone where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function8<? super Integer, ? super Integer, ? super LocalDateTime, ? super LocalDateTime, ? super String, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VDone where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDone where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDone where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDone where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDone where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDone where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDone whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDone whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VDuration.java

@@ -7,17 +7,17 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VDurationRecord;
 
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function7;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row7;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VDuration extends TableImpl<VDurationRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -84,11 +84,20 @@ public class VDuration extends TableImpl<VDurationRecord> {
     public final TableField<VDurationRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VDuration(Name alias, Table<VDurationRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VDuration(Name alias, Table<VDurationRecord> aliased, Field<?>[] parameters) {
+    private VDuration(Name alias, Table<VDurationRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_duration" as  SELECT to_char(COALESCE((time_until)::timestamp with time zone, now()), 'yyyy-MM-dd'::text) AS day,
+         (COALESCE((time_until)::timestamp with time zone, now()) - COALESCE((time_from)::timestamp with time zone, now())) AS duration,
+         project_name,
+         module_name,
+         job_name,
+         login,
+         fk_login
+        FROM done.v_done;
+        """), where);
     }
 
     /**
@@ -112,10 +121,6 @@ public class VDuration extends TableImpl<VDurationRecord> {
         this(DSL.name("v_duration"), null);
     }
 
-    public <O extends Record> VDuration(Table<O> child, ForeignKey<O, VDurationRecord> key) {
-        super(child, key, V_DURATION);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -160,27 +165,87 @@ public class VDuration extends TableImpl<VDurationRecord> {
         return new VDuration(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row7 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row7<String, YearToSecond, String, String, String, String, Integer> fieldsRow() {
+    public VDuration where(Condition condition) {
-        return (Row7) super.fieldsRow();
+        return new VDuration(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function7<? super String, ? super YearToSecond, ? super String, ? super String, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VDuration where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function7<? super String, ? super YearToSecond, ? super String, ? super String, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VDuration where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDuration where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDuration where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDuration where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDuration where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VDuration where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDuration whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VDuration whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VFavorite.java

@@ -7,17 +7,17 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VFavoriteRecord;
 
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function6;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row6;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -29,7 +29,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VFavorite extends TableImpl<VFavoriteRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -78,11 +78,23 @@ public class VFavorite extends TableImpl<VFavoriteRecord> {
     public final TableField<VFavoriteRecord, String> BILLING = createField(DSL.name("billing"), SQLDataType.CLOB, this, "");
 
     private VFavorite(Name alias, Table<VFavoriteRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VFavorite(Name alias, Table<VFavoriteRecord> aliased, Field<?>[] parameters) {
+    private VFavorite(Name alias, Table<VFavoriteRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_favorite" as  SELECT f.pk_favorite,
+         f.fk_login,
+         p.name AS project,
+         m.name AS module,
+         j.name AS job,
+         b.name AS billing
+        FROM ((((done.t_favorite f
+          LEFT JOIN done.t_project p ON ((p.pk = f.fk_project)))
+          LEFT JOIN done.t_module m ON ((m.pk = f.fk_module)))
+          LEFT JOIN done.t_job j ON ((j.pk = f.fk_job)))
+          LEFT JOIN done.t_billing b ON ((b.pk = f.fk_billing)));
+        """), where);
     }
 
     /**
@@ -106,10 +118,6 @@ public class VFavorite extends TableImpl<VFavoriteRecord> {
         this(DSL.name("v_favorite"), null);
     }
 
-    public <O extends Record> VFavorite(Table<O> child, ForeignKey<O, VFavoriteRecord> key) {
-        super(child, key, V_FAVORITE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -154,27 +162,87 @@ public class VFavorite extends TableImpl<VFavoriteRecord> {
         return new VFavorite(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row6 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row6<Integer, Integer, String, String, String, String> fieldsRow() {
+    public VFavorite where(Condition condition) {
-        return (Row6) super.fieldsRow();
+        return new VFavorite(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function6<? super Integer, ? super Integer, ? super String, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VFavorite where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function6<? super Integer, ? super Integer, ? super String, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VFavorite where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VFavorite where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VFavorite where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VFavorite where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VFavorite where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VFavorite where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VFavorite whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VFavorite whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VHamstersummary.java

@@ -8,17 +8,17 @@ import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VHamstersummaryRecord;
 
 import java.time.LocalDate;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function6;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row6;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VHamstersummary extends TableImpl<VHamstersummaryRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -79,11 +79,21 @@ public class VHamstersummary extends TableImpl<VHamstersummaryRecord> {
     public final TableField<VHamstersummaryRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB, this, "");
 
     private VHamstersummary(Name alias, Table<VHamstersummaryRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VHamstersummary(Name alias, Table<VHamstersummaryRecord> aliased, Field<?>[] parameters) {
+    private VHamstersummary(Name alias, Table<VHamstersummaryRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_hamstersummary" as  SELECT workday,
+          to_char(sum(duration), 'HH24:MI'::text) AS duration,
+          project_name,
+          module_name,
+          job_name,
+          login
+         FROM done.v_hamster
+        GROUP BY workday, project_name, module_name, job_name, login
+        ORDER BY login, workday, project_name, module_name, job_name;
+        """), where);
     }
 
     /**
@@ -107,10 +117,6 @@ public class VHamstersummary extends TableImpl<VHamstersummaryRecord> {
         this(DSL.name("v_hamstersummary"), null);
     }
 
-    public <O extends Record> VHamstersummary(Table<O> child, ForeignKey<O, VHamstersummaryRecord> key) {
-        super(child, key, V_HAMSTERSUMMARY);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -155,27 +161,87 @@ public class VHamstersummary extends TableImpl<VHamstersummaryRecord> {
         return new VHamstersummary(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row6 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row6<LocalDate, String, String, String, String, String> fieldsRow() {
+    public VHamstersummary where(Condition condition) {
-        return (Row6) super.fieldsRow();
+        return new VHamstersummary(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function6<? super LocalDate, ? super String, ? super String, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VHamstersummary where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function6<? super LocalDate, ? super String, ? super String, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VHamstersummary where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VHamstersummary where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VHamstersummary where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VHamstersummary where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VHamstersummary where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VHamstersummary where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VHamstersummary whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VHamstersummary whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VJob.java

@@ -8,17 +8,17 @@ import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VJobRecord;
 
 import java.math.BigDecimal;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function3;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row3;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VJob extends TableImpl<VJobRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -64,11 +64,24 @@ public class VJob extends TableImpl<VJobRecord> {
     public final TableField<VJobRecord, BigDecimal> PERCENT_USAGE = createField(DSL.name("percent_usage"), SQLDataType.NUMERIC, this, "");
 
     private VJob(Name alias, Table<VJobRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VJob(Name alias, Table<VJobRecord> aliased, Field<?>[] parameters) {
+    private VJob(Name alias, Table<VJobRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_job" as  WITH x(total) AS (
+                SELECT COALESCE(NULLIF(count(1), 0), (1)::bigint) AS count
+                  FROM done.t_done
+               )
+        SELECT j.pk,
+           j.name,
+           round(((((count(dj.*))::double precision / (x.total)::double precision) * (100)::double precision))::numeric, 2) AS percent_usage
+          FROM ((x
+            LEFT JOIN done.t_job j ON (true))
+            LEFT JOIN done.t_done dj ON ((dj.fk_project = j.pk)))
+         GROUP BY j.pk, j.name, x.total
+         ORDER BY j.pk;
+        """), where);
     }
 
     /**
@@ -92,10 +105,6 @@ public class VJob extends TableImpl<VJobRecord> {
         this(DSL.name("v_job"), null);
     }
 
-    public <O extends Record> VJob(Table<O> child, ForeignKey<O, VJobRecord> key) {
-        super(child, key, V_JOB);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -140,27 +149,87 @@ public class VJob extends TableImpl<VJobRecord> {
         return new VJob(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row3 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row3<Integer, String, BigDecimal> fieldsRow() {
+    public VJob where(Condition condition) {
-        return (Row3) super.fieldsRow();
+        return new VJob(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function3<? super Integer, ? super String, ? super BigDecimal, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VJob where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function3<? super Integer, ? super String, ? super BigDecimal, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VJob where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VJob where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VJob where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VJob where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VJob where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VJob where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VJob whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VJob whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VModule.java

@@ -8,17 +8,17 @@ import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VModuleRecord;
 
 import java.math.BigDecimal;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function3;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row3;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VModule extends TableImpl<VModuleRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -64,11 +64,24 @@ public class VModule extends TableImpl<VModuleRecord> {
     public final TableField<VModuleRecord, BigDecimal> PERCENT_USAGE = createField(DSL.name("percent_usage"), SQLDataType.NUMERIC, this, "");
 
     private VModule(Name alias, Table<VModuleRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VModule(Name alias, Table<VModuleRecord> aliased, Field<?>[] parameters) {
+    private VModule(Name alias, Table<VModuleRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_module" as  WITH x(total) AS (
+                SELECT COALESCE(NULLIF(count(1), 0), (1)::bigint) AS count
+                  FROM done.t_done
+               )
+        SELECT m.pk,
+           m.name,
+           round(((((count(dm.*))::double precision / (x.total)::double precision) * (100)::double precision))::numeric, 2) AS percent_usage
+          FROM ((x
+            LEFT JOIN done.t_module m ON (true))
+            LEFT JOIN done.t_done dm ON ((dm.fk_project = m.pk)))
+         GROUP BY m.pk, m.name, x.total
+         ORDER BY m.pk;
+        """), where);
     }
 
     /**
@@ -92,10 +105,6 @@ public class VModule extends TableImpl<VModuleRecord> {
         this(DSL.name("v_module"), null);
     }
 
-    public <O extends Record> VModule(Table<O> child, ForeignKey<O, VModuleRecord> key) {
-        super(child, key, V_MODULE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -140,27 +149,87 @@ public class VModule extends TableImpl<VModuleRecord> {
         return new VModule(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row3 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row3<Integer, String, BigDecimal> fieldsRow() {
+    public VModule where(Condition condition) {
-        return (Row3) super.fieldsRow();
+        return new VModule(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function3<? super Integer, ? super String, ? super BigDecimal, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VModule where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function3<? super Integer, ? super String, ? super BigDecimal, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VModule where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VModule where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VModule where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VModule where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VModule where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VModule where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VModule whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VModule whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VProject.java

@@ -8,17 +8,17 @@ import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VProjectRecord;
 
 import java.math.BigDecimal;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function3;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row3;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VProject extends TableImpl<VProjectRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -64,11 +64,24 @@ public class VProject extends TableImpl<VProjectRecord> {
     public final TableField<VProjectRecord, BigDecimal> PERCENT_USAGE = createField(DSL.name("percent_usage"), SQLDataType.NUMERIC, this, "");
 
     private VProject(Name alias, Table<VProjectRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VProject(Name alias, Table<VProjectRecord> aliased, Field<?>[] parameters) {
+    private VProject(Name alias, Table<VProjectRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_project" as  WITH x(total) AS (
+                SELECT COALESCE(NULLIF(count(1), 0), (1)::bigint) AS count
+                  FROM done.t_done
+               )
+        SELECT p.pk,
+           p.name,
+           round(((((count(dp.*))::double precision / (x.total)::double precision) * (100)::double precision))::numeric, 2) AS percent_usage
+          FROM ((x
+            LEFT JOIN done.t_project p ON (true))
+            LEFT JOIN done.t_done dp ON ((dp.fk_project = p.pk)))
+         GROUP BY p.pk, p.name, x.total
+         ORDER BY p.pk;
+        """), where);
     }
 
     /**
@@ -92,10 +105,6 @@ public class VProject extends TableImpl<VProjectRecord> {
         this(DSL.name("v_project"), null);
     }
 
-    public <O extends Record> VProject(Table<O> child, ForeignKey<O, VProjectRecord> key) {
-        super(child, key, V_PROJECT);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -140,27 +149,87 @@ public class VProject extends TableImpl<VProjectRecord> {
         return new VProject(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row3 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row3<Integer, String, BigDecimal> fieldsRow() {
+    public VProject where(Condition condition) {
-        return (Row3) super.fieldsRow();
+        return new VProject(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function3<? super Integer, ? super String, ? super BigDecimal, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VProject where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function3<? super Integer, ? super String, ? super BigDecimal, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VProject where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VProject where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VProject where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VProject where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VProject where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VProject where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VProject whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VProject whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VTasklist.java

@@ -7,17 +7,17 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VTasklistRecord;
 
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function6;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row6;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -29,7 +29,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VTasklist extends TableImpl<VTasklistRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -78,11 +78,20 @@ public class VTasklist extends TableImpl<VTasklistRecord> {
     public final TableField<VTasklistRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VTasklist(Name alias, Table<VTasklistRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VTasklist(Name alias, Table<VTasklistRecord> aliased, Field<?>[] parameters) {
+    private VTasklist(Name alias, Table<VTasklistRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_tasklist" as  SELECT day,
+          to_char(sum(duration), 'HH24:MI'::text) AS duration,
+          project_name,
+          module_name,
+          job_name,
+          fk_login
+         FROM done.v_duration
+        GROUP BY day, project_name, module_name, job_name, fk_login;
+        """), where);
     }
 
     /**
@@ -106,10 +115,6 @@ public class VTasklist extends TableImpl<VTasklistRecord> {
         this(DSL.name("v_tasklist"), null);
     }
 
-    public <O extends Record> VTasklist(Table<O> child, ForeignKey<O, VTasklistRecord> key) {
-        super(child, key, V_TASKLIST);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -154,27 +159,87 @@ public class VTasklist extends TableImpl<VTasklistRecord> {
         return new VTasklist(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row6 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row6<String, String, String, String, String, Integer> fieldsRow() {
+    public VTasklist where(Condition condition) {
-        return (Row6) super.fieldsRow();
+        return new VTasklist(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function6<? super String, ? super String, ? super String, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VTasklist where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function6<? super String, ? super String, ? super String, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VTasklist where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VTasklist where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTasklist where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTasklist where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTasklist where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTasklist where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VTasklist whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VTasklist whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VTimelength.java

@@ -7,17 +7,17 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VTimelengthRecord;
 
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function4;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row4;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VTimelength extends TableImpl<VTimelengthRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -69,11 +69,17 @@ public class VTimelength extends TableImpl<VTimelengthRecord> {
     public final TableField<VTimelengthRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VTimelength(Name alias, Table<VTimelengthRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VTimelength(Name alias, Table<VTimelengthRecord> aliased, Field<?>[] parameters) {
+    private VTimelength(Name alias, Table<VTimelengthRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_timelength" as  SELECT to_char(COALESCE((time_until)::timestamp with time zone, now()), 'yyyy-MM-dd'::text) AS day,
+         (COALESCE((time_until)::timestamp with time zone, now()) - COALESCE((time_from)::timestamp with time zone, now())) AS duration,
+         pk AS fk_done,
+         fk_login
+        FROM done.t_done;
+        """), where);
     }
 
     /**
@@ -97,10 +103,6 @@ public class VTimelength extends TableImpl<VTimelengthRecord> {
         this(DSL.name("v_timelength"), null);
     }
 
-    public <O extends Record> VTimelength(Table<O> child, ForeignKey<O, VTimelengthRecord> key) {
-        super(child, key, V_TIMELENGTH);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -145,27 +147,87 @@ public class VTimelength extends TableImpl<VTimelengthRecord> {
         return new VTimelength(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row4 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row4<String, YearToSecond, Integer, Integer> fieldsRow() {
+    public VTimelength where(Condition condition) {
-        return (Row4) super.fieldsRow();
+        return new VTimelength(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function4<? super String, ? super YearToSecond, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VTimelength where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function4<? super String, ? super YearToSecond, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VTimelength where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VTimelength where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTimelength where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTimelength where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTimelength where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTimelength where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VTimelength whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VTimelength whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VTotalofday.java

@@ -7,17 +7,17 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VTotalofdayRecord;
 
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function6;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row6;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -29,7 +29,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VTotalofday extends TableImpl<VTotalofdayRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -78,11 +78,19 @@ public class VTotalofday extends TableImpl<VTotalofdayRecord> {
     public final TableField<VTotalofdayRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VTotalofday(Name alias, Table<VTotalofdayRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VTotalofday(Name alias, Table<VTotalofdayRecord> aliased, Field<?>[] parameters) {
+    private VTotalofday(Name alias, Table<VTotalofdayRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_totalofday" as  SELECT to_char(breaktime, 'HH24:MI'::text) AS breaktime,
+         to_char(worktime, 'HH24:MI'::text) AS worktime,
+         to_char(work_start, 'HH24:MI'::text) AS starttime,
+         to_char(work_end, 'HH24:MI'::text) AS endtime,
+         day,
+         fk_login
+        FROM done.v_daysummary;
+        """), where);
     }
 
     /**
@@ -106,10 +114,6 @@ public class VTotalofday extends TableImpl<VTotalofdayRecord> {
         this(DSL.name("v_totalofday"), null);
     }
 
-    public <O extends Record> VTotalofday(Table<O> child, ForeignKey<O, VTotalofdayRecord> key) {
-        super(child, key, V_TOTALOFDAY);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -154,27 +158,87 @@ public class VTotalofday extends TableImpl<VTotalofdayRecord> {
         return new VTotalofday(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row6 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row6<String, String, String, String, String, Integer> fieldsRow() {
+    public VTotalofday where(Condition condition) {
-        return (Row6) super.fieldsRow();
+        return new VTotalofday(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function6<? super String, ? super String, ? super String, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VTotalofday where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function6<? super String, ? super String, ? super String, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VTotalofday where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VTotalofday where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTotalofday where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTotalofday where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTotalofday where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VTotalofday where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VTotalofday whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VTotalofday whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/VWorktime.java

@@ -7,17 +7,17 @@ package de.jottyfan.timetrack.db.done.tables;
 import de.jottyfan.timetrack.db.done.Done;
 import de.jottyfan.timetrack.db.done.tables.records.VWorktimeRecord;
 
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function9;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row9;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -29,7 +29,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VWorktime extends TableImpl<VWorktimeRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -93,11 +93,28 @@ public class VWorktime extends TableImpl<VWorktimeRecord> {
     public final TableField<VWorktimeRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
 
     private VWorktime(Name alias, Table<VWorktimeRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VWorktime(Name alias, Table<VWorktimeRecord> aliased, Field<?>[] parameters) {
+    private VWorktime(Name alias, Table<VWorktimeRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_worktime" as  SELECT t.day,
+          to_char(sum(t.duration), 'HH24:MI'::text) AS duration,
+          ((to_char(sum(t.duration), 'HH24'::text))::double precision + ((to_char(sum(t.duration), 'MI'::text))::double precision / (60)::double precision)) AS duration_hours,
+          p.name AS project_name,
+          m.name AS module_name,
+          j.name AS job_name,
+          b.shortcut AS billing_shortcut,
+          b.csskey AS billing_csskey,
+          t.fk_login
+         FROM (((((done.v_timelength t
+           LEFT JOIN done.t_done d ON ((d.pk = t.fk_done)))
+           LEFT JOIN done.t_project p ON ((p.pk = d.fk_project)))
+           LEFT JOIN done.t_module m ON ((m.pk = d.fk_module)))
+           LEFT JOIN done.t_job j ON ((j.pk = d.fk_job)))
+           LEFT JOIN done.t_billing b ON ((b.pk = d.fk_billing)))
+        GROUP BY t.day, p.name, m.name, j.name, b.shortcut, b.csskey, t.fk_login;
+        """), where);
     }
 
     /**
@@ -121,10 +138,6 @@ public class VWorktime extends TableImpl<VWorktimeRecord> {
         this(DSL.name("v_worktime"), null);
     }
 
-    public <O extends Record> VWorktime(Table<O> child, ForeignKey<O, VWorktimeRecord> key) {
-        super(child, key, V_WORKTIME);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Done.DONE;
@@ -169,27 +182,87 @@ public class VWorktime extends TableImpl<VWorktimeRecord> {
         return new VWorktime(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row9 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row9<String, String, Double, String, String, String, String, String, Integer> fieldsRow() {
+    public VWorktime where(Condition condition) {
-        return (Row9) super.fieldsRow();
+        return new VWorktime(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function9<? super String, ? super String, ? super Double, ? super String, ? super String, ? super String, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VWorktime where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function9<? super String, ? super String, ? super Double, ? super String, ? super String, ? super String, ? super String, ? super String, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VWorktime where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VWorktime where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VWorktime where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VWorktime where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VWorktime where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VWorktime where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VWorktime whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VWorktime whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/done/tables/records/TBillingRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.done.tables.TBilling;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record5;
-import org.jooq.Row5;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TBillingRecord extends UpdatableRecordImpl<TBillingRecord> implements Record5<LocalDateTime, Integer, String, String, String> {
+public class TBillingRecord extends UpdatableRecordImpl<TBillingRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -102,135 +99,6 @@ public class TBillingRecord extends UpdatableRecordImpl<TBillingRecord> implemen
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record5 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row5<LocalDateTime, Integer, String, String, String> fieldsRow() {
-        return (Row5) super.fieldsRow();
-    }
-
-    @Override
-    public Row5<LocalDateTime, Integer, String, String, String> valuesRow() {
-        return (Row5) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TBilling.T_BILLING.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TBilling.T_BILLING.PK;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return TBilling.T_BILLING.NAME;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return TBilling.T_BILLING.SHORTCUT;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return TBilling.T_BILLING.CSSKEY;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPk();
-    }
-
-    @Override
-    public String component3() {
-        return getName();
-    }
-
-    @Override
-    public String component4() {
-        return getShortcut();
-    }
-
-    @Override
-    public String component5() {
-        return getCsskey();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPk();
-    }
-
-    @Override
-    public String value3() {
-        return getName();
-    }
-
-    @Override
-    public String value4() {
-        return getShortcut();
-    }
-
-    @Override
-    public String value5() {
-        return getCsskey();
-    }
-
-    @Override
-    public TBillingRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TBillingRecord value2(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TBillingRecord value3(String value) {
-        setName(value);
-        return this;
-    }
-
-    @Override
-    public TBillingRecord value4(String value) {
-        setShortcut(value);
-        return this;
-    }
-
-    @Override
-    public TBillingRecord value5(String value) {
-        setCsskey(value);
-        return this;
-    }
-
-    @Override
-    public TBillingRecord values(LocalDateTime value1, Integer value2, String value3, String value4, String value5) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/TDoneRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.done.tables.TDone;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record9;
-import org.jooq.Row9;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TDoneRecord extends UpdatableRecordImpl<TDoneRecord> implements Record9<LocalDateTime, Integer, LocalDateTime, LocalDateTime, Integer, Integer, Integer, Integer, Integer> {
+public class TDoneRecord extends UpdatableRecordImpl<TDoneRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -158,223 +155,6 @@ public class TDoneRecord extends UpdatableRecordImpl<TDoneRecord> implements Rec
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record9 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row9<LocalDateTime, Integer, LocalDateTime, LocalDateTime, Integer, Integer, Integer, Integer, Integer> fieldsRow() {
-        return (Row9) super.fieldsRow();
-    }
-
-    @Override
-    public Row9<LocalDateTime, Integer, LocalDateTime, LocalDateTime, Integer, Integer, Integer, Integer, Integer> valuesRow() {
-        return (Row9) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TDone.T_DONE.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TDone.T_DONE.PK;
-    }
-
-    @Override
-    public Field<LocalDateTime> field3() {
-        return TDone.T_DONE.TIME_FROM;
-    }
-
-    @Override
-    public Field<LocalDateTime> field4() {
-        return TDone.T_DONE.TIME_UNTIL;
-    }
-
-    @Override
-    public Field<Integer> field5() {
-        return TDone.T_DONE.FK_PROJECT;
-    }
-
-    @Override
-    public Field<Integer> field6() {
-        return TDone.T_DONE.FK_MODULE;
-    }
-
-    @Override
-    public Field<Integer> field7() {
-        return TDone.T_DONE.FK_JOB;
-    }
-
-    @Override
-    public Field<Integer> field8() {
-        return TDone.T_DONE.FK_LOGIN;
-    }
-
-    @Override
-    public Field<Integer> field9() {
-        return TDone.T_DONE.FK_BILLING;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPk();
-    }
-
-    @Override
-    public LocalDateTime component3() {
-        return getTimeFrom();
-    }
-
-    @Override
-    public LocalDateTime component4() {
-        return getTimeUntil();
-    }
-
-    @Override
-    public Integer component5() {
-        return getFkProject();
-    }
-
-    @Override
-    public Integer component6() {
-        return getFkModule();
-    }
-
-    @Override
-    public Integer component7() {
-        return getFkJob();
-    }
-
-    @Override
-    public Integer component8() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer component9() {
-        return getFkBilling();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPk();
-    }
-
-    @Override
-    public LocalDateTime value3() {
-        return getTimeFrom();
-    }
-
-    @Override
-    public LocalDateTime value4() {
-        return getTimeUntil();
-    }
-
-    @Override
-    public Integer value5() {
-        return getFkProject();
-    }
-
-    @Override
-    public Integer value6() {
-        return getFkModule();
-    }
-
-    @Override
-    public Integer value7() {
-        return getFkJob();
-    }
-
-    @Override
-    public Integer value8() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer value9() {
-        return getFkBilling();
-    }
-
-    @Override
-    public TDoneRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TDoneRecord value2(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TDoneRecord value3(LocalDateTime value) {
-        setTimeFrom(value);
-        return this;
-    }
-
-    @Override
-    public TDoneRecord value4(LocalDateTime value) {
-        setTimeUntil(value);
-        return this;
-    }
-
-    @Override
-    public TDoneRecord value5(Integer value) {
-        setFkProject(value);
-        return this;
-    }
-
-    @Override
-    public TDoneRecord value6(Integer value) {
-        setFkModule(value);
-        return this;
-    }
-
-    @Override
-    public TDoneRecord value7(Integer value) {
-        setFkJob(value);
-        return this;
-    }
-
-    @Override
-    public TDoneRecord value8(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public TDoneRecord value9(Integer value) {
-        setFkBilling(value);
-        return this;
-    }
-
-    @Override
-    public TDoneRecord values(LocalDateTime value1, Integer value2, LocalDateTime value3, LocalDateTime value4, Integer value5, Integer value6, Integer value7, Integer value8, Integer value9) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        value7(value7);
-        value8(value8);
-        value9(value9);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/TFavoriteRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.done.tables.TFavorite;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record7;
-import org.jooq.Row7;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TFavoriteRecord extends UpdatableRecordImpl<TFavoriteRecord> implements Record7<LocalDateTime, Integer, Integer, Integer, Integer, Integer, Integer> {
+public class TFavoriteRecord extends UpdatableRecordImpl<TFavoriteRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -130,179 +127,6 @@ public class TFavoriteRecord extends UpdatableRecordImpl<TFavoriteRecord> implem
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record7 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row7<LocalDateTime, Integer, Integer, Integer, Integer, Integer, Integer> fieldsRow() {
-        return (Row7) super.fieldsRow();
-    }
-
-    @Override
-    public Row7<LocalDateTime, Integer, Integer, Integer, Integer, Integer, Integer> valuesRow() {
-        return (Row7) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TFavorite.T_FAVORITE.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TFavorite.T_FAVORITE.PK_FAVORITE;
-    }
-
-    @Override
-    public Field<Integer> field3() {
-        return TFavorite.T_FAVORITE.FK_LOGIN;
-    }
-
-    @Override
-    public Field<Integer> field4() {
-        return TFavorite.T_FAVORITE.FK_PROJECT;
-    }
-
-    @Override
-    public Field<Integer> field5() {
-        return TFavorite.T_FAVORITE.FK_MODULE;
-    }
-
-    @Override
-    public Field<Integer> field6() {
-        return TFavorite.T_FAVORITE.FK_JOB;
-    }
-
-    @Override
-    public Field<Integer> field7() {
-        return TFavorite.T_FAVORITE.FK_BILLING;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPkFavorite();
-    }
-
-    @Override
-    public Integer component3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer component4() {
-        return getFkProject();
-    }
-
-    @Override
-    public Integer component5() {
-        return getFkModule();
-    }
-
-    @Override
-    public Integer component6() {
-        return getFkJob();
-    }
-
-    @Override
-    public Integer component7() {
-        return getFkBilling();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPkFavorite();
-    }
-
-    @Override
-    public Integer value3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer value4() {
-        return getFkProject();
-    }
-
-    @Override
-    public Integer value5() {
-        return getFkModule();
-    }
-
-    @Override
-    public Integer value6() {
-        return getFkJob();
-    }
-
-    @Override
-    public Integer value7() {
-        return getFkBilling();
-    }
-
-    @Override
-    public TFavoriteRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TFavoriteRecord value2(Integer value) {
-        setPkFavorite(value);
-        return this;
-    }
-
-    @Override
-    public TFavoriteRecord value3(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public TFavoriteRecord value4(Integer value) {
-        setFkProject(value);
-        return this;
-    }
-
-    @Override
-    public TFavoriteRecord value5(Integer value) {
-        setFkModule(value);
-        return this;
-    }
-
-    @Override
-    public TFavoriteRecord value6(Integer value) {
-        setFkJob(value);
-        return this;
-    }
-
-    @Override
-    public TFavoriteRecord value7(Integer value) {
-        setFkBilling(value);
-        return this;
-    }
-
-    @Override
-    public TFavoriteRecord values(LocalDateTime value1, Integer value2, Integer value3, Integer value4, Integer value5, Integer value6, Integer value7) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        value7(value7);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/TFreetimeRecord.java

@@ -9,18 +9,15 @@ import de.jottyfan.timetrack.db.done.tables.TFreetime;
 import java.time.LocalDate;
 import java.time.LocalTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record5;
-import org.jooq.Row5;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TFreetimeRecord extends UpdatableRecordImpl<TFreetimeRecord> implements Record5<Integer, LocalDate, LocalTime, String, Integer> {
+public class TFreetimeRecord extends UpdatableRecordImpl<TFreetimeRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -103,135 +100,6 @@ public class TFreetimeRecord extends UpdatableRecordImpl<TFreetimeRecord> implem
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record5 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row5<Integer, LocalDate, LocalTime, String, Integer> fieldsRow() {
-        return (Row5) super.fieldsRow();
-    }
-
-    @Override
-    public Row5<Integer, LocalDate, LocalTime, String, Integer> valuesRow() {
-        return (Row5) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return TFreetime.T_FREETIME.PK_FREETIME;
-    }
-
-    @Override
-    public Field<LocalDate> field2() {
-        return TFreetime.T_FREETIME.DAY;
-    }
-
-    @Override
-    public Field<LocalTime> field3() {
-        return TFreetime.T_FREETIME.REQUIRED_WORKTIME;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return TFreetime.T_FREETIME.REASON;
-    }
-
-    @Override
-    public Field<Integer> field5() {
-        return TFreetime.T_FREETIME.FK_LOGIN;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPkFreetime();
-    }
-
-    @Override
-    public LocalDate component2() {
-        return getDay();
-    }
-
-    @Override
-    public LocalTime component3() {
-        return getRequiredWorktime();
-    }
-
-    @Override
-    public String component4() {
-        return getReason();
-    }
-
-    @Override
-    public Integer component5() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPkFreetime();
-    }
-
-    @Override
-    public LocalDate value2() {
-        return getDay();
-    }
-
-    @Override
-    public LocalTime value3() {
-        return getRequiredWorktime();
-    }
-
-    @Override
-    public String value4() {
-        return getReason();
-    }
-
-    @Override
-    public Integer value5() {
-        return getFkLogin();
-    }
-
-    @Override
-    public TFreetimeRecord value1(Integer value) {
-        setPkFreetime(value);
-        return this;
-    }
-
-    @Override
-    public TFreetimeRecord value2(LocalDate value) {
-        setDay(value);
-        return this;
-    }
-
-    @Override
-    public TFreetimeRecord value3(LocalTime value) {
-        setRequiredWorktime(value);
-        return this;
-    }
-
-    @Override
-    public TFreetimeRecord value4(String value) {
-        setReason(value);
-        return this;
-    }
-
-    @Override
-    public TFreetimeRecord value5(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public TFreetimeRecord values(Integer value1, LocalDate value2, LocalTime value3, String value4, Integer value5) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/TJobRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.done.tables.TJob;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record3;
-import org.jooq.Row3;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TJobRecord extends UpdatableRecordImpl<TJobRecord> implements Record3<LocalDateTime, Integer, String> {
+public class TJobRecord extends UpdatableRecordImpl<TJobRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -74,91 +71,6 @@ public class TJobRecord extends UpdatableRecordImpl<TJobRecord> implements Recor
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record3 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row3<LocalDateTime, Integer, String> fieldsRow() {
-        return (Row3) super.fieldsRow();
-    }
-
-    @Override
-    public Row3<LocalDateTime, Integer, String> valuesRow() {
-        return (Row3) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TJob.T_JOB.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TJob.T_JOB.PK;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return TJob.T_JOB.NAME;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPk();
-    }
-
-    @Override
-    public String component3() {
-        return getName();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPk();
-    }
-
-    @Override
-    public String value3() {
-        return getName();
-    }
-
-    @Override
-    public TJobRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TJobRecord value2(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TJobRecord value3(String value) {
-        setName(value);
-        return this;
-    }
-
-    @Override
-    public TJobRecord values(LocalDateTime value1, Integer value2, String value3) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/TModuleRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.done.tables.TModule;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record3;
-import org.jooq.Row3;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TModuleRecord extends UpdatableRecordImpl<TModuleRecord> implements Record3<LocalDateTime, Integer, String> {
+public class TModuleRecord extends UpdatableRecordImpl<TModuleRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -74,91 +71,6 @@ public class TModuleRecord extends UpdatableRecordImpl<TModuleRecord> implements
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record3 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row3<LocalDateTime, Integer, String> fieldsRow() {
-        return (Row3) super.fieldsRow();
-    }
-
-    @Override
-    public Row3<LocalDateTime, Integer, String> valuesRow() {
-        return (Row3) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TModule.T_MODULE.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TModule.T_MODULE.PK;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return TModule.T_MODULE.NAME;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPk();
-    }
-
-    @Override
-    public String component3() {
-        return getName();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPk();
-    }
-
-    @Override
-    public String value3() {
-        return getName();
-    }
-
-    @Override
-    public TModuleRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TModuleRecord value2(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TModuleRecord value3(String value) {
-        setName(value);
-        return this;
-    }
-
-    @Override
-    public TModuleRecord values(LocalDateTime value1, Integer value2, String value3) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/TOvertimeRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.done.tables.TOvertime;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record4;
-import org.jooq.Row4;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TOvertimeRecord extends UpdatableRecordImpl<TOvertimeRecord> implements Record4<Integer, LocalDateTime, Integer, Integer> {
+public class TOvertimeRecord extends UpdatableRecordImpl<TOvertimeRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -88,113 +85,6 @@ public class TOvertimeRecord extends UpdatableRecordImpl<TOvertimeRecord> implem
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record4 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row4<Integer, LocalDateTime, Integer, Integer> fieldsRow() {
-        return (Row4) super.fieldsRow();
-    }
-
-    @Override
-    public Row4<Integer, LocalDateTime, Integer, Integer> valuesRow() {
-        return (Row4) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return TOvertime.T_OVERTIME.PK_OVERTIME;
-    }
-
-    @Override
-    public Field<LocalDateTime> field2() {
-        return TOvertime.T_OVERTIME.IMPACT;
-    }
-
-    @Override
-    public Field<Integer> field3() {
-        return TOvertime.T_OVERTIME.FK_LOGIN;
-    }
-
-    @Override
-    public Field<Integer> field4() {
-        return TOvertime.T_OVERTIME.OVERTIME_MINUTES;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPkOvertime();
-    }
-
-    @Override
-    public LocalDateTime component2() {
-        return getImpact();
-    }
-
-    @Override
-    public Integer component3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer component4() {
-        return getOvertimeMinutes();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPkOvertime();
-    }
-
-    @Override
-    public LocalDateTime value2() {
-        return getImpact();
-    }
-
-    @Override
-    public Integer value3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer value4() {
-        return getOvertimeMinutes();
-    }
-
-    @Override
-    public TOvertimeRecord value1(Integer value) {
-        setPkOvertime(value);
-        return this;
-    }
-
-    @Override
-    public TOvertimeRecord value2(LocalDateTime value) {
-        setImpact(value);
-        return this;
-    }
-
-    @Override
-    public TOvertimeRecord value3(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public TOvertimeRecord value4(Integer value) {
-        setOvertimeMinutes(value);
-        return this;
-    }
-
-    @Override
-    public TOvertimeRecord values(Integer value1, LocalDateTime value2, Integer value3, Integer value4) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/TProjectRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.done.tables.TProject;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record3;
-import org.jooq.Row3;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TProjectRecord extends UpdatableRecordImpl<TProjectRecord> implements Record3<LocalDateTime, Integer, String> {
+public class TProjectRecord extends UpdatableRecordImpl<TProjectRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -74,91 +71,6 @@ public class TProjectRecord extends UpdatableRecordImpl<TProjectRecord> implemen
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record3 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row3<LocalDateTime, Integer, String> fieldsRow() {
-        return (Row3) super.fieldsRow();
-    }
-
-    @Override
-    public Row3<LocalDateTime, Integer, String> valuesRow() {
-        return (Row3) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TProject.T_PROJECT.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TProject.T_PROJECT.PK;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return TProject.T_PROJECT.NAME;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPk();
-    }
-
-    @Override
-    public String component3() {
-        return getName();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPk();
-    }
-
-    @Override
-    public String value3() {
-        return getName();
-    }
-
-    @Override
-    public TProjectRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TProjectRecord value2(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TProjectRecord value3(String value) {
-        setName(value);
-        return this;
-    }
-
-    @Override
-    public TProjectRecord values(LocalDateTime value1, Integer value2, String value3) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/TRequiredWorktimeRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.done.tables.TRequiredWorktime;
 
 import java.time.LocalDate;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record5;
-import org.jooq.Row5;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorktimeRecord> implements Record5<Integer, LocalDate, Integer, Integer, String> {
+public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorktimeRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -102,135 +99,6 @@ public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorkti
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record5 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row5<Integer, LocalDate, Integer, Integer, String> fieldsRow() {
-        return (Row5) super.fieldsRow();
-    }
-
-    @Override
-    public Row5<Integer, LocalDate, Integer, Integer, String> valuesRow() {
-        return (Row5) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return TRequiredWorktime.T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME;
-    }
-
-    @Override
-    public Field<LocalDate> field2() {
-        return TRequiredWorktime.T_REQUIRED_WORKTIME.DAY;
-    }
-
-    @Override
-    public Field<Integer> field3() {
-        return TRequiredWorktime.T_REQUIRED_WORKTIME.FK_LOGIN;
-    }
-
-    @Override
-    public Field<Integer> field4() {
-        return TRequiredWorktime.T_REQUIRED_WORKTIME.REQUIRED_MINUTES;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return TRequiredWorktime.T_REQUIRED_WORKTIME.REASON;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPkRequiredWorktime();
-    }
-
-    @Override
-    public LocalDate component2() {
-        return getDay();
-    }
-
-    @Override
-    public Integer component3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer component4() {
-        return getRequiredMinutes();
-    }
-
-    @Override
-    public String component5() {
-        return getReason();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPkRequiredWorktime();
-    }
-
-    @Override
-    public LocalDate value2() {
-        return getDay();
-    }
-
-    @Override
-    public Integer value3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer value4() {
-        return getRequiredMinutes();
-    }
-
-    @Override
-    public String value5() {
-        return getReason();
-    }
-
-    @Override
-    public TRequiredWorktimeRecord value1(Integer value) {
-        setPkRequiredWorktime(value);
-        return this;
-    }
-
-    @Override
-    public TRequiredWorktimeRecord value2(LocalDate value) {
-        setDay(value);
-        return this;
-    }
-
-    @Override
-    public TRequiredWorktimeRecord value3(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public TRequiredWorktimeRecord value4(Integer value) {
-        setRequiredMinutes(value);
-        return this;
-    }
-
-    @Override
-    public TRequiredWorktimeRecord value5(String value) {
-        setReason(value);
-        return this;
-    }
-
-    @Override
-    public TRequiredWorktimeRecord values(Integer value1, LocalDate value2, Integer value3, Integer value4, String value5) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VBillingRecord.java

@@ -8,17 +8,14 @@ import de.jottyfan.timetrack.db.done.tables.VBilling;
 
 import java.math.BigDecimal;
 
-import org.jooq.Field;
-import org.jooq.Record5;
-import org.jooq.Row5;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VBillingRecord extends TableRecordImpl<VBillingRecord> implements Record5<Integer, String, String, String, BigDecimal> {
+public class VBillingRecord extends TableRecordImpl<VBillingRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -92,135 +89,6 @@ public class VBillingRecord extends TableRecordImpl<VBillingRecord> implements R
         return (BigDecimal) get(4);
     }
 
-    // -------------------------------------------------------------------------
-    // Record5 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row5<Integer, String, String, String, BigDecimal> fieldsRow() {
-        return (Row5) super.fieldsRow();
-    }
-
-    @Override
-    public Row5<Integer, String, String, String, BigDecimal> valuesRow() {
-        return (Row5) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return VBilling.V_BILLING.PK;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VBilling.V_BILLING.NAME;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return VBilling.V_BILLING.SHORTCUT;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return VBilling.V_BILLING.CSSKEY;
-    }
-
-    @Override
-    public Field<BigDecimal> field5() {
-        return VBilling.V_BILLING.PERCENT_USAGE;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPk();
-    }
-
-    @Override
-    public String component2() {
-        return getName();
-    }
-
-    @Override
-    public String component3() {
-        return getShortcut();
-    }
-
-    @Override
-    public String component4() {
-        return getCsskey();
-    }
-
-    @Override
-    public BigDecimal component5() {
-        return getPercentUsage();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPk();
-    }
-
-    @Override
-    public String value2() {
-        return getName();
-    }
-
-    @Override
-    public String value3() {
-        return getShortcut();
-    }
-
-    @Override
-    public String value4() {
-        return getCsskey();
-    }
-
-    @Override
-    public BigDecimal value5() {
-        return getPercentUsage();
-    }
-
-    @Override
-    public VBillingRecord value1(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public VBillingRecord value2(String value) {
-        setName(value);
-        return this;
-    }
-
-    @Override
-    public VBillingRecord value3(String value) {
-        setShortcut(value);
-        return this;
-    }
-
-    @Override
-    public VBillingRecord value4(String value) {
-        setCsskey(value);
-        return this;
-    }
-
-    @Override
-    public VBillingRecord value5(BigDecimal value) {
-        setPercentUsage(value);
-        return this;
-    }
-
-    @Override
-    public VBillingRecord values(Integer value1, String value2, String value3, String value4, BigDecimal value5) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VCurrentOvertimeRecord.java

@@ -8,17 +8,14 @@ import de.jottyfan.timetrack.db.done.tables.VCurrentOvertime;
 
 import java.math.BigDecimal;
 
-import org.jooq.Field;
-import org.jooq.Record3;
-import org.jooq.Row3;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VCurrentOvertimeRecord extends TableRecordImpl<VCurrentOvertimeRecord> implements Record3<BigDecimal, String, Integer> {
+public class VCurrentOvertimeRecord extends TableRecordImpl<VCurrentOvertimeRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -64,91 +61,6 @@ public class VCurrentOvertimeRecord extends TableRecordImpl<VCurrentOvertimeReco
         return (Integer) get(2);
     }
 
-    // -------------------------------------------------------------------------
-    // Record3 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row3<BigDecimal, String, Integer> fieldsRow() {
-        return (Row3) super.fieldsRow();
-    }
-
-    @Override
-    public Row3<BigDecimal, String, Integer> valuesRow() {
-        return (Row3) super.valuesRow();
-    }
-
-    @Override
-    public Field<BigDecimal> field1() {
-        return VCurrentOvertime.V_CURRENT_OVERTIME.OVERTIME;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VCurrentOvertime.V_CURRENT_OVERTIME.IMPACT;
-    }
-
-    @Override
-    public Field<Integer> field3() {
-        return VCurrentOvertime.V_CURRENT_OVERTIME.FK_LOGIN;
-    }
-
-    @Override
-    public BigDecimal component1() {
-        return getOvertime();
-    }
-
-    @Override
-    public String component2() {
-        return getImpact();
-    }
-
-    @Override
-    public Integer component3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public BigDecimal value1() {
-        return getOvertime();
-    }
-
-    @Override
-    public String value2() {
-        return getImpact();
-    }
-
-    @Override
-    public Integer value3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public VCurrentOvertimeRecord value1(BigDecimal value) {
-        setOvertime(value);
-        return this;
-    }
-
-    @Override
-    public VCurrentOvertimeRecord value2(String value) {
-        setImpact(value);
-        return this;
-    }
-
-    @Override
-    public VCurrentOvertimeRecord value3(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public VCurrentOvertimeRecord values(BigDecimal value1, String value2, Integer value3) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VDailyRecord.java

@@ -6,9 +6,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
 
 import de.jottyfan.timetrack.db.done.tables.VDaily;
 
-import org.jooq.Field;
-import org.jooq.Record4;
-import org.jooq.Row4;
 import org.jooq.impl.TableRecordImpl;
 import org.jooq.types.YearToSecond;
 
@@ -16,8 +13,8 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VDailyRecord extends TableRecordImpl<VDailyRecord> implements Record4<YearToSecond, String, String, Integer> {
+public class VDailyRecord extends TableRecordImpl<VDailyRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -77,113 +74,6 @@ public class VDailyRecord extends TableRecordImpl<VDailyRecord> implements Recor
         return (Integer) get(3);
     }
 
-    // -------------------------------------------------------------------------
-    // Record4 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row4<YearToSecond, String, String, Integer> fieldsRow() {
-        return (Row4) super.fieldsRow();
-    }
-
-    @Override
-    public Row4<YearToSecond, String, String, Integer> valuesRow() {
-        return (Row4) super.valuesRow();
-    }
-
-    @Override
-    public Field<YearToSecond> field1() {
-        return VDaily.V_DAILY.WORKTIME;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VDaily.V_DAILY.DAY;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return VDaily.V_DAILY.LOGIN;
-    }
-
-    @Override
-    public Field<Integer> 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
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VDayRecord.java

@@ -9,9 +9,6 @@ import de.jottyfan.timetrack.db.done.tables.VDay;
 import java.time.LocalDate;
 import java.time.LocalTime;
 
-import org.jooq.Field;
-import org.jooq.Record7;
-import org.jooq.Row7;
 import org.jooq.impl.TableRecordImpl;
 import org.jooq.types.YearToSecond;
 
@@ -19,8 +16,8 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VDayRecord extends TableRecordImpl<VDayRecord> implements Record7<LocalDate, LocalTime, LocalTime, YearToSecond, YearToSecond, YearToSecond, Integer> {
+public class VDayRecord extends TableRecordImpl<VDayRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -122,179 +119,6 @@ public class VDayRecord extends TableRecordImpl<VDayRecord> implements Record7<L
         return (Integer) get(6);
     }
 
-    // -------------------------------------------------------------------------
-    // Record7 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row7<LocalDate, LocalTime, LocalTime, YearToSecond, YearToSecond, YearToSecond, Integer> fieldsRow() {
-        return (Row7) super.fieldsRow();
-    }
-
-    @Override
-    public Row7<LocalDate, LocalTime, LocalTime, YearToSecond, YearToSecond, YearToSecond, Integer> valuesRow() {
-        return (Row7) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDate> field1() {
-        return VDay.V_DAY.DAY;
-    }
-
-    @Override
-    public Field<LocalTime> field2() {
-        return VDay.V_DAY.STARTTIME;
-    }
-
-    @Override
-    public Field<LocalTime> field3() {
-        return VDay.V_DAY.ENDTIME;
-    }
-
-    @Override
-    public Field<YearToSecond> field4() {
-        return VDay.V_DAY.WORKTIME;
-    }
-
-    @Override
-    public Field<YearToSecond> field5() {
-        return VDay.V_DAY.BREAKTIME;
-    }
-
-    @Override
-    public Field<YearToSecond> field6() {
-        return VDay.V_DAY.DAY_OVERTIME;
-    }
-
-    @Override
-    public Field<Integer> field7() {
-        return VDay.V_DAY.FK_LOGIN;
-    }
-
-    @Override
-    public LocalDate component1() {
-        return getDay();
-    }
-
-    @Override
-    public LocalTime component2() {
-        return getStarttime();
-    }
-
-    @Override
-    public LocalTime component3() {
-        return getEndtime();
-    }
-
-    @Override
-    public YearToSecond component4() {
-        return getWorktime();
-    }
-
-    @Override
-    public YearToSecond component5() {
-        return getBreaktime();
-    }
-
-    @Override
-    public YearToSecond component6() {
-        return getDayOvertime();
-    }
-
-    @Override
-    public Integer component7() {
-        return getFkLogin();
-    }
-
-    @Override
-    public LocalDate value1() {
-        return getDay();
-    }
-
-    @Override
-    public LocalTime value2() {
-        return getStarttime();
-    }
-
-    @Override
-    public LocalTime value3() {
-        return getEndtime();
-    }
-
-    @Override
-    public YearToSecond value4() {
-        return getWorktime();
-    }
-
-    @Override
-    public YearToSecond value5() {
-        return getBreaktime();
-    }
-
-    @Override
-    public YearToSecond value6() {
-        return getDayOvertime();
-    }
-
-    @Override
-    public Integer value7() {
-        return getFkLogin();
-    }
-
-    @Override
-    public VDayRecord value1(LocalDate value) {
-        setDay(value);
-        return this;
-    }
-
-    @Override
-    public VDayRecord value2(LocalTime value) {
-        setStarttime(value);
-        return this;
-    }
-
-    @Override
-    public VDayRecord value3(LocalTime value) {
-        setEndtime(value);
-        return this;
-    }
-
-    @Override
-    public VDayRecord value4(YearToSecond value) {
-        setWorktime(value);
-        return this;
-    }
-
-    @Override
-    public VDayRecord value5(YearToSecond value) {
-        setBreaktime(value);
-        return this;
-    }
-
-    @Override
-    public VDayRecord value6(YearToSecond value) {
-        setDayOvertime(value);
-        return this;
-    }
-
-    @Override
-    public VDayRecord value7(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public VDayRecord values(LocalDate value1, LocalTime value2, LocalTime value3, YearToSecond value4, YearToSecond value5, YearToSecond value6, Integer value7) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        value7(value7);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VDaylimitRecord.java

@@ -9,9 +9,6 @@ import de.jottyfan.timetrack.db.done.tables.VDaylimit;
 import java.time.LocalDate;
 import java.time.LocalTime;
 
-import org.jooq.Field;
-import org.jooq.Record6;
-import org.jooq.Row6;
 import org.jooq.impl.TableRecordImpl;
 import org.jooq.types.YearToSecond;
 
@@ -19,8 +16,8 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VDaylimitRecord extends TableRecordImpl<VDaylimitRecord> implements Record6<LocalTime, LocalTime, LocalTime, YearToSecond, LocalDate, Integer> {
+public class VDaylimitRecord extends TableRecordImpl<VDaylimitRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -108,157 +105,6 @@ public class VDaylimitRecord extends TableRecordImpl<VDaylimitRecord> implements
         return (Integer) get(5);
     }
 
-    // -------------------------------------------------------------------------
-    // Record6 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row6<LocalTime, LocalTime, LocalTime, YearToSecond, LocalDate, Integer> fieldsRow() {
-        return (Row6) super.fieldsRow();
-    }
-
-    @Override
-    public Row6<LocalTime, LocalTime, LocalTime, YearToSecond, LocalDate, Integer> valuesRow() {
-        return (Row6) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalTime> field1() {
-        return VDaylimit.V_DAYLIMIT.DAYTIME_FROM;
-    }
-
-    @Override
-    public Field<LocalTime> field2() {
-        return VDaylimit.V_DAYLIMIT.DAYTIME_UNTIL;
-    }
-
-    @Override
-    public Field<LocalTime> field3() {
-        return VDaylimit.V_DAYLIMIT.DAYWORKTIME;
-    }
-
-    @Override
-    public Field<YearToSecond> field4() {
-        return VDaylimit.V_DAYLIMIT.BREAKS;
-    }
-
-    @Override
-    public Field<LocalDate> field5() {
-        return VDaylimit.V_DAYLIMIT.DAY;
-    }
-
-    @Override
-    public Field<Integer> field6() {
-        return VDaylimit.V_DAYLIMIT.FK_LOGIN;
-    }
-
-    @Override
-    public LocalTime component1() {
-        return getDaytimeFrom();
-    }
-
-    @Override
-    public LocalTime component2() {
-        return getDaytimeUntil();
-    }
-
-    @Override
-    public LocalTime component3() {
-        return getDayworktime();
-    }
-
-    @Override
-    public YearToSecond component4() {
-        return getBreaks();
-    }
-
-    @Override
-    public LocalDate component5() {
-        return getDay();
-    }
-
-    @Override
-    public Integer component6() {
-        return getFkLogin();
-    }
-
-    @Override
-    public LocalTime value1() {
-        return getDaytimeFrom();
-    }
-
-    @Override
-    public LocalTime value2() {
-        return getDaytimeUntil();
-    }
-
-    @Override
-    public LocalTime value3() {
-        return getDayworktime();
-    }
-
-    @Override
-    public YearToSecond value4() {
-        return getBreaks();
-    }
-
-    @Override
-    public LocalDate value5() {
-        return getDay();
-    }
-
-    @Override
-    public Integer value6() {
-        return getFkLogin();
-    }
-
-    @Override
-    public VDaylimitRecord value1(LocalTime value) {
-        setDaytimeFrom(value);
-        return this;
-    }
-
-    @Override
-    public VDaylimitRecord value2(LocalTime value) {
-        setDaytimeUntil(value);
-        return this;
-    }
-
-    @Override
-    public VDaylimitRecord value3(LocalTime value) {
-        setDayworktime(value);
-        return this;
-    }
-
-    @Override
-    public VDaylimitRecord value4(YearToSecond value) {
-        setBreaks(value);
-        return this;
-    }
-
-    @Override
-    public VDaylimitRecord value5(LocalDate value) {
-        setDay(value);
-        return this;
-    }
-
-    @Override
-    public VDaylimitRecord value6(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public VDaylimitRecord values(LocalTime value1, LocalTime value2, LocalTime value3, YearToSecond value4, LocalDate value5, Integer value6) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VDaylimitsRecord.java

@@ -9,17 +9,14 @@ import de.jottyfan.timetrack.db.done.tables.VDaylimits;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 
-import org.jooq.Field;
-import org.jooq.Record4;
-import org.jooq.Row4;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implements Record4<LocalDateTime, OffsetDateTime, String, Integer> {
+public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -79,113 +76,6 @@ public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implemen
         return (Integer) get(3);
     }
 
-    // -------------------------------------------------------------------------
-    // Record4 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row4<LocalDateTime, OffsetDateTime, String, Integer> fieldsRow() {
-        return (Row4) super.fieldsRow();
-    }
-
-    @Override
-    public Row4<LocalDateTime, OffsetDateTime, String, Integer> valuesRow() {
-        return (Row4) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return VDaylimits.V_DAYLIMITS.WORK_START;
-    }
-
-    @Override
-    public Field<OffsetDateTime> field2() {
-        return VDaylimits.V_DAYLIMITS.WORK_END;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return VDaylimits.V_DAYLIMITS.DAY;
-    }
-
-    @Override
-    public Field<Integer> field4() {
-        return VDaylimits.V_DAYLIMITS.FK_LOGIN;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getWorkStart();
-    }
-
-    @Override
-    public OffsetDateTime component2() {
-        return getWorkEnd();
-    }
-
-    @Override
-    public String component3() {
-        return getDay();
-    }
-
-    @Override
-    public Integer component4() {
-        return getFkLogin();
-    }
-
-    @Override
-    public LocalDateTime 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(LocalDateTime 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(LocalDateTime value1, OffsetDateTime value2, String value3, Integer value4) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VDaysummaryRecord.java

@@ -9,9 +9,6 @@ import de.jottyfan.timetrack.db.done.tables.VDaysummary;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 
-import org.jooq.Field;
-import org.jooq.Record7;
-import org.jooq.Row7;
 import org.jooq.impl.TableRecordImpl;
 import org.jooq.types.YearToSecond;
 
@@ -19,8 +16,8 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implements Record7<YearToSecond, YearToSecond, LocalDateTime, OffsetDateTime, String, String, Integer> {
+public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -122,179 +119,6 @@ public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implem
         return (Integer) get(6);
     }
 
-    // -------------------------------------------------------------------------
-    // Record7 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row7<YearToSecond, YearToSecond, LocalDateTime, OffsetDateTime, String, String, Integer> fieldsRow() {
-        return (Row7) super.fieldsRow();
-    }
-
-    @Override
-    public Row7<YearToSecond, YearToSecond, LocalDateTime, OffsetDateTime, String, String, Integer> valuesRow() {
-        return (Row7) super.valuesRow();
-    }
-
-    @Override
-    public Field<YearToSecond> field1() {
-        return VDaysummary.V_DAYSUMMARY.BREAKTIME;
-    }
-
-    @Override
-    public Field<YearToSecond> field2() {
-        return VDaysummary.V_DAYSUMMARY.WORKTIME;
-    }
-
-    @Override
-    public Field<LocalDateTime> field3() {
-        return VDaysummary.V_DAYSUMMARY.WORK_START;
-    }
-
-    @Override
-    public Field<OffsetDateTime> field4() {
-        return VDaysummary.V_DAYSUMMARY.WORK_END;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return VDaysummary.V_DAYSUMMARY.DAY;
-    }
-
-    @Override
-    public Field<String> field6() {
-        return VDaysummary.V_DAYSUMMARY.LOGIN;
-    }
-
-    @Override
-    public Field<Integer> field7() {
-        return VDaysummary.V_DAYSUMMARY.FK_LOGIN;
-    }
-
-    @Override
-    public YearToSecond component1() {
-        return getBreaktime();
-    }
-
-    @Override
-    public YearToSecond component2() {
-        return getWorktime();
-    }
-
-    @Override
-    public LocalDateTime 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 LocalDateTime 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(LocalDateTime 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, LocalDateTime 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
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VDoneRecord.java

@@ -8,17 +8,14 @@ import de.jottyfan.timetrack.db.done.tables.VDone;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
-import org.jooq.Record8;
-import org.jooq.Row8;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8<Integer, Integer, LocalDateTime, LocalDateTime, String, String, String, String> {
+public class VDoneRecord extends TableRecordImpl<VDoneRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -134,201 +131,6 @@ public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8
         return (String) get(7);
     }
 
-    // -------------------------------------------------------------------------
-    // Record8 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row8<Integer, Integer, LocalDateTime, LocalDateTime, String, String, String, String> fieldsRow() {
-        return (Row8) super.fieldsRow();
-    }
-
-    @Override
-    public Row8<Integer, Integer, LocalDateTime, LocalDateTime, String, String, String, String> valuesRow() {
-        return (Row8) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return VDone.V_DONE.FK_DONE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return VDone.V_DONE.FK_LOGIN;
-    }
-
-    @Override
-    public Field<LocalDateTime> field3() {
-        return VDone.V_DONE.TIME_FROM;
-    }
-
-    @Override
-    public Field<LocalDateTime> field4() {
-        return VDone.V_DONE.TIME_UNTIL;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return VDone.V_DONE.PROJECT_NAME;
-    }
-
-    @Override
-    public Field<String> field6() {
-        return VDone.V_DONE.MODULE_NAME;
-    }
-
-    @Override
-    public Field<String> field7() {
-        return VDone.V_DONE.JOB_NAME;
-    }
-
-    @Override
-    public Field<String> field8() {
-        return VDone.V_DONE.LOGIN;
-    }
-
-    @Override
-    public Integer component1() {
-        return getFkDone();
-    }
-
-    @Override
-    public Integer component2() {
-        return getFkLogin();
-    }
-
-    @Override
-    public LocalDateTime component3() {
-        return getTimeFrom();
-    }
-
-    @Override
-    public LocalDateTime 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 LocalDateTime value3() {
-        return getTimeFrom();
-    }
-
-    @Override
-    public LocalDateTime 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(LocalDateTime value) {
-        setTimeFrom(value);
-        return this;
-    }
-
-    @Override
-    public VDoneRecord value4(LocalDateTime 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, LocalDateTime value3, LocalDateTime 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
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VDurationRecord.java

@@ -6,9 +6,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
 
 import de.jottyfan.timetrack.db.done.tables.VDuration;
 
-import org.jooq.Field;
-import org.jooq.Record7;
-import org.jooq.Row7;
 import org.jooq.impl.TableRecordImpl;
 import org.jooq.types.YearToSecond;
 
@@ -16,8 +13,8 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VDurationRecord extends TableRecordImpl<VDurationRecord> implements Record7<String, YearToSecond, String, String, String, String, Integer> {
+public class VDurationRecord extends TableRecordImpl<VDurationRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -119,179 +116,6 @@ public class VDurationRecord extends TableRecordImpl<VDurationRecord> implements
         return (Integer) get(6);
     }
 
-    // -------------------------------------------------------------------------
-    // Record7 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row7<String, YearToSecond, String, String, String, String, Integer> fieldsRow() {
-        return (Row7) super.fieldsRow();
-    }
-
-    @Override
-    public Row7<String, YearToSecond, String, String, String, String, Integer> valuesRow() {
-        return (Row7) super.valuesRow();
-    }
-
-    @Override
-    public Field<String> field1() {
-        return VDuration.V_DURATION.DAY;
-    }
-
-    @Override
-    public Field<YearToSecond> field2() {
-        return VDuration.V_DURATION.DURATION;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return VDuration.V_DURATION.PROJECT_NAME;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return VDuration.V_DURATION.MODULE_NAME;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return VDuration.V_DURATION.JOB_NAME;
-    }
-
-    @Override
-    public Field<String> field6() {
-        return VDuration.V_DURATION.LOGIN;
-    }
-
-    @Override
-    public Field<Integer> 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
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VFavoriteRecord.java

@@ -6,17 +6,14 @@ package de.jottyfan.timetrack.db.done.tables.records;
 
 import de.jottyfan.timetrack.db.done.tables.VFavorite;
 
-import org.jooq.Field;
-import org.jooq.Record6;
-import org.jooq.Row6;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VFavoriteRecord extends TableRecordImpl<VFavoriteRecord> implements Record6<Integer, Integer, String, String, String, String> {
+public class VFavoriteRecord extends TableRecordImpl<VFavoriteRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -104,157 +101,6 @@ public class VFavoriteRecord extends TableRecordImpl<VFavoriteRecord> implements
         return (String) get(5);
     }
 
-    // -------------------------------------------------------------------------
-    // Record6 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row6<Integer, Integer, String, String, String, String> fieldsRow() {
-        return (Row6) super.fieldsRow();
-    }
-
-    @Override
-    public Row6<Integer, Integer, String, String, String, String> valuesRow() {
-        return (Row6) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return VFavorite.V_FAVORITE.PK_FAVORITE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return VFavorite.V_FAVORITE.FK_LOGIN;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return VFavorite.V_FAVORITE.PROJECT;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return VFavorite.V_FAVORITE.MODULE;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return VFavorite.V_FAVORITE.JOB;
-    }
-
-    @Override
-    public Field<String> field6() {
-        return VFavorite.V_FAVORITE.BILLING;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPkFavorite();
-    }
-
-    @Override
-    public Integer component2() {
-        return getFkLogin();
-    }
-
-    @Override
-    public String component3() {
-        return getProject();
-    }
-
-    @Override
-    public String component4() {
-        return getModule();
-    }
-
-    @Override
-    public String component5() {
-        return getJob();
-    }
-
-    @Override
-    public String component6() {
-        return getBilling();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPkFavorite();
-    }
-
-    @Override
-    public Integer value2() {
-        return getFkLogin();
-    }
-
-    @Override
-    public String value3() {
-        return getProject();
-    }
-
-    @Override
-    public String value4() {
-        return getModule();
-    }
-
-    @Override
-    public String value5() {
-        return getJob();
-    }
-
-    @Override
-    public String value6() {
-        return getBilling();
-    }
-
-    @Override
-    public VFavoriteRecord value1(Integer value) {
-        setPkFavorite(value);
-        return this;
-    }
-
-    @Override
-    public VFavoriteRecord value2(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public VFavoriteRecord value3(String value) {
-        setProject(value);
-        return this;
-    }
-
-    @Override
-    public VFavoriteRecord value4(String value) {
-        setModule(value);
-        return this;
-    }
-
-    @Override
-    public VFavoriteRecord value5(String value) {
-        setJob(value);
-        return this;
-    }
-
-    @Override
-    public VFavoriteRecord value6(String value) {
-        setBilling(value);
-        return this;
-    }
-
-    @Override
-    public VFavoriteRecord values(Integer value1, Integer value2, String value3, String value4, String value5, String value6) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VHamstersummaryRecord.java

@@ -8,17 +8,14 @@ import de.jottyfan.timetrack.db.done.tables.VHamstersummary;
 
 import java.time.LocalDate;
 
-import org.jooq.Field;
-import org.jooq.Record6;
-import org.jooq.Row6;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord> implements Record6<LocalDate, String, String, String, String, String> {
+public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -106,157 +103,6 @@ public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord
         return (String) get(5);
     }
 
-    // -------------------------------------------------------------------------
-    // Record6 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row6<LocalDate, String, String, String, String, String> fieldsRow() {
-        return (Row6) super.fieldsRow();
-    }
-
-    @Override
-    public Row6<LocalDate, String, String, String, String, String> valuesRow() {
-        return (Row6) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDate> field1() {
-        return VHamstersummary.V_HAMSTERSUMMARY.WORKDAY;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VHamstersummary.V_HAMSTERSUMMARY.DURATION;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return VHamstersummary.V_HAMSTERSUMMARY.PROJECT_NAME;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return VHamstersummary.V_HAMSTERSUMMARY.MODULE_NAME;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return VHamstersummary.V_HAMSTERSUMMARY.JOB_NAME;
-    }
-
-    @Override
-    public Field<String> field6() {
-        return VHamstersummary.V_HAMSTERSUMMARY.LOGIN;
-    }
-
-    @Override
-    public LocalDate 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 LocalDate 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(LocalDate 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(LocalDate 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
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VJobRecord.java

@@ -8,17 +8,14 @@ import de.jottyfan.timetrack.db.done.tables.VJob;
 
 import java.math.BigDecimal;
 
-import org.jooq.Field;
-import org.jooq.Record3;
-import org.jooq.Row3;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VJobRecord extends TableRecordImpl<VJobRecord> implements Record3<Integer, String, BigDecimal> {
+public class VJobRecord extends TableRecordImpl<VJobRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -64,91 +61,6 @@ public class VJobRecord extends TableRecordImpl<VJobRecord> implements Record3<I
         return (BigDecimal) get(2);
     }
 
-    // -------------------------------------------------------------------------
-    // Record3 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row3<Integer, String, BigDecimal> fieldsRow() {
-        return (Row3) super.fieldsRow();
-    }
-
-    @Override
-    public Row3<Integer, String, BigDecimal> valuesRow() {
-        return (Row3) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return VJob.V_JOB.PK;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VJob.V_JOB.NAME;
-    }
-
-    @Override
-    public Field<BigDecimal> field3() {
-        return VJob.V_JOB.PERCENT_USAGE;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPk();
-    }
-
-    @Override
-    public String component2() {
-        return getName();
-    }
-
-    @Override
-    public BigDecimal component3() {
-        return getPercentUsage();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPk();
-    }
-
-    @Override
-    public String value2() {
-        return getName();
-    }
-
-    @Override
-    public BigDecimal value3() {
-        return getPercentUsage();
-    }
-
-    @Override
-    public VJobRecord value1(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public VJobRecord value2(String value) {
-        setName(value);
-        return this;
-    }
-
-    @Override
-    public VJobRecord value3(BigDecimal value) {
-        setPercentUsage(value);
-        return this;
-    }
-
-    @Override
-    public VJobRecord values(Integer value1, String value2, BigDecimal value3) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VModuleRecord.java

@@ -8,17 +8,14 @@ import de.jottyfan.timetrack.db.done.tables.VModule;
 
 import java.math.BigDecimal;
 
-import org.jooq.Field;
-import org.jooq.Record3;
-import org.jooq.Row3;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VModuleRecord extends TableRecordImpl<VModuleRecord> implements Record3<Integer, String, BigDecimal> {
+public class VModuleRecord extends TableRecordImpl<VModuleRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -64,91 +61,6 @@ public class VModuleRecord extends TableRecordImpl<VModuleRecord> implements Rec
         return (BigDecimal) get(2);
     }
 
-    // -------------------------------------------------------------------------
-    // Record3 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row3<Integer, String, BigDecimal> fieldsRow() {
-        return (Row3) super.fieldsRow();
-    }
-
-    @Override
-    public Row3<Integer, String, BigDecimal> valuesRow() {
-        return (Row3) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return VModule.V_MODULE.PK;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VModule.V_MODULE.NAME;
-    }
-
-    @Override
-    public Field<BigDecimal> field3() {
-        return VModule.V_MODULE.PERCENT_USAGE;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPk();
-    }
-
-    @Override
-    public String component2() {
-        return getName();
-    }
-
-    @Override
-    public BigDecimal component3() {
-        return getPercentUsage();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPk();
-    }
-
-    @Override
-    public String value2() {
-        return getName();
-    }
-
-    @Override
-    public BigDecimal value3() {
-        return getPercentUsage();
-    }
-
-    @Override
-    public VModuleRecord value1(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public VModuleRecord value2(String value) {
-        setName(value);
-        return this;
-    }
-
-    @Override
-    public VModuleRecord value3(BigDecimal value) {
-        setPercentUsage(value);
-        return this;
-    }
-
-    @Override
-    public VModuleRecord values(Integer value1, String value2, BigDecimal value3) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VProjectRecord.java

@@ -8,17 +8,14 @@ import de.jottyfan.timetrack.db.done.tables.VProject;
 
 import java.math.BigDecimal;
 
-import org.jooq.Field;
-import org.jooq.Record3;
-import org.jooq.Row3;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VProjectRecord extends TableRecordImpl<VProjectRecord> implements Record3<Integer, String, BigDecimal> {
+public class VProjectRecord extends TableRecordImpl<VProjectRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -64,91 +61,6 @@ public class VProjectRecord extends TableRecordImpl<VProjectRecord> implements R
         return (BigDecimal) get(2);
     }
 
-    // -------------------------------------------------------------------------
-    // Record3 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row3<Integer, String, BigDecimal> fieldsRow() {
-        return (Row3) super.fieldsRow();
-    }
-
-    @Override
-    public Row3<Integer, String, BigDecimal> valuesRow() {
-        return (Row3) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return VProject.V_PROJECT.PK;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VProject.V_PROJECT.NAME;
-    }
-
-    @Override
-    public Field<BigDecimal> field3() {
-        return VProject.V_PROJECT.PERCENT_USAGE;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPk();
-    }
-
-    @Override
-    public String component2() {
-        return getName();
-    }
-
-    @Override
-    public BigDecimal component3() {
-        return getPercentUsage();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPk();
-    }
-
-    @Override
-    public String value2() {
-        return getName();
-    }
-
-    @Override
-    public BigDecimal value3() {
-        return getPercentUsage();
-    }
-
-    @Override
-    public VProjectRecord value1(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public VProjectRecord value2(String value) {
-        setName(value);
-        return this;
-    }
-
-    @Override
-    public VProjectRecord value3(BigDecimal value) {
-        setPercentUsage(value);
-        return this;
-    }
-
-    @Override
-    public VProjectRecord values(Integer value1, String value2, BigDecimal value3) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VTasklistRecord.java

@@ -6,17 +6,14 @@ package de.jottyfan.timetrack.db.done.tables.records;
 
 import de.jottyfan.timetrack.db.done.tables.VTasklist;
 
-import org.jooq.Field;
-import org.jooq.Record6;
-import org.jooq.Row6;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VTasklistRecord extends TableRecordImpl<VTasklistRecord> implements Record6<String, String, String, String, String, Integer> {
+public class VTasklistRecord extends TableRecordImpl<VTasklistRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -104,157 +101,6 @@ public class VTasklistRecord extends TableRecordImpl<VTasklistRecord> implements
         return (Integer) get(5);
     }
 
-    // -------------------------------------------------------------------------
-    // Record6 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row6<String, String, String, String, String, Integer> fieldsRow() {
-        return (Row6) super.fieldsRow();
-    }
-
-    @Override
-    public Row6<String, String, String, String, String, Integer> valuesRow() {
-        return (Row6) super.valuesRow();
-    }
-
-    @Override
-    public Field<String> field1() {
-        return VTasklist.V_TASKLIST.DAY;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VTasklist.V_TASKLIST.DURATION;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return VTasklist.V_TASKLIST.PROJECT_NAME;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return VTasklist.V_TASKLIST.MODULE_NAME;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return VTasklist.V_TASKLIST.JOB_NAME;
-    }
-
-    @Override
-    public Field<Integer> field6() {
-        return VTasklist.V_TASKLIST.FK_LOGIN;
-    }
-
-    @Override
-    public String component1() {
-        return getDay();
-    }
-
-    @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 Integer component6() {
-        return getFkLogin();
-    }
-
-    @Override
-    public String value1() {
-        return getDay();
-    }
-
-    @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 Integer value6() {
-        return getFkLogin();
-    }
-
-    @Override
-    public VTasklistRecord value1(String value) {
-        setDay(value);
-        return this;
-    }
-
-    @Override
-    public VTasklistRecord value2(String value) {
-        setDuration(value);
-        return this;
-    }
-
-    @Override
-    public VTasklistRecord value3(String value) {
-        setProjectName(value);
-        return this;
-    }
-
-    @Override
-    public VTasklistRecord value4(String value) {
-        setModuleName(value);
-        return this;
-    }
-
-    @Override
-    public VTasklistRecord value5(String value) {
-        setJobName(value);
-        return this;
-    }
-
-    @Override
-    public VTasklistRecord value6(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public VTasklistRecord values(String value1, String value2, String value3, String value4, String value5, Integer value6) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VTimelengthRecord.java

@@ -6,9 +6,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
 
 import de.jottyfan.timetrack.db.done.tables.VTimelength;
 
-import org.jooq.Field;
-import org.jooq.Record4;
-import org.jooq.Row4;
 import org.jooq.impl.TableRecordImpl;
 import org.jooq.types.YearToSecond;
 
@@ -16,8 +13,8 @@ import org.jooq.types.YearToSecond;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VTimelengthRecord extends TableRecordImpl<VTimelengthRecord> implements Record4<String, YearToSecond, Integer, Integer> {
+public class VTimelengthRecord extends TableRecordImpl<VTimelengthRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -77,113 +74,6 @@ public class VTimelengthRecord extends TableRecordImpl<VTimelengthRecord> implem
         return (Integer) get(3);
     }
 
-    // -------------------------------------------------------------------------
-    // Record4 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row4<String, YearToSecond, Integer, Integer> fieldsRow() {
-        return (Row4) super.fieldsRow();
-    }
-
-    @Override
-    public Row4<String, YearToSecond, Integer, Integer> valuesRow() {
-        return (Row4) super.valuesRow();
-    }
-
-    @Override
-    public Field<String> field1() {
-        return VTimelength.V_TIMELENGTH.DAY;
-    }
-
-    @Override
-    public Field<YearToSecond> field2() {
-        return VTimelength.V_TIMELENGTH.DURATION;
-    }
-
-    @Override
-    public Field<Integer> field3() {
-        return VTimelength.V_TIMELENGTH.FK_DONE;
-    }
-
-    @Override
-    public Field<Integer> field4() {
-        return VTimelength.V_TIMELENGTH.FK_LOGIN;
-    }
-
-    @Override
-    public String component1() {
-        return getDay();
-    }
-
-    @Override
-    public YearToSecond component2() {
-        return getDuration();
-    }
-
-    @Override
-    public Integer component3() {
-        return getFkDone();
-    }
-
-    @Override
-    public Integer component4() {
-        return getFkLogin();
-    }
-
-    @Override
-    public String value1() {
-        return getDay();
-    }
-
-    @Override
-    public YearToSecond value2() {
-        return getDuration();
-    }
-
-    @Override
-    public Integer value3() {
-        return getFkDone();
-    }
-
-    @Override
-    public Integer value4() {
-        return getFkLogin();
-    }
-
-    @Override
-    public VTimelengthRecord value1(String value) {
-        setDay(value);
-        return this;
-    }
-
-    @Override
-    public VTimelengthRecord value2(YearToSecond value) {
-        setDuration(value);
-        return this;
-    }
-
-    @Override
-    public VTimelengthRecord value3(Integer value) {
-        setFkDone(value);
-        return this;
-    }
-
-    @Override
-    public VTimelengthRecord value4(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public VTimelengthRecord values(String value1, YearToSecond value2, Integer value3, Integer value4) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VTotalofdayRecord.java

@@ -6,17 +6,14 @@ package de.jottyfan.timetrack.db.done.tables.records;
 
 import de.jottyfan.timetrack.db.done.tables.VTotalofday;
 
-import org.jooq.Field;
-import org.jooq.Record6;
-import org.jooq.Row6;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VTotalofdayRecord extends TableRecordImpl<VTotalofdayRecord> implements Record6<String, String, String, String, String, Integer> {
+public class VTotalofdayRecord extends TableRecordImpl<VTotalofdayRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -104,157 +101,6 @@ public class VTotalofdayRecord extends TableRecordImpl<VTotalofdayRecord> implem
         return (Integer) get(5);
     }
 
-    // -------------------------------------------------------------------------
-    // Record6 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row6<String, String, String, String, String, Integer> fieldsRow() {
-        return (Row6) super.fieldsRow();
-    }
-
-    @Override
-    public Row6<String, String, String, String, String, Integer> valuesRow() {
-        return (Row6) super.valuesRow();
-    }
-
-    @Override
-    public Field<String> field1() {
-        return VTotalofday.V_TOTALOFDAY.BREAKTIME;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VTotalofday.V_TOTALOFDAY.WORKTIME;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return VTotalofday.V_TOTALOFDAY.STARTTIME;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return VTotalofday.V_TOTALOFDAY.ENDTIME;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return VTotalofday.V_TOTALOFDAY.DAY;
-    }
-
-    @Override
-    public Field<Integer> field6() {
-        return VTotalofday.V_TOTALOFDAY.FK_LOGIN;
-    }
-
-    @Override
-    public String component1() {
-        return getBreaktime();
-    }
-
-    @Override
-    public String component2() {
-        return getWorktime();
-    }
-
-    @Override
-    public String component3() {
-        return getStarttime();
-    }
-
-    @Override
-    public String component4() {
-        return getEndtime();
-    }
-
-    @Override
-    public String component5() {
-        return getDay();
-    }
-
-    @Override
-    public Integer component6() {
-        return getFkLogin();
-    }
-
-    @Override
-    public String value1() {
-        return getBreaktime();
-    }
-
-    @Override
-    public String value2() {
-        return getWorktime();
-    }
-
-    @Override
-    public String value3() {
-        return getStarttime();
-    }
-
-    @Override
-    public String value4() {
-        return getEndtime();
-    }
-
-    @Override
-    public String value5() {
-        return getDay();
-    }
-
-    @Override
-    public Integer value6() {
-        return getFkLogin();
-    }
-
-    @Override
-    public VTotalofdayRecord value1(String value) {
-        setBreaktime(value);
-        return this;
-    }
-
-    @Override
-    public VTotalofdayRecord value2(String value) {
-        setWorktime(value);
-        return this;
-    }
-
-    @Override
-    public VTotalofdayRecord value3(String value) {
-        setStarttime(value);
-        return this;
-    }
-
-    @Override
-    public VTotalofdayRecord value4(String value) {
-        setEndtime(value);
-        return this;
-    }
-
-    @Override
-    public VTotalofdayRecord value5(String value) {
-        setDay(value);
-        return this;
-    }
-
-    @Override
-    public VTotalofdayRecord value6(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public VTotalofdayRecord values(String value1, String value2, String value3, String value4, String value5, Integer value6) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/done/tables/records/VWorktimeRecord.java

@@ -6,17 +6,14 @@ package de.jottyfan.timetrack.db.done.tables.records;
 
 import de.jottyfan.timetrack.db.done.tables.VWorktime;
 
-import org.jooq.Field;
-import org.jooq.Record9;
-import org.jooq.Row9;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VWorktimeRecord extends TableRecordImpl<VWorktimeRecord> implements Record9<String, String, Double, String, String, String, String, String, Integer> {
+public class VWorktimeRecord extends TableRecordImpl<VWorktimeRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -146,223 +143,6 @@ public class VWorktimeRecord extends TableRecordImpl<VWorktimeRecord> implements
         return (Integer) get(8);
     }
 
-    // -------------------------------------------------------------------------
-    // Record9 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row9<String, String, Double, String, String, String, String, String, Integer> fieldsRow() {
-        return (Row9) super.fieldsRow();
-    }
-
-    @Override
-    public Row9<String, String, Double, String, String, String, String, String, Integer> valuesRow() {
-        return (Row9) super.valuesRow();
-    }
-
-    @Override
-    public Field<String> field1() {
-        return VWorktime.V_WORKTIME.DAY;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VWorktime.V_WORKTIME.DURATION;
-    }
-
-    @Override
-    public Field<Double> field3() {
-        return VWorktime.V_WORKTIME.DURATION_HOURS;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return VWorktime.V_WORKTIME.PROJECT_NAME;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return VWorktime.V_WORKTIME.MODULE_NAME;
-    }
-
-    @Override
-    public Field<String> field6() {
-        return VWorktime.V_WORKTIME.JOB_NAME;
-    }
-
-    @Override
-    public Field<String> field7() {
-        return VWorktime.V_WORKTIME.BILLING_SHORTCUT;
-    }
-
-    @Override
-    public Field<String> field8() {
-        return VWorktime.V_WORKTIME.BILLING_CSSKEY;
-    }
-
-    @Override
-    public Field<Integer> field9() {
-        return VWorktime.V_WORKTIME.FK_LOGIN;
-    }
-
-    @Override
-    public String component1() {
-        return getDay();
-    }
-
-    @Override
-    public String component2() {
-        return getDuration();
-    }
-
-    @Override
-    public Double component3() {
-        return getDurationHours();
-    }
-
-    @Override
-    public String component4() {
-        return getProjectName();
-    }
-
-    @Override
-    public String component5() {
-        return getModuleName();
-    }
-
-    @Override
-    public String component6() {
-        return getJobName();
-    }
-
-    @Override
-    public String component7() {
-        return getBillingShortcut();
-    }
-
-    @Override
-    public String component8() {
-        return getBillingCsskey();
-    }
-
-    @Override
-    public Integer component9() {
-        return getFkLogin();
-    }
-
-    @Override
-    public String value1() {
-        return getDay();
-    }
-
-    @Override
-    public String value2() {
-        return getDuration();
-    }
-
-    @Override
-    public Double value3() {
-        return getDurationHours();
-    }
-
-    @Override
-    public String value4() {
-        return getProjectName();
-    }
-
-    @Override
-    public String value5() {
-        return getModuleName();
-    }
-
-    @Override
-    public String value6() {
-        return getJobName();
-    }
-
-    @Override
-    public String value7() {
-        return getBillingShortcut();
-    }
-
-    @Override
-    public String value8() {
-        return getBillingCsskey();
-    }
-
-    @Override
-    public Integer value9() {
-        return getFkLogin();
-    }
-
-    @Override
-    public VWorktimeRecord value1(String value) {
-        setDay(value);
-        return this;
-    }
-
-    @Override
-    public VWorktimeRecord value2(String value) {
-        setDuration(value);
-        return this;
-    }
-
-    @Override
-    public VWorktimeRecord value3(Double value) {
-        setDurationHours(value);
-        return this;
-    }
-
-    @Override
-    public VWorktimeRecord value4(String value) {
-        setProjectName(value);
-        return this;
-    }
-
-    @Override
-    public VWorktimeRecord value5(String value) {
-        setModuleName(value);
-        return this;
-    }
-
-    @Override
-    public VWorktimeRecord value6(String value) {
-        setJobName(value);
-        return this;
-    }
-
-    @Override
-    public VWorktimeRecord value7(String value) {
-        setBillingShortcut(value);
-        return this;
-    }
-
-    @Override
-    public VWorktimeRecord value8(String value) {
-        setBillingCsskey(value);
-        return this;
-    }
-
-    @Override
-    public VWorktimeRecord value9(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public VWorktimeRecord values(String value1, String value2, Double value3, String value4, String value5, String value6, String value7, String value8, Integer value9) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        value7(value7);
-        value8(value8);
-        value9(value9);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/note/Keys.java

@@ -17,7 +17,7 @@ import org.jooq.impl.Internal;
  * A class modelling foreign key relationships and constraints of tables in
  * note.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Keys {
 
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/note/Note.java

@@ -18,7 +18,7 @@ import org.jooq.impl.SchemaImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Note extends SchemaImpl {
 
     private static final long serialVersionUID = 1L;

src/main/java/de/jottyfan/timetrack/db/note/Tables.java

@@ -10,7 +10,7 @@ import de.jottyfan.timetrack.db.note.tables.TNote;
 /**
  * Convenience access to all tables in note.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Tables {
 
     /**

src/main/java/de/jottyfan/timetrack/db/note/enums/EnumCategory.java

@@ -14,7 +14,7 @@ import org.jooq.Schema;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public enum EnumCategory implements EnumType {
 
     PostgreSQL("PostgreSQL"),
@@ -60,7 +60,9 @@ public enum EnumCategory implements EnumType {
     }
 
     /**
-     * Lookup a value of this EnumType by its literal
+     * Lookup a value of this EnumType by its literal. Returns
+     * <code>null</code>, if no such value could be found, see {@link
+     * EnumType#lookupLiteral(Class, String)}.
      */
     public static EnumCategory lookupLiteral(String literal) {
         return EnumType.lookupLiteral(EnumCategory.class, literal);

src/main/java/de/jottyfan/timetrack/db/note/enums/EnumNotetype.java

@@ -14,7 +14,7 @@ import org.jooq.Schema;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public enum EnumNotetype implements EnumType {
 
     Administration("Administration"),
@@ -48,7 +48,9 @@ public enum EnumNotetype implements EnumType {
     }
 
     /**
-     * Lookup a value of this EnumType by its literal
+     * Lookup a value of this EnumType by its literal. Returns
+     * <code>null</code>, if no such value could be found, see {@link
+     * EnumType#lookupLiteral(Class, String)}.
      */
     public static EnumNotetype lookupLiteral(String literal) {
         return EnumType.lookupLiteral(EnumNotetype.class, literal);

src/main/java/de/jottyfan/timetrack/db/note/tables/TNote.java

@@ -11,18 +11,18 @@ import de.jottyfan.timetrack.db.note.enums.EnumNotetype;
 import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord;
 
 import java.time.LocalDateTime;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function6;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row6;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -35,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TNote extends TableImpl<TNoteRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -66,12 +66,12 @@ public class TNote extends TableImpl<TNoteRecord> {
     /**
      * The column <code>note.t_note.category</code>.
      */
-    public final TableField<TNoteRecord, EnumCategory> CATEGORY = createField(DSL.name("category"), SQLDataType.VARCHAR.asEnumDataType(de.jottyfan.timetrack.db.note.enums.EnumCategory.class), this, "");
+    public final TableField<TNoteRecord, EnumCategory> CATEGORY = createField(DSL.name("category"), SQLDataType.VARCHAR.asEnumDataType(EnumCategory.class), this, "");
 
     /**
      * The column <code>note.t_note.notetype</code>.
      */
-    public final TableField<TNoteRecord, EnumNotetype> NOTETYPE = createField(DSL.name("notetype"), SQLDataType.VARCHAR.asEnumDataType(de.jottyfan.timetrack.db.note.enums.EnumNotetype.class), this, "");
+    public final TableField<TNoteRecord, EnumNotetype> NOTETYPE = createField(DSL.name("notetype"), SQLDataType.VARCHAR.asEnumDataType(EnumNotetype.class), this, "");
 
     /**
      * The column <code>note.t_note.content</code>.
@@ -84,11 +84,11 @@ public class TNote extends TableImpl<TNoteRecord> {
     public final TableField<TNoteRecord, LocalDateTime> LASTCHANGE = createField(DSL.name("lastchange"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
 
     private TNote(Name alias, Table<TNoteRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TNote(Name alias, Table<TNoteRecord> aliased, Field<?>[] parameters) {
+    private TNote(Name alias, Table<TNoteRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -112,10 +112,6 @@ public class TNote extends TableImpl<TNoteRecord> {
         this(DSL.name("t_note"), null);
     }
 
-    public <O extends Record> TNote(Table<O> child, ForeignKey<O, TNoteRecord> key) {
-        super(child, key, T_NOTE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Note.NOTE;
@@ -170,27 +166,87 @@ public class TNote extends TableImpl<TNoteRecord> {
         return new TNote(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row6 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row6<Integer, String, EnumCategory, EnumNotetype, String, LocalDateTime> fieldsRow() {
+    public TNote where(Condition condition) {
-        return (Row6) super.fieldsRow();
+        return new TNote(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function6<? super Integer, ? super String, ? super EnumCategory, ? super EnumNotetype, ? super String, ? super LocalDateTime, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TNote where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function6<? super Integer, ? super String, ? super EnumCategory, ? super EnumNotetype, ? super String, ? super LocalDateTime, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TNote where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TNote where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TNote where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TNote where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TNote where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TNote where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TNote whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TNote whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/note/tables/records/TNoteRecord.java

@@ -10,18 +10,15 @@ import de.jottyfan.timetrack.db.note.tables.TNote;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record6;
-import org.jooq.Row6;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TNoteRecord extends UpdatableRecordImpl<TNoteRecord> implements Record6<Integer, String, EnumCategory, EnumNotetype, String, LocalDateTime> {
+public class TNoteRecord extends UpdatableRecordImpl<TNoteRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -118,157 +115,6 @@ public class TNoteRecord extends UpdatableRecordImpl<TNoteRecord> implements Rec
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record6 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row6<Integer, String, EnumCategory, EnumNotetype, String, LocalDateTime> fieldsRow() {
-        return (Row6) super.fieldsRow();
-    }
-
-    @Override
-    public Row6<Integer, String, EnumCategory, EnumNotetype, String, LocalDateTime> valuesRow() {
-        return (Row6) super.valuesRow();
-    }
-
-    @Override
-    public Field<Integer> field1() {
-        return TNote.T_NOTE.PK;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return TNote.T_NOTE.TITLE;
-    }
-
-    @Override
-    public Field<EnumCategory> field3() {
-        return TNote.T_NOTE.CATEGORY;
-    }
-
-    @Override
-    public Field<EnumNotetype> field4() {
-        return TNote.T_NOTE.NOTETYPE;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return TNote.T_NOTE.CONTENT;
-    }
-
-    @Override
-    public Field<LocalDateTime> field6() {
-        return TNote.T_NOTE.LASTCHANGE;
-    }
-
-    @Override
-    public Integer component1() {
-        return getPk();
-    }
-
-    @Override
-    public String component2() {
-        return getTitle();
-    }
-
-    @Override
-    public EnumCategory component3() {
-        return getCategory();
-    }
-
-    @Override
-    public EnumNotetype component4() {
-        return getNotetype();
-    }
-
-    @Override
-    public String component5() {
-        return getContent();
-    }
-
-    @Override
-    public LocalDateTime component6() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value1() {
-        return getPk();
-    }
-
-    @Override
-    public String value2() {
-        return getTitle();
-    }
-
-    @Override
-    public EnumCategory value3() {
-        return getCategory();
-    }
-
-    @Override
-    public EnumNotetype value4() {
-        return getNotetype();
-    }
-
-    @Override
-    public String value5() {
-        return getContent();
-    }
-
-    @Override
-    public LocalDateTime value6() {
-        return getLastchange();
-    }
-
-    @Override
-    public TNoteRecord value1(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TNoteRecord value2(String value) {
-        setTitle(value);
-        return this;
-    }
-
-    @Override
-    public TNoteRecord value3(EnumCategory value) {
-        setCategory(value);
-        return this;
-    }
-
-    @Override
-    public TNoteRecord value4(EnumNotetype value) {
-        setNotetype(value);
-        return this;
-    }
-
-    @Override
-    public TNoteRecord value5(String value) {
-        setContent(value);
-        return this;
-    }
-
-    @Override
-    public TNoteRecord value6(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TNoteRecord values(Integer value1, String value2, EnumCategory value3, EnumNotetype value4, String value5, LocalDateTime value6) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/profile/Keys.java

@@ -13,7 +13,6 @@ import de.jottyfan.timetrack.db.profile.tables.records.TLoginroleRecord;
 import de.jottyfan.timetrack.db.profile.tables.records.TProfileRecord;
 import de.jottyfan.timetrack.db.profile.tables.records.TRoleRecord;
 
-import org.jooq.ForeignKey;
 import org.jooq.TableField;
 import org.jooq.UniqueKey;
 import org.jooq.impl.DSL;
@@ -24,7 +23,7 @@ import org.jooq.impl.Internal;
  * A class modelling foreign key relationships and constraints of tables in
  * profile.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Keys {
 
     // -------------------------------------------------------------------------
@@ -39,11 +38,4 @@ public class Keys {
     public static final UniqueKey<TProfileRecord> T_PROFILE_USERNAME_KEY = Internal.createUniqueKey(TProfile.T_PROFILE, DSL.name("t_profile_username_key"), new TableField[] { TProfile.T_PROFILE.USERNAME }, true);
     public static final UniqueKey<TRoleRecord> T_ROLE_NAME_KEY = Internal.createUniqueKey(TRole.T_ROLE, DSL.name("t_role_name_key"), new TableField[] { TRole.T_ROLE.NAME }, true);
     public static final UniqueKey<TRoleRecord> T_ROLE_PKEY = Internal.createUniqueKey(TRole.T_ROLE, DSL.name("t_role_pkey"), new TableField[] { TRole.T_ROLE.PK }, true);
-
-    // -------------------------------------------------------------------------
-    // FOREIGN KEY definitions
-    // -------------------------------------------------------------------------
-
-    public static final ForeignKey<TLoginroleRecord, TLoginRecord> T_LOGINROLE__T_LOGINROLE_FK_LOGIN_FKEY = Internal.createForeignKey(TLoginrole.T_LOGINROLE, DSL.name("t_loginrole_fk_login_fkey"), new TableField[] { TLoginrole.T_LOGINROLE.FK_LOGIN }, Keys.T_LOGIN_PKEY, new TableField[] { TLogin.T_LOGIN.PK }, true);
-    public static final ForeignKey<TLoginroleRecord, TRoleRecord> T_LOGINROLE__T_LOGINROLE_FK_ROLE_FKEY = Internal.createForeignKey(TLoginrole.T_LOGINROLE, DSL.name("t_loginrole_fk_role_fkey"), new TableField[] { TLoginrole.T_LOGINROLE.FK_ROLE }, Keys.T_ROLE_PKEY, new TableField[] { TRole.T_ROLE.PK }, true);
 }

src/main/java/de/jottyfan/timetrack/db/profile/Profile.java

@@ -22,7 +22,7 @@ import org.jooq.impl.SchemaImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Profile extends SchemaImpl {
 
     private static final long serialVersionUID = 1L;

src/main/java/de/jottyfan/timetrack/db/profile/Tables.java

@@ -14,7 +14,7 @@ import de.jottyfan.timetrack.db.profile.tables.VLoginrole;
 /**
  * Convenience access to all tables in profile.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class Tables {
 
     /**

src/main/java/de/jottyfan/timetrack/db/profile/tables/TLogin.java

@@ -10,19 +10,19 @@ import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function7;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row7;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -35,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TLogin extends TableImpl<TLoginRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -89,11 +89,11 @@ public class TLogin extends TableImpl<TLoginRecord> {
     public final TableField<TLoginRecord, String> PASSWORD = createField(DSL.name("password"), SQLDataType.CLOB.nullable(false), this, "");
 
     private TLogin(Name alias, Table<TLoginRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TLogin(Name alias, Table<TLoginRecord> aliased, Field<?>[] parameters) {
+    private TLogin(Name alias, Table<TLoginRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -117,10 +117,6 @@ public class TLogin extends TableImpl<TLoginRecord> {
         this(DSL.name("t_login"), null);
     }
 
-    public <O extends Record> TLogin(Table<O> child, ForeignKey<O, TLoginRecord> key) {
-        super(child, key, T_LOGIN);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Profile.PROFILE;
@@ -180,27 +176,87 @@ public class TLogin extends TableImpl<TLoginRecord> {
         return new TLogin(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row7 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row7<LocalDateTime, Integer, String, String, String, LocalDateTime, String> fieldsRow() {
+    public TLogin where(Condition condition) {
-        return (Row7) super.fieldsRow();
+        return new TLogin(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function7<? super LocalDateTime, ? super Integer, ? super String, ? super String, ? super String, ? super LocalDateTime, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TLogin where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function7<? super LocalDateTime, ? super Integer, ? super String, ? super String, ? super String, ? super LocalDateTime, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TLogin where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TLogin where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TLogin where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TLogin where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TLogin where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TLogin where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TLogin whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TLogin whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/profile/tables/TLoginrole.java

@@ -10,19 +10,19 @@ import de.jottyfan.timetrack.db.profile.tables.records.TLoginroleRecord;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function4;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row4;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -35,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TLoginrole extends TableImpl<TLoginroleRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -74,11 +74,11 @@ public class TLoginrole extends TableImpl<TLoginroleRecord> {
     public final TableField<TLoginroleRecord, Integer> FK_ROLE = createField(DSL.name("fk_role"), SQLDataType.INTEGER.nullable(false), this, "");
 
     private TLoginrole(Name alias, Table<TLoginroleRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TLoginrole(Name alias, Table<TLoginroleRecord> aliased, Field<?>[] parameters) {
+    private TLoginrole(Name alias, Table<TLoginroleRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -102,10 +102,6 @@ public class TLoginrole extends TableImpl<TLoginroleRecord> {
         this(DSL.name("t_loginrole"), null);
     }
 
-    public <O extends Record> TLoginrole(Table<O> child, ForeignKey<O, TLoginroleRecord> key) {
-        super(child, key, T_LOGINROLE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Profile.PROFILE;
@@ -126,34 +122,6 @@ public class TLoginrole extends TableImpl<TLoginroleRecord> {
         return Arrays.asList(Keys.T_LOGINROLE_FK_LOGIN_FK_ROLE_KEY);
     }
 
-    @Override
-    public List<ForeignKey<TLoginroleRecord, ?>> getReferences() {
-        return Arrays.asList(Keys.T_LOGINROLE__T_LOGINROLE_FK_LOGIN_FKEY, Keys.T_LOGINROLE__T_LOGINROLE_FK_ROLE_FKEY);
-    }
-
-    private transient TLogin _tLogin;
-    private transient TRole _tRole;
-
-    /**
-     * Get the implicit join path to the <code>profile.t_login</code> table.
-     */
-    public TLogin tLogin() {
-        if (_tLogin == null)
-            _tLogin = new TLogin(this, Keys.T_LOGINROLE__T_LOGINROLE_FK_LOGIN_FKEY);
-
-        return _tLogin;
-    }
-
-    /**
-     * Get the implicit join path to the <code>profile.t_role</code> table.
-     */
-    public TRole tRole() {
-        if (_tRole == null)
-            _tRole = new TRole(this, Keys.T_LOGINROLE__T_LOGINROLE_FK_ROLE_FKEY);
-
-        return _tRole;
-    }
-
     @Override
     public TLoginrole as(String alias) {
         return new TLoginrole(DSL.name(alias), this);
@@ -193,27 +161,87 @@ public class TLoginrole extends TableImpl<TLoginroleRecord> {
         return new TLoginrole(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row4 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row4<LocalDateTime, Integer, Integer, Integer> fieldsRow() {
+    public TLoginrole where(Condition condition) {
-        return (Row4) super.fieldsRow();
+        return new TLoginrole(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function4<? super LocalDateTime, ? super Integer, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TLoginrole where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function4<? super LocalDateTime, ? super Integer, ? super Integer, ? super Integer, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TLoginrole where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TLoginrole where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TLoginrole where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TLoginrole where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TLoginrole where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TLoginrole where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TLoginrole whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TLoginrole whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/profile/tables/TProfile.java

@@ -10,19 +10,19 @@ import de.jottyfan.timetrack.db.profile.tables.records.TProfileRecord;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function5;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row5;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -35,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TProfile extends TableImpl<TProfileRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -79,11 +79,11 @@ public class TProfile extends TableImpl<TProfileRecord> {
     public final TableField<TProfileRecord, String> DYNAMIC_CSS = createField(DSL.name("dynamic_css"), SQLDataType.CLOB, this, "");
 
     private TProfile(Name alias, Table<TProfileRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TProfile(Name alias, Table<TProfileRecord> aliased, Field<?>[] parameters) {
+    private TProfile(Name alias, Table<TProfileRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -107,10 +107,6 @@ public class TProfile extends TableImpl<TProfileRecord> {
         this(DSL.name("t_profile"), null);
     }
 
-    public <O extends Record> TProfile(Table<O> child, ForeignKey<O, TProfileRecord> key) {
-        super(child, key, T_PROFILE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Profile.PROFILE;
@@ -170,27 +166,87 @@ public class TProfile extends TableImpl<TProfileRecord> {
         return new TProfile(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row5 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row5<LocalDateTime, Integer, String, String, String> fieldsRow() {
+    public TProfile where(Condition condition) {
-        return (Row5) super.fieldsRow();
+        return new TProfile(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function5<? super LocalDateTime, ? super Integer, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TProfile where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function5<? super LocalDateTime, ? super Integer, ? super String, ? super String, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TProfile where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProfile where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProfile where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProfile where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProfile where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProfile where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProfile whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProfile whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/profile/tables/TRole.java

@@ -10,19 +10,19 @@ import de.jottyfan.timetrack.db.profile.tables.records.TRoleRecord;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function3;
 import org.jooq.Identity;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row3;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -35,7 +35,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class TRole extends TableImpl<TRoleRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -69,11 +69,11 @@ public class TRole extends TableImpl<TRoleRecord> {
     public final TableField<TRoleRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
 
     private TRole(Name alias, Table<TRoleRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private TRole(Name alias, Table<TRoleRecord> aliased, Field<?>[] parameters) {
+    private TRole(Name alias, Table<TRoleRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
     }
 
     /**
@@ -97,10 +97,6 @@ public class TRole extends TableImpl<TRoleRecord> {
         this(DSL.name("t_role"), null);
     }
 
-    public <O extends Record> TRole(Table<O> child, ForeignKey<O, TRoleRecord> key) {
-        super(child, key, T_ROLE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Profile.PROFILE;
@@ -160,27 +156,87 @@ public class TRole extends TableImpl<TRoleRecord> {
         return new TRole(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row3 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row3<LocalDateTime, Integer, String> fieldsRow() {
+    public TRole where(Condition condition) {
-        return (Row3) super.fieldsRow();
+        return new TRole(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function3<? super LocalDateTime, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public TRole where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function3<? super LocalDateTime, ? super Integer, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public TRole where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TRole where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TRole where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TRole where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TRole where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TRole where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TRole whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TRole whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/profile/tables/VLoginrole.java

@@ -8,17 +8,17 @@ import de.jottyfan.timetrack.db.profile.Profile;
 import de.jottyfan.timetrack.db.profile.tables.records.VLoginroleRecord;
 
 import java.time.LocalDateTime;
-import java.util.function.Function;
+import java.util.Collection;
 
+import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.Function5;
 import org.jooq.Name;
-import org.jooq.Record;
+import org.jooq.PlainSQL;
-import org.jooq.Records;
+import org.jooq.QueryPart;
-import org.jooq.Row5;
+import org.jooq.SQL;
 import org.jooq.Schema;
-import org.jooq.SelectField;
+import org.jooq.Select;
+import org.jooq.Stringly;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions;
@@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
 public class VLoginrole extends TableImpl<VLoginroleRecord> {
 
     private static final long serialVersionUID = 1L;
@@ -74,11 +74,20 @@ public class VLoginrole extends TableImpl<VLoginroleRecord> {
     public final TableField<VLoginroleRecord, String> ROLE_NAME = createField(DSL.name("role_name"), SQLDataType.CLOB, this, "");
 
     private VLoginrole(Name alias, Table<VLoginroleRecord> aliased) {
-        this(alias, aliased, null);
+        this(alias, aliased, (Field<?>[]) null, null);
     }
 
-    private VLoginrole(Name alias, Table<VLoginroleRecord> aliased, Field<?>[] parameters) {
+    private VLoginrole(Name alias, Table<VLoginroleRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_loginrole" as  SELECT l.login,
+         l.forename,
+         l.surname,
+         l.duedate,
+         r.name AS role_name
+        FROM ((profile.t_loginrole
+          LEFT JOIN profile.t_login l ON ((l.pk = t_loginrole.fk_login)))
+          LEFT JOIN profile.t_role r ON ((r.pk = t_loginrole.fk_role)));
+        """), where);
     }
 
     /**
@@ -102,10 +111,6 @@ public class VLoginrole extends TableImpl<VLoginroleRecord> {
         this(DSL.name("v_loginrole"), null);
     }
 
-    public <O extends Record> VLoginrole(Table<O> child, ForeignKey<O, VLoginroleRecord> key) {
-        super(child, key, V_LOGINROLE);
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : Profile.PROFILE;
@@ -150,27 +155,87 @@ public class VLoginrole extends TableImpl<VLoginroleRecord> {
         return new VLoginrole(name.getQualifiedName(), null);
     }
 
-    // -------------------------------------------------------------------------
+    /**
-    // Row5 type methods
+     * Create an inline derived table from this table
-    // -------------------------------------------------------------------------
+     */
-
     @Override
-    public Row5<String, String, String, LocalDateTime, String> fieldsRow() {
+    public VLoginrole where(Condition condition) {
-        return (Row5) super.fieldsRow();
+        return new VLoginrole(getQualifiedName(), aliased() ? this : null, null, condition);
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Function)}.
+     * Create an inline derived table from this table
      */
-    public <U> SelectField<U> mapping(Function5<? super String, ? super String, ? super String, ? super LocalDateTime, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(Records.mapping(from));
+    public VLoginrole where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
     }
 
     /**
-     * Convenience mapping calling {@link SelectField#convertFrom(Class,
+     * Create an inline derived table from this table
-     * Function)}.
      */
-    public <U> SelectField<U> mapping(Class<U> toType, Function5<? super String, ? super String, ? super String, ? super LocalDateTime, ? super String, ? extends U> from) {
+    @Override
-        return convertFrom(toType, Records.mapping(from));
+    public VLoginrole where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VLoginrole where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VLoginrole where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VLoginrole where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VLoginrole where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VLoginrole where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VLoginrole whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VLoginrole whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
     }
 }

src/main/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.profile.tables.TLogin;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record7;
-import org.jooq.Row7;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TLoginRecord extends UpdatableRecordImpl<TLoginRecord> implements Record7<LocalDateTime, Integer, String, String, String, LocalDateTime, String> {
+public class TLoginRecord extends UpdatableRecordImpl<TLoginRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -130,179 +127,6 @@ public class TLoginRecord extends UpdatableRecordImpl<TLoginRecord> implements R
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record7 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row7<LocalDateTime, Integer, String, String, String, LocalDateTime, String> fieldsRow() {
-        return (Row7) super.fieldsRow();
-    }
-
-    @Override
-    public Row7<LocalDateTime, Integer, String, String, String, LocalDateTime, String> valuesRow() {
-        return (Row7) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TLogin.T_LOGIN.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TLogin.T_LOGIN.PK;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return TLogin.T_LOGIN.LOGIN;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return TLogin.T_LOGIN.FORENAME;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return TLogin.T_LOGIN.SURNAME;
-    }
-
-    @Override
-    public Field<LocalDateTime> field6() {
-        return TLogin.T_LOGIN.DUEDATE;
-    }
-
-    @Override
-    public Field<String> field7() {
-        return TLogin.T_LOGIN.PASSWORD;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPk();
-    }
-
-    @Override
-    public String component3() {
-        return getLogin();
-    }
-
-    @Override
-    public String component4() {
-        return getForename();
-    }
-
-    @Override
-    public String component5() {
-        return getSurname();
-    }
-
-    @Override
-    public LocalDateTime component6() {
-        return getDuedate();
-    }
-
-    @Override
-    public String component7() {
-        return getPassword();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPk();
-    }
-
-    @Override
-    public String value3() {
-        return getLogin();
-    }
-
-    @Override
-    public String value4() {
-        return getForename();
-    }
-
-    @Override
-    public String value5() {
-        return getSurname();
-    }
-
-    @Override
-    public LocalDateTime value6() {
-        return getDuedate();
-    }
-
-    @Override
-    public String value7() {
-        return getPassword();
-    }
-
-    @Override
-    public TLoginRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TLoginRecord value2(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TLoginRecord value3(String value) {
-        setLogin(value);
-        return this;
-    }
-
-    @Override
-    public TLoginRecord value4(String value) {
-        setForename(value);
-        return this;
-    }
-
-    @Override
-    public TLoginRecord value5(String value) {
-        setSurname(value);
-        return this;
-    }
-
-    @Override
-    public TLoginRecord value6(LocalDateTime value) {
-        setDuedate(value);
-        return this;
-    }
-
-    @Override
-    public TLoginRecord value7(String value) {
-        setPassword(value);
-        return this;
-    }
-
-    @Override
-    public TLoginRecord values(LocalDateTime value1, Integer value2, String value3, String value4, String value5, LocalDateTime value6, String value7) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        value6(value6);
-        value7(value7);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginroleRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.profile.tables.TLoginrole;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record4;
-import org.jooq.Row4;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TLoginroleRecord extends UpdatableRecordImpl<TLoginroleRecord> implements Record4<LocalDateTime, Integer, Integer, Integer> {
+public class TLoginroleRecord extends UpdatableRecordImpl<TLoginroleRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -88,113 +85,6 @@ public class TLoginroleRecord extends UpdatableRecordImpl<TLoginroleRecord> impl
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record4 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row4<LocalDateTime, Integer, Integer, Integer> fieldsRow() {
-        return (Row4) super.fieldsRow();
-    }
-
-    @Override
-    public Row4<LocalDateTime, Integer, Integer, Integer> valuesRow() {
-        return (Row4) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TLoginrole.T_LOGINROLE.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TLoginrole.T_LOGINROLE.PK;
-    }
-
-    @Override
-    public Field<Integer> field3() {
-        return TLoginrole.T_LOGINROLE.FK_LOGIN;
-    }
-
-    @Override
-    public Field<Integer> field4() {
-        return TLoginrole.T_LOGINROLE.FK_ROLE;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPk();
-    }
-
-    @Override
-    public Integer component3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer component4() {
-        return getFkRole();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPk();
-    }
-
-    @Override
-    public Integer value3() {
-        return getFkLogin();
-    }
-
-    @Override
-    public Integer value4() {
-        return getFkRole();
-    }
-
-    @Override
-    public TLoginroleRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TLoginroleRecord value2(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TLoginroleRecord value3(Integer value) {
-        setFkLogin(value);
-        return this;
-    }
-
-    @Override
-    public TLoginroleRecord value4(Integer value) {
-        setFkRole(value);
-        return this;
-    }
-
-    @Override
-    public TLoginroleRecord values(LocalDateTime value1, Integer value2, Integer value3, Integer value4) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/profile/tables/records/TProfileRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.profile.tables.TProfile;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record5;
-import org.jooq.Row5;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TProfileRecord extends UpdatableRecordImpl<TProfileRecord> implements Record5<LocalDateTime, Integer, String, String, String> {
+public class TProfileRecord extends UpdatableRecordImpl<TProfileRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -102,135 +99,6 @@ public class TProfileRecord extends UpdatableRecordImpl<TProfileRecord> implemen
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record5 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row5<LocalDateTime, Integer, String, String, String> fieldsRow() {
-        return (Row5) super.fieldsRow();
-    }
-
-    @Override
-    public Row5<LocalDateTime, Integer, String, String, String> valuesRow() {
-        return (Row5) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TProfile.T_PROFILE.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TProfile.T_PROFILE.PK_PROFILE;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return TProfile.T_PROFILE.USERNAME;
-    }
-
-    @Override
-    public Field<String> field4() {
-        return TProfile.T_PROFILE.THEME;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return TProfile.T_PROFILE.DYNAMIC_CSS;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPkProfile();
-    }
-
-    @Override
-    public String component3() {
-        return getUsername();
-    }
-
-    @Override
-    public String component4() {
-        return getTheme();
-    }
-
-    @Override
-    public String component5() {
-        return getDynamicCss();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPkProfile();
-    }
-
-    @Override
-    public String value3() {
-        return getUsername();
-    }
-
-    @Override
-    public String value4() {
-        return getTheme();
-    }
-
-    @Override
-    public String value5() {
-        return getDynamicCss();
-    }
-
-    @Override
-    public TProfileRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TProfileRecord value2(Integer value) {
-        setPkProfile(value);
-        return this;
-    }
-
-    @Override
-    public TProfileRecord value3(String value) {
-        setUsername(value);
-        return this;
-    }
-
-    @Override
-    public TProfileRecord value4(String value) {
-        setTheme(value);
-        return this;
-    }
-
-    @Override
-    public TProfileRecord value5(String value) {
-        setDynamicCss(value);
-        return this;
-    }
-
-    @Override
-    public TProfileRecord values(LocalDateTime value1, Integer value2, String value3, String value4, String value5) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/profile/tables/records/TRoleRecord.java

@@ -8,18 +8,15 @@ import de.jottyfan.timetrack.db.profile.tables.TRole;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
 import org.jooq.Record1;
-import org.jooq.Record3;
-import org.jooq.Row3;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class TRoleRecord extends UpdatableRecordImpl<TRoleRecord> implements Record3<LocalDateTime, Integer, String> {
+public class TRoleRecord extends UpdatableRecordImpl<TRoleRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -74,91 +71,6 @@ public class TRoleRecord extends UpdatableRecordImpl<TRoleRecord> implements Rec
         return (Record1) super.key();
     }
 
-    // -------------------------------------------------------------------------
-    // Record3 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row3<LocalDateTime, Integer, String> fieldsRow() {
-        return (Row3) super.fieldsRow();
-    }
-
-    @Override
-    public Row3<LocalDateTime, Integer, String> valuesRow() {
-        return (Row3) super.valuesRow();
-    }
-
-    @Override
-    public Field<LocalDateTime> field1() {
-        return TRole.T_ROLE.LASTCHANGE;
-    }
-
-    @Override
-    public Field<Integer> field2() {
-        return TRole.T_ROLE.PK;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return TRole.T_ROLE.NAME;
-    }
-
-    @Override
-    public LocalDateTime component1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer component2() {
-        return getPk();
-    }
-
-    @Override
-    public String component3() {
-        return getName();
-    }
-
-    @Override
-    public LocalDateTime value1() {
-        return getLastchange();
-    }
-
-    @Override
-    public Integer value2() {
-        return getPk();
-    }
-
-    @Override
-    public String value3() {
-        return getName();
-    }
-
-    @Override
-    public TRoleRecord value1(LocalDateTime value) {
-        setLastchange(value);
-        return this;
-    }
-
-    @Override
-    public TRoleRecord value2(Integer value) {
-        setPk(value);
-        return this;
-    }
-
-    @Override
-    public TRoleRecord value3(String value) {
-        setName(value);
-        return this;
-    }
-
-    @Override
-    public TRoleRecord values(LocalDateTime value1, Integer value2, String value3) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/profile/tables/records/VLoginroleRecord.java

@@ -8,17 +8,14 @@ import de.jottyfan.timetrack.db.profile.tables.VLoginrole;
 
 import java.time.LocalDateTime;
 
-import org.jooq.Field;
-import org.jooq.Record5;
-import org.jooq.Row5;
 import org.jooq.impl.TableRecordImpl;
 
 
 /**
  * This class is generated by jOOQ.
  */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
-public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implements Record5<String, String, String, LocalDateTime, String> {
+public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> {
 
     private static final long serialVersionUID = 1L;
 
@@ -92,135 +89,6 @@ public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implemen
         return (String) get(4);
     }
 
-    // -------------------------------------------------------------------------
-    // Record5 type implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Row5<String, String, String, LocalDateTime, String> fieldsRow() {
-        return (Row5) super.fieldsRow();
-    }
-
-    @Override
-    public Row5<String, String, String, LocalDateTime, String> valuesRow() {
-        return (Row5) super.valuesRow();
-    }
-
-    @Override
-    public Field<String> field1() {
-        return VLoginrole.V_LOGINROLE.LOGIN;
-    }
-
-    @Override
-    public Field<String> field2() {
-        return VLoginrole.V_LOGINROLE.FORENAME;
-    }
-
-    @Override
-    public Field<String> field3() {
-        return VLoginrole.V_LOGINROLE.SURNAME;
-    }
-
-    @Override
-    public Field<LocalDateTime> field4() {
-        return VLoginrole.V_LOGINROLE.DUEDATE;
-    }
-
-    @Override
-    public Field<String> field5() {
-        return VLoginrole.V_LOGINROLE.ROLE_NAME;
-    }
-
-    @Override
-    public String component1() {
-        return getLogin();
-    }
-
-    @Override
-    public String component2() {
-        return getForename();
-    }
-
-    @Override
-    public String component3() {
-        return getSurname();
-    }
-
-    @Override
-    public LocalDateTime component4() {
-        return getDuedate();
-    }
-
-    @Override
-    public String component5() {
-        return getRoleName();
-    }
-
-    @Override
-    public String value1() {
-        return getLogin();
-    }
-
-    @Override
-    public String value2() {
-        return getForename();
-    }
-
-    @Override
-    public String value3() {
-        return getSurname();
-    }
-
-    @Override
-    public LocalDateTime value4() {
-        return getDuedate();
-    }
-
-    @Override
-    public String value5() {
-        return getRoleName();
-    }
-
-    @Override
-    public VLoginroleRecord value1(String value) {
-        setLogin(value);
-        return this;
-    }
-
-    @Override
-    public VLoginroleRecord value2(String value) {
-        setForename(value);
-        return this;
-    }
-
-    @Override
-    public VLoginroleRecord value3(String value) {
-        setSurname(value);
-        return this;
-    }
-
-    @Override
-    public VLoginroleRecord value4(LocalDateTime value) {
-        setDuedate(value);
-        return this;
-    }
-
-    @Override
-    public VLoginroleRecord value5(String value) {
-        setRoleName(value);
-        return this;
-    }
-
-    @Override
-    public VLoginroleRecord values(String value1, String value2, String value3, LocalDateTime value4, String value5) {
-        value1(value1);
-        value2(value2);
-        value3(value3);
-        value4(value4);
-        value5(value5);
-        return this;
-    }
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

src/main/java/de/jottyfan/timetrack/db/project/Keys.java

@@ -0,0 +1,49 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project;
+
+
+import de.jottyfan.timetrack.db.project.tables.TApp;
+import de.jottyfan.timetrack.db.project.tables.TBundle;
+import de.jottyfan.timetrack.db.project.tables.TFunder;
+import de.jottyfan.timetrack.db.project.tables.TProgress;
+import de.jottyfan.timetrack.db.project.tables.TProject;
+import de.jottyfan.timetrack.db.project.tables.TWorkpackage;
+import de.jottyfan.timetrack.db.project.tables.TWorkpackageApp;
+import de.jottyfan.timetrack.db.project.tables.records.TAppRecord;
+import de.jottyfan.timetrack.db.project.tables.records.TBundleRecord;
+import de.jottyfan.timetrack.db.project.tables.records.TFunderRecord;
+import de.jottyfan.timetrack.db.project.tables.records.TProgressRecord;
+import de.jottyfan.timetrack.db.project.tables.records.TProjectRecord;
+import de.jottyfan.timetrack.db.project.tables.records.TWorkpackageAppRecord;
+import de.jottyfan.timetrack.db.project.tables.records.TWorkpackageRecord;
+
+import org.jooq.TableField;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.Internal;
+
+
+/**
+ * A class modelling foreign key relationships and constraints of tables in
+ * project.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class Keys {
+
+    // -------------------------------------------------------------------------
+    // UNIQUE and PRIMARY KEY definitions
+    // -------------------------------------------------------------------------
+
+    public static final UniqueKey<TAppRecord> T_APP_PKEY = Internal.createUniqueKey(TApp.T_APP, DSL.name("t_app_pkey"), new TableField[] { TApp.T_APP.PK_APP }, true);
+    public static final UniqueKey<TBundleRecord> T_BUNDLE_NAME_KEY = Internal.createUniqueKey(TBundle.T_BUNDLE, DSL.name("t_bundle_name_key"), new TableField[] { TBundle.T_BUNDLE.NAME }, true);
+    public static final UniqueKey<TBundleRecord> T_BUNDLE_PKEY = Internal.createUniqueKey(TBundle.T_BUNDLE, DSL.name("t_bundle_pkey"), new TableField[] { TBundle.T_BUNDLE.PK_BUNDLE }, true);
+    public static final UniqueKey<TFunderRecord> T_FUNDER_NAME_KEY = Internal.createUniqueKey(TFunder.T_FUNDER, DSL.name("t_funder_name_key"), new TableField[] { TFunder.T_FUNDER.NAME }, true);
+    public static final UniqueKey<TFunderRecord> T_FUNDER_PKEY = Internal.createUniqueKey(TFunder.T_FUNDER, DSL.name("t_funder_pkey"), new TableField[] { TFunder.T_FUNDER.PK_FUNDER }, true);
+    public static final UniqueKey<TProgressRecord> T_PROGRESS_PKEY = Internal.createUniqueKey(TProgress.T_PROGRESS, DSL.name("t_progress_pkey"), new TableField[] { TProgress.T_PROGRESS.PK_PROGRESS }, true);
+    public static final UniqueKey<TProjectRecord> T_PROJECT_PKEY = Internal.createUniqueKey(TProject.T_PROJECT, DSL.name("t_project_pkey"), new TableField[] { TProject.T_PROJECT.PK_PROJECT }, true);
+    public static final UniqueKey<TWorkpackageRecord> T_WORKPACKAGE_PKEY = Internal.createUniqueKey(TWorkpackage.T_WORKPACKAGE, DSL.name("t_workpackage_pkey"), new TableField[] { TWorkpackage.T_WORKPACKAGE.PK_WORKPACKAGE }, true);
+    public static final UniqueKey<TWorkpackageAppRecord> T_WORKPACKAGE_APP_FK_WORKPACKAGE_FK_APP_KEY = Internal.createUniqueKey(TWorkpackageApp.T_WORKPACKAGE_APP, DSL.name("t_workpackage_app_fk_workpackage_fk_app_key"), new TableField[] { TWorkpackageApp.T_WORKPACKAGE_APP.FK_WORKPACKAGE, TWorkpackageApp.T_WORKPACKAGE_APP.FK_APP }, true);
+    public static final UniqueKey<TWorkpackageAppRecord> T_WORKPACKAGE_APP_PKEY = Internal.createUniqueKey(TWorkpackageApp.T_WORKPACKAGE_APP, DSL.name("t_workpackage_app_pkey"), new TableField[] { TWorkpackageApp.T_WORKPACKAGE_APP.PK_WORKPACKAGE_APP }, true);
+}

src/main/java/de/jottyfan/timetrack/db/project/Project.java

@@ -0,0 +1,125 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project;
+
+
+import de.jottyfan.timetrack.db.DefaultCatalog;
+import de.jottyfan.timetrack.db.project.tables.TApp;
+import de.jottyfan.timetrack.db.project.tables.TBundle;
+import de.jottyfan.timetrack.db.project.tables.TFunder;
+import de.jottyfan.timetrack.db.project.tables.TProgress;
+import de.jottyfan.timetrack.db.project.tables.TProject;
+import de.jottyfan.timetrack.db.project.tables.TWorkpackage;
+import de.jottyfan.timetrack.db.project.tables.TWorkpackageApp;
+import de.jottyfan.timetrack.db.project.tables.VBundleApps;
+import de.jottyfan.timetrack.db.project.tables.VExcelApp;
+import de.jottyfan.timetrack.db.project.tables.VExcelWorkpackage;
+import de.jottyfan.timetrack.db.project.tables.VExcelWorkpackageApp;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jooq.Catalog;
+import org.jooq.Table;
+import org.jooq.impl.SchemaImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class Project extends SchemaImpl {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>project</code>
+     */
+    public static final Project PROJECT = new Project();
+
+    /**
+     * The table <code>project.t_app</code>.
+     */
+    public final TApp T_APP = TApp.T_APP;
+
+    /**
+     * The table <code>project.t_bundle</code>.
+     */
+    public final TBundle T_BUNDLE = TBundle.T_BUNDLE;
+
+    /**
+     * The table <code>project.t_funder</code>.
+     */
+    public final TFunder T_FUNDER = TFunder.T_FUNDER;
+
+    /**
+     * The table <code>project.t_progress</code>.
+     */
+    public final TProgress T_PROGRESS = TProgress.T_PROGRESS;
+
+    /**
+     * The table <code>project.t_project</code>.
+     */
+    public final TProject T_PROJECT = TProject.T_PROJECT;
+
+    /**
+     * The table <code>project.t_workpackage</code>.
+     */
+    public final TWorkpackage T_WORKPACKAGE = TWorkpackage.T_WORKPACKAGE;
+
+    /**
+     * The table <code>project.t_workpackage_app</code>.
+     */
+    public final TWorkpackageApp T_WORKPACKAGE_APP = TWorkpackageApp.T_WORKPACKAGE_APP;
+
+    /**
+     * The table <code>project.v_bundle_apps</code>.
+     */
+    public final VBundleApps V_BUNDLE_APPS = VBundleApps.V_BUNDLE_APPS;
+
+    /**
+     * The table <code>project.v_excel_app</code>.
+     */
+    public final VExcelApp V_EXCEL_APP = VExcelApp.V_EXCEL_APP;
+
+    /**
+     * The table <code>project.v_excel_workpackage</code>.
+     */
+    public final VExcelWorkpackage V_EXCEL_WORKPACKAGE = VExcelWorkpackage.V_EXCEL_WORKPACKAGE;
+
+    /**
+     * The table <code>project.v_excel_workpackage_app</code>.
+     */
+    public final VExcelWorkpackageApp V_EXCEL_WORKPACKAGE_APP = VExcelWorkpackageApp.V_EXCEL_WORKPACKAGE_APP;
+
+    /**
+     * No further instances allowed
+     */
+    private Project() {
+        super("project", null);
+    }
+
+
+    @Override
+    public Catalog getCatalog() {
+        return DefaultCatalog.DEFAULT_CATALOG;
+    }
+
+    @Override
+    public final List<Table<?>> getTables() {
+        return Arrays.asList(
+            TApp.T_APP,
+            TBundle.T_BUNDLE,
+            TFunder.T_FUNDER,
+            TProgress.T_PROGRESS,
+            TProject.T_PROJECT,
+            TWorkpackage.T_WORKPACKAGE,
+            TWorkpackageApp.T_WORKPACKAGE_APP,
+            VBundleApps.V_BUNDLE_APPS,
+            VExcelApp.V_EXCEL_APP,
+            VExcelWorkpackage.V_EXCEL_WORKPACKAGE,
+            VExcelWorkpackageApp.V_EXCEL_WORKPACKAGE_APP
+        );
+    }
+}

src/main/java/de/jottyfan/timetrack/db/project/Tables.java

@@ -0,0 +1,80 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project;
+
+
+import de.jottyfan.timetrack.db.project.tables.TApp;
+import de.jottyfan.timetrack.db.project.tables.TBundle;
+import de.jottyfan.timetrack.db.project.tables.TFunder;
+import de.jottyfan.timetrack.db.project.tables.TProgress;
+import de.jottyfan.timetrack.db.project.tables.TProject;
+import de.jottyfan.timetrack.db.project.tables.TWorkpackage;
+import de.jottyfan.timetrack.db.project.tables.TWorkpackageApp;
+import de.jottyfan.timetrack.db.project.tables.VBundleApps;
+import de.jottyfan.timetrack.db.project.tables.VExcelApp;
+import de.jottyfan.timetrack.db.project.tables.VExcelWorkpackage;
+import de.jottyfan.timetrack.db.project.tables.VExcelWorkpackageApp;
+
+
+/**
+ * Convenience access to all tables in project.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class Tables {
+
+    /**
+     * The table <code>project.t_app</code>.
+     */
+    public static final TApp T_APP = TApp.T_APP;
+
+    /**
+     * The table <code>project.t_bundle</code>.
+     */
+    public static final TBundle T_BUNDLE = TBundle.T_BUNDLE;
+
+    /**
+     * The table <code>project.t_funder</code>.
+     */
+    public static final TFunder T_FUNDER = TFunder.T_FUNDER;
+
+    /**
+     * The table <code>project.t_progress</code>.
+     */
+    public static final TProgress T_PROGRESS = TProgress.T_PROGRESS;
+
+    /**
+     * The table <code>project.t_project</code>.
+     */
+    public static final TProject T_PROJECT = TProject.T_PROJECT;
+
+    /**
+     * The table <code>project.t_workpackage</code>.
+     */
+    public static final TWorkpackage T_WORKPACKAGE = TWorkpackage.T_WORKPACKAGE;
+
+    /**
+     * The table <code>project.t_workpackage_app</code>.
+     */
+    public static final TWorkpackageApp T_WORKPACKAGE_APP = TWorkpackageApp.T_WORKPACKAGE_APP;
+
+    /**
+     * The table <code>project.v_bundle_apps</code>.
+     */
+    public static final VBundleApps V_BUNDLE_APPS = VBundleApps.V_BUNDLE_APPS;
+
+    /**
+     * The table <code>project.v_excel_app</code>.
+     */
+    public static final VExcelApp V_EXCEL_APP = VExcelApp.V_EXCEL_APP;
+
+    /**
+     * The table <code>project.v_excel_workpackage</code>.
+     */
+    public static final VExcelWorkpackage V_EXCEL_WORKPACKAGE = VExcelWorkpackage.V_EXCEL_WORKPACKAGE;
+
+    /**
+     * The table <code>project.v_excel_workpackage_app</code>.
+     */
+    public static final VExcelWorkpackageApp V_EXCEL_WORKPACKAGE_APP = VExcelWorkpackageApp.V_EXCEL_WORKPACKAGE_APP;
+}

src/main/java/de/jottyfan/timetrack/db/project/enums/EnumPhase.java

@@ -0,0 +1,62 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project.enums;
+
+
+import de.jottyfan.timetrack.db.project.Project;
+
+import org.jooq.Catalog;
+import org.jooq.EnumType;
+import org.jooq.Schema;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public enum EnumPhase implements EnumType {
+
+    concept("concept"),
+
+    development("development"),
+
+    test("test"),
+
+    postponed("postponed");
+
+    private final String literal;
+
+    private EnumPhase(String literal) {
+        this.literal = literal;
+    }
+
+    @Override
+    public Catalog getCatalog() {
+        return getSchema().getCatalog();
+    }
+
+    @Override
+    public Schema getSchema() {
+        return Project.PROJECT;
+    }
+
+    @Override
+    public String getName() {
+        return "enum_phase";
+    }
+
+    @Override
+    public String getLiteral() {
+        return literal;
+    }
+
+    /**
+     * Lookup a value of this EnumType by its literal. Returns
+     * <code>null</code>, if no such value could be found, see {@link
+     * EnumType#lookupLiteral(Class, String)}.
+     */
+    public static EnumPhase lookupLiteral(String literal) {
+        return EnumType.lookupLiteral(EnumPhase.class, literal);
+    }
+}

src/main/java/de/jottyfan/timetrack/db/project/tables/TApp.java

@@ -0,0 +1,260 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project.tables;
+
+
+import de.jottyfan.timetrack.db.project.Keys;
+import de.jottyfan.timetrack.db.project.Project;
+import de.jottyfan.timetrack.db.project.tables.records.TAppRecord;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Identity;
+import org.jooq.Name;
+import org.jooq.PlainSQL;
+import org.jooq.QueryPart;
+import org.jooq.SQL;
+import org.jooq.Schema;
+import org.jooq.Select;
+import org.jooq.Stringly;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.SQLDataType;
+import org.jooq.impl.TableImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class TApp extends TableImpl<TAppRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>project.t_app</code>
+     */
+    public static final TApp T_APP = new TApp();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<TAppRecord> getRecordType() {
+        return TAppRecord.class;
+    }
+
+    /**
+     * The column <code>project.t_app.created</code>.
+     */
+    public final TableField<TAppRecord, LocalDateTime> CREATED = createField(DSL.name("created"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
+
+    /**
+     * The column <code>project.t_app.pk_app</code>.
+     */
+    public final TableField<TAppRecord, Integer> PK_APP = createField(DSL.name("pk_app"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
+
+    /**
+     * The column <code>project.t_app.fk_bundle</code>.
+     */
+    public final TableField<TAppRecord, Integer> FK_BUNDLE = createField(DSL.name("fk_bundle"), SQLDataType.INTEGER, this, "");
+
+    /**
+     * The column <code>project.t_app.basic_functionality</code>.
+     */
+    public final TableField<TAppRecord, String> BASIC_FUNCTIONALITY = createField(DSL.name("basic_functionality"), SQLDataType.CLOB, this, "");
+
+    /**
+     * The column <code>project.t_app.name</code>.
+     */
+    public final TableField<TAppRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB, this, "");
+
+    /**
+     * The column <code>project.t_app.description</code>.
+     */
+    public final TableField<TAppRecord, String> DESCRIPTION = createField(DSL.name("description"), SQLDataType.CLOB, this, "");
+
+    /**
+     * The column <code>project.t_app.fk_replaced_by_app</code>.
+     */
+    public final TableField<TAppRecord, Integer> FK_REPLACED_BY_APP = createField(DSL.name("fk_replaced_by_app"), SQLDataType.INTEGER, this, "");
+
+    /**
+     * The column <code>project.t_app.repository_url</code>.
+     */
+    public final TableField<TAppRecord, String> REPOSITORY_URL = createField(DSL.name("repository_url"), SQLDataType.CLOB, this, "");
+
+    private TApp(Name alias, Table<TAppRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private TApp(Name alias, Table<TAppRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>project.t_app</code> table reference
+     */
+    public TApp(String alias) {
+        this(DSL.name(alias), T_APP);
+    }
+
+    /**
+     * Create an aliased <code>project.t_app</code> table reference
+     */
+    public TApp(Name alias) {
+        this(alias, T_APP);
+    }
+
+    /**
+     * Create a <code>project.t_app</code> table reference
+     */
+    public TApp() {
+        this(DSL.name("t_app"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : Project.PROJECT;
+    }
+
+    @Override
+    public Identity<TAppRecord, Integer> getIdentity() {
+        return (Identity<TAppRecord, Integer>) super.getIdentity();
+    }
+
+    @Override
+    public UniqueKey<TAppRecord> getPrimaryKey() {
+        return Keys.T_APP_PKEY;
+    }
+
+    @Override
+    public TApp as(String alias) {
+        return new TApp(DSL.name(alias), this);
+    }
+
+    @Override
+    public TApp as(Name alias) {
+        return new TApp(alias, this);
+    }
+
+    @Override
+    public TApp as(Table<?> alias) {
+        return new TApp(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TApp rename(String name) {
+        return new TApp(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TApp rename(Name name) {
+        return new TApp(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TApp rename(Table<?> name) {
+        return new TApp(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TApp where(Condition condition) {
+        return new TApp(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TApp where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TApp where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TApp where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TApp where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TApp where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TApp where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TApp where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TApp whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TApp whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

src/main/java/de/jottyfan/timetrack/db/project/tables/TBundle.java

@@ -0,0 +1,247 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project.tables;
+
+
+import de.jottyfan.timetrack.db.project.Keys;
+import de.jottyfan.timetrack.db.project.Project;
+import de.jottyfan.timetrack.db.project.tables.records.TBundleRecord;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Identity;
+import org.jooq.Name;
+import org.jooq.PlainSQL;
+import org.jooq.QueryPart;
+import org.jooq.SQL;
+import org.jooq.Schema;
+import org.jooq.Select;
+import org.jooq.Stringly;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.SQLDataType;
+import org.jooq.impl.TableImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class TBundle extends TableImpl<TBundleRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>project.t_bundle</code>
+     */
+    public static final TBundle T_BUNDLE = new TBundle();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<TBundleRecord> getRecordType() {
+        return TBundleRecord.class;
+    }
+
+    /**
+     * The column <code>project.t_bundle.created</code>.
+     */
+    public final TableField<TBundleRecord, LocalDateTime> CREATED = createField(DSL.name("created"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
+
+    /**
+     * The column <code>project.t_bundle.pk_bundle</code>.
+     */
+    public final TableField<TBundleRecord, Integer> PK_BUNDLE = createField(DSL.name("pk_bundle"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
+
+    /**
+     * The column <code>project.t_bundle.name</code>.
+     */
+    public final TableField<TBundleRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
+
+    /**
+     * The column <code>project.t_bundle.description</code>.
+     */
+    public final TableField<TBundleRecord, String> DESCRIPTION = createField(DSL.name("description"), SQLDataType.CLOB, this, "");
+
+    private TBundle(Name alias, Table<TBundleRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private TBundle(Name alias, Table<TBundleRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>project.t_bundle</code> table reference
+     */
+    public TBundle(String alias) {
+        this(DSL.name(alias), T_BUNDLE);
+    }
+
+    /**
+     * Create an aliased <code>project.t_bundle</code> table reference
+     */
+    public TBundle(Name alias) {
+        this(alias, T_BUNDLE);
+    }
+
+    /**
+     * Create a <code>project.t_bundle</code> table reference
+     */
+    public TBundle() {
+        this(DSL.name("t_bundle"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : Project.PROJECT;
+    }
+
+    @Override
+    public Identity<TBundleRecord, Integer> getIdentity() {
+        return (Identity<TBundleRecord, Integer>) super.getIdentity();
+    }
+
+    @Override
+    public UniqueKey<TBundleRecord> getPrimaryKey() {
+        return Keys.T_BUNDLE_PKEY;
+    }
+
+    @Override
+    public List<UniqueKey<TBundleRecord>> getUniqueKeys() {
+        return Arrays.asList(Keys.T_BUNDLE_NAME_KEY);
+    }
+
+    @Override
+    public TBundle as(String alias) {
+        return new TBundle(DSL.name(alias), this);
+    }
+
+    @Override
+    public TBundle as(Name alias) {
+        return new TBundle(alias, this);
+    }
+
+    @Override
+    public TBundle as(Table<?> alias) {
+        return new TBundle(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TBundle rename(String name) {
+        return new TBundle(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TBundle rename(Name name) {
+        return new TBundle(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TBundle rename(Table<?> name) {
+        return new TBundle(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TBundle where(Condition condition) {
+        return new TBundle(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TBundle where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TBundle where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TBundle where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TBundle where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TBundle where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TBundle where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TBundle where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TBundle whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TBundle whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

src/main/java/de/jottyfan/timetrack/db/project/tables/TFunder.java

@@ -0,0 +1,247 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project.tables;
+
+
+import de.jottyfan.timetrack.db.project.Keys;
+import de.jottyfan.timetrack.db.project.Project;
+import de.jottyfan.timetrack.db.project.tables.records.TFunderRecord;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Identity;
+import org.jooq.Name;
+import org.jooq.PlainSQL;
+import org.jooq.QueryPart;
+import org.jooq.SQL;
+import org.jooq.Schema;
+import org.jooq.Select;
+import org.jooq.Stringly;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.SQLDataType;
+import org.jooq.impl.TableImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class TFunder extends TableImpl<TFunderRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>project.t_funder</code>
+     */
+    public static final TFunder T_FUNDER = new TFunder();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<TFunderRecord> getRecordType() {
+        return TFunderRecord.class;
+    }
+
+    /**
+     * The column <code>project.t_funder.created</code>.
+     */
+    public final TableField<TFunderRecord, LocalDateTime> CREATED = createField(DSL.name("created"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
+
+    /**
+     * The column <code>project.t_funder.pk_funder</code>.
+     */
+    public final TableField<TFunderRecord, Integer> PK_FUNDER = createField(DSL.name("pk_funder"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
+
+    /**
+     * The column <code>project.t_funder.name</code>.
+     */
+    public final TableField<TFunderRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
+
+    /**
+     * The column <code>project.t_funder.description</code>.
+     */
+    public final TableField<TFunderRecord, String> DESCRIPTION = createField(DSL.name("description"), SQLDataType.CLOB, this, "");
+
+    private TFunder(Name alias, Table<TFunderRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private TFunder(Name alias, Table<TFunderRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>project.t_funder</code> table reference
+     */
+    public TFunder(String alias) {
+        this(DSL.name(alias), T_FUNDER);
+    }
+
+    /**
+     * Create an aliased <code>project.t_funder</code> table reference
+     */
+    public TFunder(Name alias) {
+        this(alias, T_FUNDER);
+    }
+
+    /**
+     * Create a <code>project.t_funder</code> table reference
+     */
+    public TFunder() {
+        this(DSL.name("t_funder"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : Project.PROJECT;
+    }
+
+    @Override
+    public Identity<TFunderRecord, Integer> getIdentity() {
+        return (Identity<TFunderRecord, Integer>) super.getIdentity();
+    }
+
+    @Override
+    public UniqueKey<TFunderRecord> getPrimaryKey() {
+        return Keys.T_FUNDER_PKEY;
+    }
+
+    @Override
+    public List<UniqueKey<TFunderRecord>> getUniqueKeys() {
+        return Arrays.asList(Keys.T_FUNDER_NAME_KEY);
+    }
+
+    @Override
+    public TFunder as(String alias) {
+        return new TFunder(DSL.name(alias), this);
+    }
+
+    @Override
+    public TFunder as(Name alias) {
+        return new TFunder(alias, this);
+    }
+
+    @Override
+    public TFunder as(Table<?> alias) {
+        return new TFunder(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TFunder rename(String name) {
+        return new TFunder(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TFunder rename(Name name) {
+        return new TFunder(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TFunder rename(Table<?> name) {
+        return new TFunder(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFunder where(Condition condition) {
+        return new TFunder(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFunder where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFunder where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFunder where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFunder where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFunder where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFunder where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TFunder where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFunder whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TFunder whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

src/main/java/de/jottyfan/timetrack/db/project/tables/TProgress.java

@@ -0,0 +1,241 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project.tables;
+
+
+import de.jottyfan.timetrack.db.project.Keys;
+import de.jottyfan.timetrack.db.project.Project;
+import de.jottyfan.timetrack.db.project.enums.EnumPhase;
+import de.jottyfan.timetrack.db.project.tables.records.TProgressRecord;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Identity;
+import org.jooq.Name;
+import org.jooq.PlainSQL;
+import org.jooq.QueryPart;
+import org.jooq.SQL;
+import org.jooq.Schema;
+import org.jooq.Select;
+import org.jooq.Stringly;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.SQLDataType;
+import org.jooq.impl.TableImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class TProgress extends TableImpl<TProgressRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>project.t_progress</code>
+     */
+    public static final TProgress T_PROGRESS = new TProgress();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<TProgressRecord> getRecordType() {
+        return TProgressRecord.class;
+    }
+
+    /**
+     * The column <code>project.t_progress.created</code>.
+     */
+    public final TableField<TProgressRecord, LocalDateTime> CREATED = createField(DSL.name("created"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
+
+    /**
+     * The column <code>project.t_progress.pk_progress</code>.
+     */
+    public final TableField<TProgressRecord, Integer> PK_PROGRESS = createField(DSL.name("pk_progress"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
+
+    /**
+     * The column <code>project.t_progress.progress</code>.
+     */
+    public final TableField<TProgressRecord, Byte> PROGRESS = createField(DSL.name("progress"), SQLDataType.TINYINT.nullable(false), this, "");
+
+    /**
+     * The column <code>project.t_progress.phase</code>.
+     */
+    public final TableField<TProgressRecord, EnumPhase> PHASE = createField(DSL.name("phase"), SQLDataType.VARCHAR.asEnumDataType(EnumPhase.class), this, "");
+
+    private TProgress(Name alias, Table<TProgressRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private TProgress(Name alias, Table<TProgressRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>project.t_progress</code> table reference
+     */
+    public TProgress(String alias) {
+        this(DSL.name(alias), T_PROGRESS);
+    }
+
+    /**
+     * Create an aliased <code>project.t_progress</code> table reference
+     */
+    public TProgress(Name alias) {
+        this(alias, T_PROGRESS);
+    }
+
+    /**
+     * Create a <code>project.t_progress</code> table reference
+     */
+    public TProgress() {
+        this(DSL.name("t_progress"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : Project.PROJECT;
+    }
+
+    @Override
+    public Identity<TProgressRecord, Integer> getIdentity() {
+        return (Identity<TProgressRecord, Integer>) super.getIdentity();
+    }
+
+    @Override
+    public UniqueKey<TProgressRecord> getPrimaryKey() {
+        return Keys.T_PROGRESS_PKEY;
+    }
+
+    @Override
+    public TProgress as(String alias) {
+        return new TProgress(DSL.name(alias), this);
+    }
+
+    @Override
+    public TProgress as(Name alias) {
+        return new TProgress(alias, this);
+    }
+
+    @Override
+    public TProgress as(Table<?> alias) {
+        return new TProgress(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TProgress rename(String name) {
+        return new TProgress(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TProgress rename(Name name) {
+        return new TProgress(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TProgress rename(Table<?> name) {
+        return new TProgress(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProgress where(Condition condition) {
+        return new TProgress(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProgress where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProgress where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProgress where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProgress where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProgress where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProgress where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProgress where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProgress whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProgress whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

src/main/java/de/jottyfan/timetrack/db/project/tables/TProject.java

@@ -0,0 +1,245 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project.tables;
+
+
+import de.jottyfan.timetrack.db.project.Keys;
+import de.jottyfan.timetrack.db.project.Project;
+import de.jottyfan.timetrack.db.project.tables.records.TProjectRecord;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Identity;
+import org.jooq.Name;
+import org.jooq.PlainSQL;
+import org.jooq.QueryPart;
+import org.jooq.SQL;
+import org.jooq.Schema;
+import org.jooq.Select;
+import org.jooq.Stringly;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.SQLDataType;
+import org.jooq.impl.TableImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class TProject extends TableImpl<TProjectRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>project.t_project</code>
+     */
+    public static final TProject T_PROJECT = new TProject();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<TProjectRecord> getRecordType() {
+        return TProjectRecord.class;
+    }
+
+    /**
+     * The column <code>project.t_project.created</code>.
+     */
+    public final TableField<TProjectRecord, LocalDateTime> CREATED = createField(DSL.name("created"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
+
+    /**
+     * The column <code>project.t_project.pk_project</code>.
+     */
+    public final TableField<TProjectRecord, Integer> PK_PROJECT = createField(DSL.name("pk_project"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
+
+    /**
+     * The column <code>project.t_project.name</code>.
+     */
+    public final TableField<TProjectRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
+
+    /**
+     * The column <code>project.t_project.description</code>.
+     */
+    public final TableField<TProjectRecord, String> DESCRIPTION = createField(DSL.name("description"), SQLDataType.CLOB, this, "");
+
+    /**
+     * The column <code>project.t_project.fk_funder</code>.
+     */
+    public final TableField<TProjectRecord, Integer> FK_FUNDER = createField(DSL.name("fk_funder"), SQLDataType.INTEGER, this, "");
+
+    private TProject(Name alias, Table<TProjectRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private TProject(Name alias, Table<TProjectRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>project.t_project</code> table reference
+     */
+    public TProject(String alias) {
+        this(DSL.name(alias), T_PROJECT);
+    }
+
+    /**
+     * Create an aliased <code>project.t_project</code> table reference
+     */
+    public TProject(Name alias) {
+        this(alias, T_PROJECT);
+    }
+
+    /**
+     * Create a <code>project.t_project</code> table reference
+     */
+    public TProject() {
+        this(DSL.name("t_project"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : Project.PROJECT;
+    }
+
+    @Override
+    public Identity<TProjectRecord, Integer> getIdentity() {
+        return (Identity<TProjectRecord, Integer>) super.getIdentity();
+    }
+
+    @Override
+    public UniqueKey<TProjectRecord> getPrimaryKey() {
+        return Keys.T_PROJECT_PKEY;
+    }
+
+    @Override
+    public TProject as(String alias) {
+        return new TProject(DSL.name(alias), this);
+    }
+
+    @Override
+    public TProject as(Name alias) {
+        return new TProject(alias, this);
+    }
+
+    @Override
+    public TProject as(Table<?> alias) {
+        return new TProject(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TProject rename(String name) {
+        return new TProject(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TProject rename(Name name) {
+        return new TProject(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TProject rename(Table<?> name) {
+        return new TProject(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProject where(Condition condition) {
+        return new TProject(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProject where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProject where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProject where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProject where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProject where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProject where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TProject where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProject whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TProject whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

src/main/java/de/jottyfan/timetrack/db/project/tables/TWorkpackage.java

@@ -0,0 +1,261 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project.tables;
+
+
+import de.jottyfan.timetrack.db.project.Keys;
+import de.jottyfan.timetrack.db.project.Project;
+import de.jottyfan.timetrack.db.project.tables.records.TWorkpackageRecord;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Collection;
+
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Identity;
+import org.jooq.Name;
+import org.jooq.PlainSQL;
+import org.jooq.QueryPart;
+import org.jooq.SQL;
+import org.jooq.Schema;
+import org.jooq.Select;
+import org.jooq.Stringly;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.SQLDataType;
+import org.jooq.impl.TableImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class TWorkpackage extends TableImpl<TWorkpackageRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>project.t_workpackage</code>
+     */
+    public static final TWorkpackage T_WORKPACKAGE = new TWorkpackage();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<TWorkpackageRecord> getRecordType() {
+        return TWorkpackageRecord.class;
+    }
+
+    /**
+     * The column <code>project.t_workpackage.created</code>.
+     */
+    public final TableField<TWorkpackageRecord, LocalDateTime> CREATED = createField(DSL.name("created"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
+
+    /**
+     * The column <code>project.t_workpackage.pk_workpackage</code>.
+     */
+    public final TableField<TWorkpackageRecord, Integer> PK_WORKPACKAGE = createField(DSL.name("pk_workpackage"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
+
+    /**
+     * The column <code>project.t_workpackage.fk_project</code>.
+     */
+    public final TableField<TWorkpackageRecord, Integer> FK_PROJECT = createField(DSL.name("fk_project"), SQLDataType.INTEGER, this, "");
+
+    /**
+     * The column <code>project.t_workpackage.name</code>.
+     */
+    public final TableField<TWorkpackageRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
+
+    /**
+     * The column <code>project.t_workpackage.description</code>.
+     */
+    public final TableField<TWorkpackageRecord, String> DESCRIPTION = createField(DSL.name("description"), SQLDataType.CLOB, this, "");
+
+    /**
+     * The column <code>project.t_workpackage.milestone_url</code>.
+     */
+    public final TableField<TWorkpackageRecord, String> MILESTONE_URL = createField(DSL.name("milestone_url"), SQLDataType.CLOB, this, "");
+
+    /**
+     * The column <code>project.t_workpackage.contract_url</code>.
+     */
+    public final TableField<TWorkpackageRecord, String> CONTRACT_URL = createField(DSL.name("contract_url"), SQLDataType.CLOB, this, "");
+
+    /**
+     * The column <code>project.t_workpackage.planned_duedate</code>.
+     */
+    public final TableField<TWorkpackageRecord, LocalDate> PLANNED_DUEDATE = createField(DSL.name("planned_duedate"), SQLDataType.LOCALDATE, this, "");
+
+    private TWorkpackage(Name alias, Table<TWorkpackageRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private TWorkpackage(Name alias, Table<TWorkpackageRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>project.t_workpackage</code> table reference
+     */
+    public TWorkpackage(String alias) {
+        this(DSL.name(alias), T_WORKPACKAGE);
+    }
+
+    /**
+     * Create an aliased <code>project.t_workpackage</code> table reference
+     */
+    public TWorkpackage(Name alias) {
+        this(alias, T_WORKPACKAGE);
+    }
+
+    /**
+     * Create a <code>project.t_workpackage</code> table reference
+     */
+    public TWorkpackage() {
+        this(DSL.name("t_workpackage"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : Project.PROJECT;
+    }
+
+    @Override
+    public Identity<TWorkpackageRecord, Integer> getIdentity() {
+        return (Identity<TWorkpackageRecord, Integer>) super.getIdentity();
+    }
+
+    @Override
+    public UniqueKey<TWorkpackageRecord> getPrimaryKey() {
+        return Keys.T_WORKPACKAGE_PKEY;
+    }
+
+    @Override
+    public TWorkpackage as(String alias) {
+        return new TWorkpackage(DSL.name(alias), this);
+    }
+
+    @Override
+    public TWorkpackage as(Name alias) {
+        return new TWorkpackage(alias, this);
+    }
+
+    @Override
+    public TWorkpackage as(Table<?> alias) {
+        return new TWorkpackage(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TWorkpackage rename(String name) {
+        return new TWorkpackage(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TWorkpackage rename(Name name) {
+        return new TWorkpackage(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TWorkpackage rename(Table<?> name) {
+        return new TWorkpackage(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackage where(Condition condition) {
+        return new TWorkpackage(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackage where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackage where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackage where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TWorkpackage where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TWorkpackage where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TWorkpackage where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TWorkpackage where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackage whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackage whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

src/main/java/de/jottyfan/timetrack/db/project/tables/TWorkpackageApp.java

@@ -0,0 +1,247 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project.tables;
+
+
+import de.jottyfan.timetrack.db.project.Keys;
+import de.jottyfan.timetrack.db.project.Project;
+import de.jottyfan.timetrack.db.project.tables.records.TWorkpackageAppRecord;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Identity;
+import org.jooq.Name;
+import org.jooq.PlainSQL;
+import org.jooq.QueryPart;
+import org.jooq.SQL;
+import org.jooq.Schema;
+import org.jooq.Select;
+import org.jooq.Stringly;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.SQLDataType;
+import org.jooq.impl.TableImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class TWorkpackageApp extends TableImpl<TWorkpackageAppRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>project.t_workpackage_app</code>
+     */
+    public static final TWorkpackageApp T_WORKPACKAGE_APP = new TWorkpackageApp();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<TWorkpackageAppRecord> getRecordType() {
+        return TWorkpackageAppRecord.class;
+    }
+
+    /**
+     * The column <code>project.t_workpackage_app.created</code>.
+     */
+    public final TableField<TWorkpackageAppRecord, LocalDateTime> CREATED = createField(DSL.name("created"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.LOCALDATETIME)), this, "");
+
+    /**
+     * The column <code>project.t_workpackage_app.pk_workpackage_app</code>.
+     */
+    public final TableField<TWorkpackageAppRecord, Integer> PK_WORKPACKAGE_APP = createField(DSL.name("pk_workpackage_app"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
+
+    /**
+     * The column <code>project.t_workpackage_app.fk_workpackage</code>.
+     */
+    public final TableField<TWorkpackageAppRecord, Integer> FK_WORKPACKAGE = createField(DSL.name("fk_workpackage"), SQLDataType.INTEGER.nullable(false), this, "");
+
+    /**
+     * The column <code>project.t_workpackage_app.fk_app</code>.
+     */
+    public final TableField<TWorkpackageAppRecord, Integer> FK_APP = createField(DSL.name("fk_app"), SQLDataType.INTEGER.nullable(false), this, "");
+
+    private TWorkpackageApp(Name alias, Table<TWorkpackageAppRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private TWorkpackageApp(Name alias, Table<TWorkpackageAppRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>project.t_workpackage_app</code> table reference
+     */
+    public TWorkpackageApp(String alias) {
+        this(DSL.name(alias), T_WORKPACKAGE_APP);
+    }
+
+    /**
+     * Create an aliased <code>project.t_workpackage_app</code> table reference
+     */
+    public TWorkpackageApp(Name alias) {
+        this(alias, T_WORKPACKAGE_APP);
+    }
+
+    /**
+     * Create a <code>project.t_workpackage_app</code> table reference
+     */
+    public TWorkpackageApp() {
+        this(DSL.name("t_workpackage_app"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : Project.PROJECT;
+    }
+
+    @Override
+    public Identity<TWorkpackageAppRecord, Integer> getIdentity() {
+        return (Identity<TWorkpackageAppRecord, Integer>) super.getIdentity();
+    }
+
+    @Override
+    public UniqueKey<TWorkpackageAppRecord> getPrimaryKey() {
+        return Keys.T_WORKPACKAGE_APP_PKEY;
+    }
+
+    @Override
+    public List<UniqueKey<TWorkpackageAppRecord>> getUniqueKeys() {
+        return Arrays.asList(Keys.T_WORKPACKAGE_APP_FK_WORKPACKAGE_FK_APP_KEY);
+    }
+
+    @Override
+    public TWorkpackageApp as(String alias) {
+        return new TWorkpackageApp(DSL.name(alias), this);
+    }
+
+    @Override
+    public TWorkpackageApp as(Name alias) {
+        return new TWorkpackageApp(alias, this);
+    }
+
+    @Override
+    public TWorkpackageApp as(Table<?> alias) {
+        return new TWorkpackageApp(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TWorkpackageApp rename(String name) {
+        return new TWorkpackageApp(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TWorkpackageApp rename(Name name) {
+        return new TWorkpackageApp(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public TWorkpackageApp rename(Table<?> name) {
+        return new TWorkpackageApp(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackageApp where(Condition condition) {
+        return new TWorkpackageApp(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackageApp where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackageApp where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackageApp where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TWorkpackageApp where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TWorkpackageApp where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TWorkpackageApp where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public TWorkpackageApp where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackageApp whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public TWorkpackageApp whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

src/main/java/de/jottyfan/timetrack/db/project/tables/VBundleApps.java

@@ -0,0 +1,222 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package de.jottyfan.timetrack.db.project.tables;
+
+
+import de.jottyfan.timetrack.db.project.Project;
+import de.jottyfan.timetrack.db.project.tables.records.VBundleAppsRecord;
+
+import java.util.Collection;
+
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.PlainSQL;
+import org.jooq.QueryPart;
+import org.jooq.SQL;
+import org.jooq.Schema;
+import org.jooq.Select;
+import org.jooq.Stringly;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.impl.DSL;
+import org.jooq.impl.SQLDataType;
+import org.jooq.impl.TableImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes", "this-escape" })
+public class VBundleApps extends TableImpl<VBundleAppsRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>project.v_bundle_apps</code>
+     */
+    public static final VBundleApps V_BUNDLE_APPS = new VBundleApps();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<VBundleAppsRecord> getRecordType() {
+        return VBundleAppsRecord.class;
+    }
+
+    /**
+     * The column <code>project.v_bundle_apps.name</code>.
+     */
+    public final TableField<VBundleAppsRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB, this, "");
+
+    /**
+     * The column <code>project.v_bundle_apps.string_agg</code>.
+     */
+    public final TableField<VBundleAppsRecord, String> STRING_AGG = createField(DSL.name("string_agg"), SQLDataType.CLOB, this, "");
+
+    private VBundleApps(Name alias, Table<VBundleAppsRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private VBundleApps(Name alias, Table<VBundleAppsRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
+        create view "v_bundle_apps" as  SELECT b.name,
+          string_agg(a.name, ','::text) AS string_agg
+         FROM (project.t_bundle b
+           LEFT JOIN project.t_app a ON ((a.fk_bundle = b.pk_bundle)))
+        GROUP BY b.name;
+        """), where);
+    }
+
+    /**
+     * Create an aliased <code>project.v_bundle_apps</code> table reference
+     */
+    public VBundleApps(String alias) {
+        this(DSL.name(alias), V_BUNDLE_APPS);
+    }
+
+    /**
+     * Create an aliased <code>project.v_bundle_apps</code> table reference
+     */
+    public VBundleApps(Name alias) {
+        this(alias, V_BUNDLE_APPS);
+    }
+
+    /**
+     * Create a <code>project.v_bundle_apps</code> table reference
+     */
+    public VBundleApps() {
+        this(DSL.name("v_bundle_apps"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : Project.PROJECT;
+    }
+
+    @Override
+    public VBundleApps as(String alias) {
+        return new VBundleApps(DSL.name(alias), this);
+    }
+
+    @Override
+    public VBundleApps as(Name alias) {
+        return new VBundleApps(alias, this);
+    }
+
+    @Override
+    public VBundleApps as(Table<?> alias) {
+        return new VBundleApps(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public VBundleApps rename(String name) {
+        return new VBundleApps(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public VBundleApps rename(Name name) {
+        return new VBundleApps(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public VBundleApps rename(Table<?> name) {
+        return new VBundleApps(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VBundleApps where(Condition condition) {
+        return new VBundleApps(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VBundleApps where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VBundleApps where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VBundleApps where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VBundleApps where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VBundleApps where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VBundleApps where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VBundleApps where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VBundleApps whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VBundleApps whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}