library upgrades

This commit is contained in:
Jörg Henke
2021-02-26 17:33:18 +01:00
parent 71bb01e05c
commit a2d01b41e3
94 changed files with 2118 additions and 1780 deletions

View File

@ -6,13 +6,7 @@
<attribute name="gradle_used_by_scope" value="main,test"/> <attribute name="gradle_used_by_scope" value="main,test"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="bin/main" path="src/jooq/java"> <classpathentry kind="src" path="src/jooq/java"/>
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/main/webapp"/>
<classpathentry kind="src" output="bin/main" path="src/main/resources"> <classpathentry kind="src" output="bin/main" path="src/main/resources">
<attributes> <attributes>
<attribute name="gradle_scope" value="main"/> <attribute name="gradle_scope" value="main"/>
@ -37,5 +31,6 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" path="src/main/webapp"/>
<classpathentry kind="output" path="bin/default"/> <classpathentry kind="output" path="bin/default"/>
</classpath> </classpath>

View File

@ -8,14 +8,9 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/jooq/java"/>
<wb-resource deploy-path="/" source-path="src/main/webapp"/> <wb-resource deploy-path="/" source-path="src/main/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/jooq/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/jooq/java"/>
</wb-module> </wb-module>

View File

@ -7,22 +7,25 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.google.code.gson:gson:2.8.5' classpath 'com.google.code.gson:gson:2.8.6'
classpath 'org.jooq:jooq-codegen:3.12.1' classpath 'org.jooq:jooq-codegen:3.14.4'
classpath 'org.postgresql:postgresql:42.2.6' classpath 'org.postgresql:postgresql:42.2.19'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release' classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release'
classpath 'nu.studer:gradle-jooq-plugin:3.0.3' classpath 'nu.studer.jooq:nu.studer.jooq.gradle.plugin:5.2'
} }
} }
plugins {
id 'nu.studer.jooq' version '5.2'
}
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'war' apply plugin: 'war'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'nu.studer.jooq'
group = 'jottyfan' group = 'jottyfan'
version = '1.1.3' version = '1.1.4'
description = """timetrack""" description = """timetrack"""
@ -43,36 +46,39 @@ repositories {
dependencies { dependencies {
compile 'org.jboss.weld.servlet:weld-servlet:2.4.8.Final' compile 'org.jboss.weld.servlet:weld-servlet:2.4.8.Final'
compile 'org.apache.myfaces.core:myfaces-api:2.3.4' compile 'org.apache.myfaces.core:myfaces-api:2.3.8'
compile 'org.apache.myfaces.core:myfaces-impl:2.3.4' compile 'org.apache.myfaces.core:myfaces-impl:2.3.8'
compile 'net.bootsfaces:bootsfaces:1.4.2' compile 'net.bootsfaces:bootsfaces:1.5.0'
compile 'de.jooqFaces:jooqFaces:0.4.6' compile 'org.postgresql:postgresql:42.2.19'
compile 'org.postgresql:postgresql:42.2.6' compile 'org.jooq:jooq:3.14.4'
compile 'org.jooq:jooq:3.12.1' compile 'org.jooq:jooq-codegen:3.14.4'
compile 'org.jooq:jooq-codegen:3.12.1' compile 'com.google.code.gson:gson:2.8.6'
compile 'com.google.code.gson:gson:2.8.5'
compile 'org.jasypt:jasypt:1.9.3' compile 'org.jasypt:jasypt:1.9.3'
compile 'javax.servlet:javax.servlet-api:4.0.1' compile 'javax.servlet:javax.servlet-api:4.0.1'
compile 'org.apache.logging.log4j:log4j-core:2.12.1' compile 'org.apache.logging.log4j:log4j-core:2.14.0'
compile 'org.apache.logging.log4j:log4j-api:2.12.1' compile 'org.apache.logging.log4j:log4j-api:2.14.0'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2' testCompile 'org.junit.jupiter:junit-jupiter-api:5.8.0-M1'
testCompile 'org.junit.jupiter:junit-jupiter-engine:5.5.2' testCompile 'org.junit.jupiter:junit-jupiter-engine:5.8.0-M1'
runtime 'org.postgresql:postgresql:42.2.6' runtime 'org.postgresql:postgresql:42.2.19'
jooqRuntime 'org.postgresql:postgresql:42.2.6' jooqGenerator 'org.postgresql:postgresql:42.2.19'
} }
jooq { jooq {
edition = 'OSS' edition = nu.studer.gradle.jooq.JooqEdition.OSS
version = '3.12.1' version = '3.14.4'
timetrack (sourceSets.main) { configurations {
timetrack {
generateSchemaSourceOnCompilation = false
generationTool {
logging = org.jooq.meta.jaxb.Logging.WARN
jdbc { jdbc {
driver = 'org.postgresql.Driver' driver = 'org.postgresql.Driver'
url = 'jdbc:postgresql://localhost:5432/timetrack' url = 'jdbc:postgresql://localhost:5432/timetrack'
user = "jooq" user = dbUsername
password = "" password = dbPassword
} }
generator { generator {
name = 'org.jooq.codegen.DefaultGenerator' name = 'org.jooq.codegen.DefaultGenerator'
@ -104,6 +110,8 @@ jooq {
} }
} }
} }
}
}
} }
war { war {
@ -113,6 +121,6 @@ war {
} }
} }
// removes the task dependency from compileJava to generateTimetrackJooqSchemaSource // removes the task dependency from compileJava to generateTimetrackJooqSchemaSource
project.tasks.getByName('compileJava').dependsOn -= 'generateTimetrackJooqSchemaSource' project.tasks.getByName('compileJava').dependsOn -= 'generateTimetrackJooq'

View File

@ -9,12 +9,9 @@ import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.note.Note; import de.jottyfan.timetrack.db.note.Note;
import de.jottyfan.timetrack.db.profile.Profile; import de.jottyfan.timetrack.db.profile.Profile;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.impl.CatalogImpl; import org.jooq.impl.CatalogImpl;
@ -22,42 +19,35 @@ import org.jooq.impl.CatalogImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class DefaultCatalog extends CatalogImpl { public class DefaultCatalog extends CatalogImpl {
private static final long serialVersionUID = 1609733166; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code></code> * The reference instance of <code>DEFAULT_CATALOG</code>
*/ */
public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog(); public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog();
/** /**
* The schema <code>contact</code>. * The schema <code>contact</code>.
*/ */
public final Contact CONTACT = de.jottyfan.timetrack.db.contact.Contact.CONTACT; public final Contact CONTACT = Contact.CONTACT;
/** /**
* The schema <code>done</code>. * The schema <code>done</code>.
*/ */
public final Done DONE = de.jottyfan.timetrack.db.done.Done.DONE; public final Done DONE = Done.DONE;
/** /**
* The schema <code>note</code>. * The schema <code>note</code>.
*/ */
public final Note NOTE = de.jottyfan.timetrack.db.note.Note.NOTE; public final Note NOTE = Note.NOTE;
/** /**
* The schema <code>profile</code>. * The schema <code>profile</code>.
*/ */
public final Profile PROFILE = de.jottyfan.timetrack.db.profile.Profile.PROFILE; public final Profile PROFILE = Profile.PROFILE;
/** /**
* No further instances allowed * No further instances allowed
@ -68,12 +58,6 @@ public class DefaultCatalog extends CatalogImpl {
@Override @Override
public final List<Schema> getSchemas() { public final List<Schema> getSchemas() {
List result = new ArrayList();
result.addAll(getSchemas0());
return result;
}
private final List<Schema> getSchemas0() {
return Arrays.<Schema>asList( return Arrays.<Schema>asList(
Contact.CONTACT, Contact.CONTACT,
Done.DONE, Done.DONE,

View File

@ -7,12 +7,9 @@ package de.jottyfan.timetrack.db.contact;
import de.jottyfan.timetrack.db.DefaultCatalog; import de.jottyfan.timetrack.db.DefaultCatalog;
import de.jottyfan.timetrack.db.contact.tables.TContact; import de.jottyfan.timetrack.db.contact.tables.TContact;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.impl.SchemaImpl; import org.jooq.impl.SchemaImpl;
@ -21,17 +18,10 @@ import org.jooq.impl.SchemaImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Contact extends SchemaImpl { public class Contact extends SchemaImpl {
private static final long serialVersionUID = -253386273; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>contact</code> * The reference instance of <code>contact</code>
@ -41,7 +31,7 @@ public class Contact extends SchemaImpl {
/** /**
* The table <code>contact.t_contact</code>. * The table <code>contact.t_contact</code>.
*/ */
public final TContact T_CONTACT = de.jottyfan.timetrack.db.contact.tables.TContact.T_CONTACT; public final TContact T_CONTACT = TContact.T_CONTACT;
/** /**
* No further instances allowed * No further instances allowed
@ -58,12 +48,6 @@ public class Contact extends SchemaImpl {
@Override @Override
public final List<Table<?>> getTables() { public final List<Table<?>> getTables() {
List result = new ArrayList();
result.addAll(getTables0());
return result;
}
private final List<Table<?>> getTables0() {
return Arrays.<Table<?>>asList( return Arrays.<Table<?>>asList(
TContact.T_CONTACT); TContact.T_CONTACT);
} }

View File

@ -1,42 +0,0 @@
/*
* This file is generated by jOOQ.
*/
package de.jottyfan.timetrack.db.contact;
import de.jottyfan.timetrack.db.contact.tables.TContact;
import javax.annotation.processing.Generated;
import org.jooq.Index;
import org.jooq.OrderField;
import org.jooq.impl.Internal;
/**
* A class modelling indexes of tables of the <code>contact</code> schema.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Indexes {
// -------------------------------------------------------------------------
// INDEX definitions
// -------------------------------------------------------------------------
public static final Index T_CONTACT_PKEY = Indexes0.T_CONTACT_PKEY;
// -------------------------------------------------------------------------
// [#1459] distribute members to avoid static initialisers > 64kb
// -------------------------------------------------------------------------
private static class Indexes0 {
public static Index T_CONTACT_PKEY = Internal.createIndex("t_contact_pkey", TContact.T_CONTACT, new OrderField[] { TContact.T_CONTACT.PK }, true);
}
}

View File

@ -0,0 +1,28 @@
/*
* This file is generated by jOOQ.
*/
package de.jottyfan.timetrack.db.contact;
import de.jottyfan.timetrack.db.contact.tables.TContact;
import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord;
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
* contact.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Keys {
// -------------------------------------------------------------------------
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
public static final UniqueKey<TContactRecord> T_CONTACT_PKEY = Internal.createUniqueKey(TContact.T_CONTACT, DSL.name("t_contact_pkey"), new TableField[] { TContact.T_CONTACT.PK }, true);
}

View File

@ -6,19 +6,10 @@ package de.jottyfan.timetrack.db.contact;
import de.jottyfan.timetrack.db.contact.tables.TContact; import de.jottyfan.timetrack.db.contact.tables.TContact;
import javax.annotation.processing.Generated;
/** /**
* Convenience access to all tables in contact * Convenience access to all tables in contact.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables { public class Tables {

View File

@ -6,8 +6,6 @@ package de.jottyfan.timetrack.db.contact.enums;
import de.jottyfan.timetrack.db.contact.Contact; import de.jottyfan.timetrack.db.contact.Contact;
import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.EnumType; import org.jooq.EnumType;
import org.jooq.Schema; import org.jooq.Schema;
@ -16,13 +14,6 @@ import org.jooq.Schema;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public enum EnumContacttype implements EnumType { public enum EnumContacttype implements EnumType {
@ -44,7 +35,7 @@ public enum EnumContacttype implements EnumType {
@Override @Override
public Catalog getCatalog() { public Catalog getCatalog() {
return getSchema() == null ? null : getSchema().getCatalog(); return getSchema().getCatalog();
} }
@Override @Override

View File

@ -5,42 +5,36 @@ package de.jottyfan.timetrack.db.contact.tables;
import de.jottyfan.timetrack.db.contact.Contact; import de.jottyfan.timetrack.db.contact.Contact;
import de.jottyfan.timetrack.db.contact.Indexes; import de.jottyfan.timetrack.db.contact.Keys;
import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; import de.jottyfan.timetrack.db.contact.enums.EnumContacttype;
import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord; import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Identity;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row5; import org.jooq.Row5;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TContact extends TableImpl<TContactRecord> { public class TContact extends TableImpl<TContactRecord> {
private static final long serialVersionUID = 1122078543; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>contact.t_contact</code> * The reference instance of <code>contact.t_contact</code>
@ -58,33 +52,34 @@ public class TContact extends TableImpl<TContactRecord> {
/** /**
* The column <code>contact.t_contact.pk</code>. * The column <code>contact.t_contact.pk</code>.
*/ */
public final TableField<TContactRecord, Integer> PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TContactRecord, Integer> PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/** /**
* The column <code>contact.t_contact.forename</code>. * The column <code>contact.t_contact.forename</code>.
*/ */
public final TableField<TContactRecord, String> FORENAME = createField(DSL.name("forename"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); public final TableField<TContactRecord, String> FORENAME = createField(DSL.name("forename"), SQLDataType.CLOB.nullable(false), this, "");
/** /**
* The column <code>contact.t_contact.surname</code>. * The column <code>contact.t_contact.surname</code>.
*/ */
public final TableField<TContactRecord, String> SURNAME = createField(DSL.name("surname"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); public final TableField<TContactRecord, String> SURNAME = createField(DSL.name("surname"), SQLDataType.CLOB.nullable(false), this, "");
/** /**
* The column <code>contact.t_contact.contact</code>. * The column <code>contact.t_contact.contact</code>.
*/ */
public final TableField<TContactRecord, String> CONTACT = createField(DSL.name("contact"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); public final TableField<TContactRecord, String> CONTACT = createField(DSL.name("contact"), SQLDataType.CLOB.nullable(false), this, "");
/** /**
* The column <code>contact.t_contact.type</code>. * The column <code>contact.t_contact.type</code>.
*/ */
public final TableField<TContactRecord, EnumContacttype> TYPE = createField(DSL.name("type"), org.jooq.impl.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(de.jottyfan.timetrack.db.contact.enums.EnumContacttype.class), this, "");
/** private TContact(Name alias, Table<TContactRecord> aliased) {
* Create a <code>contact.t_contact</code> table reference this(alias, aliased, null);
*/ }
public TContact() {
this(DSL.name("t_contact"), null); private TContact(Name alias, Table<TContactRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
} }
/** /**
@ -101,12 +96,11 @@ public class TContact extends TableImpl<TContactRecord> {
this(alias, T_CONTACT); this(alias, T_CONTACT);
} }
private TContact(Name alias, Table<TContactRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>contact.t_contact</code> table reference
} */
public TContact() {
private TContact(Name alias, Table<TContactRecord> aliased, Field<?>[] parameters) { this(DSL.name("t_contact"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> TContact(Table<O> child, ForeignKey<O, TContactRecord> key) { public <O extends Record> TContact(Table<O> child, ForeignKey<O, TContactRecord> key) {
@ -119,8 +113,18 @@ public class TContact extends TableImpl<TContactRecord> {
} }
@Override @Override
public List<Index> getIndexes() { public Identity<TContactRecord, Integer> getIdentity() {
return Arrays.<Index>asList(Indexes.T_CONTACT_PKEY); return (Identity<TContactRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<TContactRecord> getPrimaryKey() {
return Keys.T_CONTACT_PKEY;
}
@Override
public List<UniqueKey<TContactRecord>> getKeys() {
return Arrays.<UniqueKey<TContactRecord>>asList(Keys.T_CONTACT_PKEY);
} }
@Override @Override

View File

@ -7,28 +7,20 @@ package de.jottyfan.timetrack.db.contact.tables.records;
import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; import de.jottyfan.timetrack.db.contact.enums.EnumContacttype;
import de.jottyfan.timetrack.db.contact.tables.TContact; import de.jottyfan.timetrack.db.contact.tables.TContact;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record1;
import org.jooq.Record5; import org.jooq.Record5;
import org.jooq.Row5; import org.jooq.Row5;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TContactRecord extends TableRecordImpl<TContactRecord> implements Record5<Integer, String, String, String, EnumContacttype> { public class TContactRecord extends UpdatableRecordImpl<TContactRecord> implements Record5<Integer, String, String, String, EnumContacttype> {
private static final long serialVersionUID = 1184347110; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>contact.t_contact.pk</code>. * Setter for <code>contact.t_contact.pk</code>.
@ -100,6 +92,15 @@ public class TContactRecord extends TableRecordImpl<TContactRecord> implements R
return (EnumContacttype) get(4); return (EnumContacttype) get(4);
} }
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record5 type implementation // Record5 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@ -246,10 +247,10 @@ public class TContactRecord extends TableRecordImpl<TContactRecord> implements R
public TContactRecord(Integer pk, String forename, String surname, String contact, EnumContacttype type) { public TContactRecord(Integer pk, String forename, String surname, String contact, EnumContacttype type) {
super(TContact.T_CONTACT); super(TContact.T_CONTACT);
set(0, pk); setPk(pk);
set(1, forename); setForename(forename);
set(2, surname); setSurname(surname);
set(3, contact); setContact(contact);
set(4, type); setType(type);
} }
} }

View File

@ -22,12 +22,9 @@ import de.jottyfan.timetrack.db.done.tables.VTimelength;
import de.jottyfan.timetrack.db.done.tables.VTotalofday; import de.jottyfan.timetrack.db.done.tables.VTotalofday;
import de.jottyfan.timetrack.db.done.tables.VWorktime; import de.jottyfan.timetrack.db.done.tables.VWorktime;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.impl.SchemaImpl; import org.jooq.impl.SchemaImpl;
@ -36,17 +33,10 @@ import org.jooq.impl.SchemaImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Done extends SchemaImpl { public class Done extends SchemaImpl {
private static final long serialVersionUID = -1147316456; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done</code> * The reference instance of <code>done</code>
@ -56,82 +46,82 @@ public class Done extends SchemaImpl {
/** /**
* The table <code>done.t_done</code>. * The table <code>done.t_done</code>.
*/ */
public final TDone T_DONE = de.jottyfan.timetrack.db.done.tables.TDone.T_DONE; public final TDone T_DONE = TDone.T_DONE;
/** /**
* The table <code>done.t_job</code>. * The table <code>done.t_job</code>.
*/ */
public final TJob T_JOB = de.jottyfan.timetrack.db.done.tables.TJob.T_JOB; public final TJob T_JOB = TJob.T_JOB;
/** /**
* The table <code>done.t_module</code>. * The table <code>done.t_module</code>.
*/ */
public final TModule T_MODULE = de.jottyfan.timetrack.db.done.tables.TModule.T_MODULE; public final TModule T_MODULE = TModule.T_MODULE;
/** /**
* The table <code>done.t_project</code>. * The table <code>done.t_project</code>.
*/ */
public final TProject T_PROJECT = de.jottyfan.timetrack.db.done.tables.TProject.T_PROJECT; public final TProject T_PROJECT = TProject.T_PROJECT;
/** /**
* The table <code>done.v_daily</code>. * The table <code>done.v_daily</code>.
*/ */
public final VDaily V_DAILY = de.jottyfan.timetrack.db.done.tables.VDaily.V_DAILY; public final VDaily V_DAILY = VDaily.V_DAILY;
/** /**
* The table <code>done.v_daylimits</code>. * The table <code>done.v_daylimits</code>.
*/ */
public final VDaylimits V_DAYLIMITS = de.jottyfan.timetrack.db.done.tables.VDaylimits.V_DAYLIMITS; public final VDaylimits V_DAYLIMITS = VDaylimits.V_DAYLIMITS;
/** /**
* The table <code>done.v_daysummary</code>. * The table <code>done.v_daysummary</code>.
*/ */
public final VDaysummary V_DAYSUMMARY = de.jottyfan.timetrack.db.done.tables.VDaysummary.V_DAYSUMMARY; public final VDaysummary V_DAYSUMMARY = VDaysummary.V_DAYSUMMARY;
/** /**
* The table <code>done.v_done</code>. * The table <code>done.v_done</code>.
*/ */
public final VDone V_DONE = de.jottyfan.timetrack.db.done.tables.VDone.V_DONE; public final VDone V_DONE = VDone.V_DONE;
/** /**
* The table <code>done.v_duration</code>. * The table <code>done.v_duration</code>.
*/ */
public final VDuration V_DURATION = de.jottyfan.timetrack.db.done.tables.VDuration.V_DURATION; public final VDuration V_DURATION = VDuration.V_DURATION;
/** /**
* The table <code>done.v_eucanshare</code>. * The table <code>done.v_eucanshare</code>.
*/ */
public final VEucanshare V_EUCANSHARE = de.jottyfan.timetrack.db.done.tables.VEucanshare.V_EUCANSHARE; public final VEucanshare V_EUCANSHARE = VEucanshare.V_EUCANSHARE;
/** /**
* The table <code>done.v_hamster</code>. * The table <code>done.v_hamster</code>.
*/ */
public final VHamster V_HAMSTER = de.jottyfan.timetrack.db.done.tables.VHamster.V_HAMSTER; public final VHamster V_HAMSTER = VHamster.V_HAMSTER;
/** /**
* The table <code>done.v_hamstersummary</code>. * The table <code>done.v_hamstersummary</code>.
*/ */
public final VHamstersummary V_HAMSTERSUMMARY = de.jottyfan.timetrack.db.done.tables.VHamstersummary.V_HAMSTERSUMMARY; public final VHamstersummary V_HAMSTERSUMMARY = VHamstersummary.V_HAMSTERSUMMARY;
/** /**
* The table <code>done.v_tasklist</code>. * The table <code>done.v_tasklist</code>.
*/ */
public final VTasklist V_TASKLIST = de.jottyfan.timetrack.db.done.tables.VTasklist.V_TASKLIST; public final VTasklist V_TASKLIST = VTasklist.V_TASKLIST;
/** /**
* The table <code>done.v_timelength</code>. * The table <code>done.v_timelength</code>.
*/ */
public final VTimelength V_TIMELENGTH = de.jottyfan.timetrack.db.done.tables.VTimelength.V_TIMELENGTH; public final VTimelength V_TIMELENGTH = VTimelength.V_TIMELENGTH;
/** /**
* The table <code>done.v_totalofday</code>. * The table <code>done.v_totalofday</code>.
*/ */
public final VTotalofday V_TOTALOFDAY = de.jottyfan.timetrack.db.done.tables.VTotalofday.V_TOTALOFDAY; public final VTotalofday V_TOTALOFDAY = VTotalofday.V_TOTALOFDAY;
/** /**
* The table <code>done.v_worktime</code>. * The table <code>done.v_worktime</code>.
*/ */
public final VWorktime V_WORKTIME = de.jottyfan.timetrack.db.done.tables.VWorktime.V_WORKTIME; public final VWorktime V_WORKTIME = VWorktime.V_WORKTIME;
/** /**
* No further instances allowed * No further instances allowed
@ -148,12 +138,6 @@ public class Done extends SchemaImpl {
@Override @Override
public final List<Table<?>> getTables() { public final List<Table<?>> getTables() {
List result = new ArrayList();
result.addAll(getTables0());
return result;
}
private final List<Table<?>> getTables0() {
return Arrays.<Table<?>>asList( return Arrays.<Table<?>>asList(
TDone.T_DONE, TDone.T_DONE,
TJob.T_JOB, TJob.T_JOB,

View File

@ -1,57 +0,0 @@
/*
* This file is generated by jOOQ.
*/
package de.jottyfan.timetrack.db.done;
import de.jottyfan.timetrack.db.done.tables.TDone;
import de.jottyfan.timetrack.db.done.tables.TJob;
import de.jottyfan.timetrack.db.done.tables.TModule;
import de.jottyfan.timetrack.db.done.tables.TProject;
import javax.annotation.processing.Generated;
import org.jooq.Index;
import org.jooq.OrderField;
import org.jooq.impl.Internal;
/**
* A class modelling indexes of tables of the <code>done</code> schema.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Indexes {
// -------------------------------------------------------------------------
// INDEX definitions
// -------------------------------------------------------------------------
public static final Index T_DONE_PKEY = Indexes0.T_DONE_PKEY;
public static final Index T_CATEGORY_NAME_KEY = Indexes0.T_CATEGORY_NAME_KEY;
public static final Index T_CATEGORY_PKEY = Indexes0.T_CATEGORY_PKEY;
public static final Index T_JOB_NAME_KEY = Indexes0.T_JOB_NAME_KEY;
public static final Index T_JOB_PKEY = Indexes0.T_JOB_PKEY;
public static final Index T_PROJECT_NAME_KEY = Indexes0.T_PROJECT_NAME_KEY;
public static final Index T_PROJECT_PKEY = Indexes0.T_PROJECT_PKEY;
// -------------------------------------------------------------------------
// [#1459] distribute members to avoid static initialisers > 64kb
// -------------------------------------------------------------------------
private static class Indexes0 {
public static Index T_DONE_PKEY = Internal.createIndex("t_done_pkey", TDone.T_DONE, new OrderField[] { TDone.T_DONE.PK }, true);
public static Index T_CATEGORY_NAME_KEY = Internal.createIndex("t_category_name_key", TJob.T_JOB, new OrderField[] { TJob.T_JOB.NAME }, true);
public static Index T_CATEGORY_PKEY = Internal.createIndex("t_category_pkey", TJob.T_JOB, new OrderField[] { TJob.T_JOB.PK }, true);
public static Index T_JOB_NAME_KEY = Internal.createIndex("t_job_name_key", TModule.T_MODULE, new OrderField[] { TModule.T_MODULE.NAME }, true);
public static Index T_JOB_PKEY = Internal.createIndex("t_job_pkey", TModule.T_MODULE, new OrderField[] { TModule.T_MODULE.PK }, true);
public static Index T_PROJECT_NAME_KEY = Internal.createIndex("t_project_name_key", TProject.T_PROJECT, new OrderField[] { TProject.T_PROJECT.NAME }, true);
public static Index T_PROJECT_PKEY = Internal.createIndex("t_project_pkey", TProject.T_PROJECT, new OrderField[] { TProject.T_PROJECT.PK }, true);
}
}

View File

@ -0,0 +1,52 @@
/*
* This file is generated by jOOQ.
*/
package de.jottyfan.timetrack.db.done;
import de.jottyfan.timetrack.db.done.tables.TDone;
import de.jottyfan.timetrack.db.done.tables.TJob;
import de.jottyfan.timetrack.db.done.tables.TModule;
import de.jottyfan.timetrack.db.done.tables.TProject;
import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord;
import de.jottyfan.timetrack.db.done.tables.records.TJobRecord;
import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord;
import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord;
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;
import org.jooq.impl.Internal;
/**
* A class modelling foreign key relationships and constraints of tables in
* done.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Keys {
// -------------------------------------------------------------------------
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
public static final UniqueKey<TDoneRecord> T_DONE_PKEY = Internal.createUniqueKey(TDone.T_DONE, DSL.name("t_done_pkey"), new TableField[] { TDone.T_DONE.PK }, true);
public static final UniqueKey<TJobRecord> T_CATEGORY_NAME_KEY = Internal.createUniqueKey(TJob.T_JOB, DSL.name("t_category_name_key"), new TableField[] { TJob.T_JOB.NAME }, true);
public static final UniqueKey<TJobRecord> T_CATEGORY_PKEY = Internal.createUniqueKey(TJob.T_JOB, DSL.name("t_category_pkey"), new TableField[] { TJob.T_JOB.PK }, true);
public static final UniqueKey<TModuleRecord> T_JOB_NAME_KEY = Internal.createUniqueKey(TModule.T_MODULE, DSL.name("t_job_name_key"), new TableField[] { TModule.T_MODULE.NAME }, true);
public static final UniqueKey<TModuleRecord> T_JOB_PKEY = Internal.createUniqueKey(TModule.T_MODULE, DSL.name("t_job_pkey"), new TableField[] { TModule.T_MODULE.PK }, true);
public static final UniqueKey<TProjectRecord> T_PROJECT_NAME_KEY = Internal.createUniqueKey(TProject.T_PROJECT, DSL.name("t_project_name_key"), new TableField[] { TProject.T_PROJECT.NAME }, 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 }, true);
// -------------------------------------------------------------------------
// FOREIGN KEY definitions
// -------------------------------------------------------------------------
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);
}

View File

@ -21,19 +21,10 @@ import de.jottyfan.timetrack.db.done.tables.VTimelength;
import de.jottyfan.timetrack.db.done.tables.VTotalofday; import de.jottyfan.timetrack.db.done.tables.VTotalofday;
import de.jottyfan.timetrack.db.done.tables.VWorktime; import de.jottyfan.timetrack.db.done.tables.VWorktime;
import javax.annotation.processing.Generated;
/** /**
* Convenience access to all tables in done * Convenience access to all tables in done.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables { public class Tables {

View File

@ -5,42 +5,37 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.Indexes; import de.jottyfan.timetrack.db.done.Keys;
import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord; import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord;
import de.jottyfan.timetrack.db.profile.tables.TLogin;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Identity;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row9; import org.jooq.Row9;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TDone extends TableImpl<TDoneRecord> { public class TDone extends TableImpl<TDoneRecord> {
private static final long serialVersionUID = -1009395311; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.t_done</code> * The reference instance of <code>done.t_done</code>
@ -58,53 +53,54 @@ public class TDone extends TableImpl<TDoneRecord> {
/** /**
* The column <code>done.t_done.lastchange</code>. * The column <code>done.t_done.lastchange</code>.
*/ */
public final TableField<TDoneRecord, Timestamp> LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); public final TableField<TDoneRecord, LocalDateTime> LASTCHANGE = createField(DSL.name("lastchange"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field("now()", SQLDataType.LOCALDATETIME)), this, "");
/** /**
* The column <code>done.t_done.pk</code>. * The column <code>done.t_done.pk</code>.
*/ */
public final TableField<TDoneRecord, Integer> PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TDoneRecord, Integer> PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/** /**
* The column <code>done.t_done.time_from</code>. * The column <code>done.t_done.time_from</code>.
*/ */
public final TableField<TDoneRecord, Timestamp> TIME_FROM = createField(DSL.name("time_from"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); public final TableField<TDoneRecord, LocalDateTime> TIME_FROM = createField(DSL.name("time_from"), SQLDataType.LOCALDATETIME(6), this, "");
/** /**
* The column <code>done.t_done.time_until</code>. * The column <code>done.t_done.time_until</code>.
*/ */
public final TableField<TDoneRecord, Timestamp> TIME_UNTIL = createField(DSL.name("time_until"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); public final TableField<TDoneRecord, LocalDateTime> TIME_UNTIL = createField(DSL.name("time_until"), SQLDataType.LOCALDATETIME(6), this, "");
/** /**
* The column <code>done.t_done.fk_project</code>. * The column <code>done.t_done.fk_project</code>.
*/ */
public final TableField<TDoneRecord, Integer> FK_PROJECT = createField(DSL.name("fk_project"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<TDoneRecord, Integer> FK_PROJECT = createField(DSL.name("fk_project"), SQLDataType.INTEGER, this, "");
/** /**
* The column <code>done.t_done.fk_module</code>. * The column <code>done.t_done.fk_module</code>.
*/ */
public final TableField<TDoneRecord, Integer> FK_MODULE = createField(DSL.name("fk_module"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<TDoneRecord, Integer> FK_MODULE = createField(DSL.name("fk_module"), SQLDataType.INTEGER, this, "");
/** /**
* The column <code>done.t_done.fk_job</code>. * The column <code>done.t_done.fk_job</code>.
*/ */
public final TableField<TDoneRecord, Integer> FK_JOB = createField(DSL.name("fk_job"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<TDoneRecord, Integer> FK_JOB = createField(DSL.name("fk_job"), SQLDataType.INTEGER, this, "");
/** /**
* The column <code>done.t_done.fk_login</code>. * The column <code>done.t_done.fk_login</code>.
*/ */
public final TableField<TDoneRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TDoneRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER.nullable(false), this, "");
/** /**
* The column <code>done.t_done.wp</code>. * The column <code>done.t_done.wp</code>.
*/ */
public final TableField<TDoneRecord, String> WP = createField(DSL.name("wp"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<TDoneRecord, String> WP = createField(DSL.name("wp"), SQLDataType.CLOB, this, "");
/** private TDone(Name alias, Table<TDoneRecord> aliased) {
* Create a <code>done.t_done</code> table reference this(alias, aliased, null);
*/ }
public TDone() {
this(DSL.name("t_done"), null); private TDone(Name alias, Table<TDoneRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
} }
/** /**
@ -121,12 +117,11 @@ public class TDone extends TableImpl<TDoneRecord> {
this(alias, T_DONE); this(alias, T_DONE);
} }
private TDone(Name alias, Table<TDoneRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.t_done</code> table reference
} */
public TDone() {
private TDone(Name alias, Table<TDoneRecord> aliased, Field<?>[] parameters) { this(DSL.name("t_done"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> TDone(Table<O> child, ForeignKey<O, TDoneRecord> key) { public <O extends Record> TDone(Table<O> child, ForeignKey<O, TDoneRecord> key) {
@ -139,8 +134,39 @@ public class TDone extends TableImpl<TDoneRecord> {
} }
@Override @Override
public List<Index> getIndexes() { public Identity<TDoneRecord, Integer> getIdentity() {
return Arrays.<Index>asList(Indexes.T_DONE_PKEY); return (Identity<TDoneRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<TDoneRecord> getPrimaryKey() {
return Keys.T_DONE_PKEY;
}
@Override
public List<UniqueKey<TDoneRecord>> getKeys() {
return Arrays.<UniqueKey<TDoneRecord>>asList(Keys.T_DONE_PKEY);
}
@Override
public List<ForeignKey<TDoneRecord, ?>> getReferences() {
return Arrays.<ForeignKey<TDoneRecord, ?>>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);
}
public TProject tProject() {
return new TProject(this, Keys.T_DONE__T_DONE_FK_PROJECT_FKEY);
}
public TModule tModule() {
return new TModule(this, Keys.T_DONE__T_DONE_FK_JOB_FKEY);
}
public TJob tJob() {
return new TJob(this, Keys.T_DONE__T_DONE_FK_CATEGORY_FKEY);
}
public TLogin tLogin() {
return new TLogin(this, Keys.T_DONE__T_DONE_FK_LOGIN_FKEY);
} }
@Override @Override
@ -174,7 +200,7 @@ public class TDone extends TableImpl<TDoneRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row9<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer, String> fieldsRow() { public Row9<LocalDateTime, Integer, LocalDateTime, LocalDateTime, Integer, Integer, Integer, Integer, String> fieldsRow() {
return (Row9) super.fieldsRow(); return (Row9) super.fieldsRow();
} }
} }

View File

@ -5,42 +5,36 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.Indexes; import de.jottyfan.timetrack.db.done.Keys;
import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; import de.jottyfan.timetrack.db.done.tables.records.TJobRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Identity;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row3; import org.jooq.Row3;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TJob extends TableImpl<TJobRecord> { public class TJob extends TableImpl<TJobRecord> {
private static final long serialVersionUID = 1198013806; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.t_job</code> * The reference instance of <code>done.t_job</code>
@ -58,23 +52,24 @@ public class TJob extends TableImpl<TJobRecord> {
/** /**
* The column <code>done.t_job.lastchange</code>. * The column <code>done.t_job.lastchange</code>.
*/ */
public final TableField<TJobRecord, Timestamp> LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); public final TableField<TJobRecord, LocalDateTime> LASTCHANGE = createField(DSL.name("lastchange"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field("now()", SQLDataType.LOCALDATETIME)), this, "");
/** /**
* The column <code>done.t_job.pk</code>. * The column <code>done.t_job.pk</code>.
*/ */
public final TableField<TJobRecord, Integer> PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TJobRecord, Integer> PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/** /**
* The column <code>done.t_job.name</code>. * The column <code>done.t_job.name</code>.
*/ */
public final TableField<TJobRecord, String> NAME = createField(DSL.name("name"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); public final TableField<TJobRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
/** private TJob(Name alias, Table<TJobRecord> aliased) {
* Create a <code>done.t_job</code> table reference this(alias, aliased, null);
*/ }
public TJob() {
this(DSL.name("t_job"), null); private TJob(Name alias, Table<TJobRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
} }
/** /**
@ -91,12 +86,11 @@ public class TJob extends TableImpl<TJobRecord> {
this(alias, T_JOB); this(alias, T_JOB);
} }
private TJob(Name alias, Table<TJobRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.t_job</code> table reference
} */
public TJob() {
private TJob(Name alias, Table<TJobRecord> aliased, Field<?>[] parameters) { this(DSL.name("t_job"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> TJob(Table<O> child, ForeignKey<O, TJobRecord> key) { public <O extends Record> TJob(Table<O> child, ForeignKey<O, TJobRecord> key) {
@ -109,8 +103,18 @@ public class TJob extends TableImpl<TJobRecord> {
} }
@Override @Override
public List<Index> getIndexes() { public Identity<TJobRecord, Integer> getIdentity() {
return Arrays.<Index>asList(Indexes.T_CATEGORY_NAME_KEY, Indexes.T_CATEGORY_PKEY); return (Identity<TJobRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<TJobRecord> getPrimaryKey() {
return Keys.T_CATEGORY_PKEY;
}
@Override
public List<UniqueKey<TJobRecord>> getKeys() {
return Arrays.<UniqueKey<TJobRecord>>asList(Keys.T_CATEGORY_PKEY, Keys.T_CATEGORY_NAME_KEY);
} }
@Override @Override
@ -144,7 +148,7 @@ public class TJob extends TableImpl<TJobRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row3<Timestamp, Integer, String> fieldsRow() { public Row3<LocalDateTime, Integer, String> fieldsRow() {
return (Row3) super.fieldsRow(); return (Row3) super.fieldsRow();
} }
} }

View File

@ -5,42 +5,36 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.Indexes; import de.jottyfan.timetrack.db.done.Keys;
import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Identity;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row3; import org.jooq.Row3;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TModule extends TableImpl<TModuleRecord> { public class TModule extends TableImpl<TModuleRecord> {
private static final long serialVersionUID = 1195797689; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.t_module</code> * The reference instance of <code>done.t_module</code>
@ -58,23 +52,24 @@ public class TModule extends TableImpl<TModuleRecord> {
/** /**
* The column <code>done.t_module.lastchange</code>. * The column <code>done.t_module.lastchange</code>.
*/ */
public final TableField<TModuleRecord, Timestamp> LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); public final TableField<TModuleRecord, LocalDateTime> LASTCHANGE = createField(DSL.name("lastchange"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field("now()", SQLDataType.LOCALDATETIME)), this, "");
/** /**
* The column <code>done.t_module.pk</code>. * The column <code>done.t_module.pk</code>.
*/ */
public final TableField<TModuleRecord, Integer> PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TModuleRecord, Integer> PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/** /**
* The column <code>done.t_module.name</code>. * The column <code>done.t_module.name</code>.
*/ */
public final TableField<TModuleRecord, String> NAME = createField(DSL.name("name"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); public final TableField<TModuleRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
/** private TModule(Name alias, Table<TModuleRecord> aliased) {
* Create a <code>done.t_module</code> table reference this(alias, aliased, null);
*/ }
public TModule() {
this(DSL.name("t_module"), null); private TModule(Name alias, Table<TModuleRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
} }
/** /**
@ -91,12 +86,11 @@ public class TModule extends TableImpl<TModuleRecord> {
this(alias, T_MODULE); this(alias, T_MODULE);
} }
private TModule(Name alias, Table<TModuleRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.t_module</code> table reference
} */
public TModule() {
private TModule(Name alias, Table<TModuleRecord> aliased, Field<?>[] parameters) { this(DSL.name("t_module"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> TModule(Table<O> child, ForeignKey<O, TModuleRecord> key) { public <O extends Record> TModule(Table<O> child, ForeignKey<O, TModuleRecord> key) {
@ -109,8 +103,18 @@ public class TModule extends TableImpl<TModuleRecord> {
} }
@Override @Override
public List<Index> getIndexes() { public Identity<TModuleRecord, Integer> getIdentity() {
return Arrays.<Index>asList(Indexes.T_JOB_NAME_KEY, Indexes.T_JOB_PKEY); return (Identity<TModuleRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<TModuleRecord> getPrimaryKey() {
return Keys.T_JOB_PKEY;
}
@Override
public List<UniqueKey<TModuleRecord>> getKeys() {
return Arrays.<UniqueKey<TModuleRecord>>asList(Keys.T_JOB_PKEY, Keys.T_JOB_NAME_KEY);
} }
@Override @Override
@ -144,7 +148,7 @@ public class TModule extends TableImpl<TModuleRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row3<Timestamp, Integer, String> fieldsRow() { public Row3<LocalDateTime, Integer, String> fieldsRow() {
return (Row3) super.fieldsRow(); return (Row3) super.fieldsRow();
} }
} }

View File

@ -5,42 +5,36 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.Indexes; import de.jottyfan.timetrack.db.done.Keys;
import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Identity;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row3; import org.jooq.Row3;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TProject extends TableImpl<TProjectRecord> { public class TProject extends TableImpl<TProjectRecord> {
private static final long serialVersionUID = 760221750; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.t_project</code> * The reference instance of <code>done.t_project</code>
@ -58,23 +52,24 @@ public class TProject extends TableImpl<TProjectRecord> {
/** /**
* The column <code>done.t_project.lastchange</code>. * The column <code>done.t_project.lastchange</code>.
*/ */
public final TableField<TProjectRecord, Timestamp> LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); public final TableField<TProjectRecord, LocalDateTime> LASTCHANGE = createField(DSL.name("lastchange"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field("now()", SQLDataType.LOCALDATETIME)), this, "");
/** /**
* The column <code>done.t_project.pk</code>. * The column <code>done.t_project.pk</code>.
*/ */
public final TableField<TProjectRecord, Integer> PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TProjectRecord, Integer> PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/** /**
* The column <code>done.t_project.name</code>. * The column <code>done.t_project.name</code>.
*/ */
public final TableField<TProjectRecord, String> NAME = createField(DSL.name("name"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); public final TableField<TProjectRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
/** private TProject(Name alias, Table<TProjectRecord> aliased) {
* Create a <code>done.t_project</code> table reference this(alias, aliased, null);
*/ }
public TProject() {
this(DSL.name("t_project"), null); private TProject(Name alias, Table<TProjectRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
} }
/** /**
@ -91,12 +86,11 @@ public class TProject extends TableImpl<TProjectRecord> {
this(alias, T_PROJECT); this(alias, T_PROJECT);
} }
private TProject(Name alias, Table<TProjectRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.t_project</code> table reference
} */
public TProject() {
private TProject(Name alias, Table<TProjectRecord> aliased, Field<?>[] parameters) { this(DSL.name("t_project"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> TProject(Table<O> child, ForeignKey<O, TProjectRecord> key) { public <O extends Record> TProject(Table<O> child, ForeignKey<O, TProjectRecord> key) {
@ -109,8 +103,18 @@ public class TProject extends TableImpl<TProjectRecord> {
} }
@Override @Override
public List<Index> getIndexes() { public Identity<TProjectRecord, Integer> getIdentity() {
return Arrays.<Index>asList(Indexes.T_PROJECT_NAME_KEY, Indexes.T_PROJECT_PKEY); return (Identity<TProjectRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<TProjectRecord> getPrimaryKey() {
return Keys.T_PROJECT_PKEY;
}
@Override
public List<UniqueKey<TProjectRecord>> getKeys() {
return Arrays.<UniqueKey<TProjectRecord>>asList(Keys.T_PROJECT_PKEY, Keys.T_PROJECT_NAME_KEY);
} }
@Override @Override
@ -144,7 +148,7 @@ public class TProject extends TableImpl<TProjectRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row3<Timestamp, Integer, String> fieldsRow() { public Row3<LocalDateTime, Integer, String> fieldsRow() {
return (Row3) super.fieldsRow(); return (Row3) super.fieldsRow();
} }
} }

View File

@ -7,8 +7,6 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VDailyRecord; import de.jottyfan.timetrack.db.done.tables.records.VDailyRecord;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Name; import org.jooq.Name;
@ -17,7 +15,9 @@ import org.jooq.Row4;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
import org.jooq.types.YearToSecond; import org.jooq.types.YearToSecond;
@ -25,17 +25,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaily extends TableImpl<VDailyRecord> { public class VDaily extends TableImpl<VDailyRecord> {
private static final long serialVersionUID = -310161174; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_daily</code> * The reference instance of <code>done.v_daily</code>
@ -53,28 +46,29 @@ public class VDaily extends TableImpl<VDailyRecord> {
/** /**
* The column <code>done.v_daily.worktime</code>. * The column <code>done.v_daily.worktime</code>.
*/ */
public final TableField<VDailyRecord, YearToSecond> WORKTIME = createField(DSL.name("worktime"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); public final TableField<VDailyRecord, YearToSecond> WORKTIME = createField(DSL.name("worktime"), SQLDataType.INTERVAL, this, "");
/** /**
* The column <code>done.v_daily.day</code>. * The column <code>done.v_daily.day</code>.
*/ */
public final TableField<VDailyRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDailyRecord, String> DAY = createField(DSL.name("day"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_daily.login</code>. * The column <code>done.v_daily.login</code>.
*/ */
public final TableField<VDailyRecord, String> LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDailyRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_daily.fk_login</code>. * The column <code>done.v_daily.fk_login</code>.
*/ */
public final TableField<VDailyRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VDailyRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** private VDaily(Name alias, Table<VDailyRecord> aliased) {
* Create a <code>done.v_daily</code> table reference this(alias, aliased, null);
*/ }
public VDaily() {
this(DSL.name("v_daily"), null); private VDaily(Name alias, Table<VDailyRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -91,12 +85,11 @@ public class VDaily extends TableImpl<VDailyRecord> {
this(alias, V_DAILY); this(alias, V_DAILY);
} }
private VDaily(Name alias, Table<VDailyRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_daily</code> table reference
} */
public VDaily() {
private VDaily(Name alias, Table<VDailyRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_daily"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VDaily(Table<O> child, ForeignKey<O, VDailyRecord> key) { public <O extends Record> VDaily(Table<O> child, ForeignKey<O, VDailyRecord> key) {

View File

@ -7,11 +7,9 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VDaylimitsRecord; import de.jottyfan.timetrack.db.done.tables.records.VDaylimitsRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Name; import org.jooq.Name;
@ -20,24 +18,19 @@ import org.jooq.Row4;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaylimits extends TableImpl<VDaylimitsRecord> { public class VDaylimits extends TableImpl<VDaylimitsRecord> {
private static final long serialVersionUID = -1022072072; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_daylimits</code> * The reference instance of <code>done.v_daylimits</code>
@ -55,28 +48,29 @@ public class VDaylimits extends TableImpl<VDaylimitsRecord> {
/** /**
* The column <code>done.v_daylimits.work_start</code>. * The column <code>done.v_daylimits.work_start</code>.
*/ */
public final TableField<VDaylimitsRecord, Timestamp> WORK_START = createField(DSL.name("work_start"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); public final TableField<VDaylimitsRecord, LocalDateTime> WORK_START = createField(DSL.name("work_start"), SQLDataType.LOCALDATETIME(6), this, "");
/** /**
* The column <code>done.v_daylimits.work_end</code>. * The column <code>done.v_daylimits.work_end</code>.
*/ */
public final TableField<VDaylimitsRecord, OffsetDateTime> WORK_END = createField(DSL.name("work_end"), org.jooq.impl.SQLDataType.TIMESTAMPWITHTIMEZONE, this, ""); public final TableField<VDaylimitsRecord, OffsetDateTime> WORK_END = createField(DSL.name("work_end"), SQLDataType.TIMESTAMPWITHTIMEZONE(6), this, "");
/** /**
* The column <code>done.v_daylimits.day</code>. * The column <code>done.v_daylimits.day</code>.
*/ */
public final TableField<VDaylimitsRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDaylimitsRecord, String> DAY = createField(DSL.name("day"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_daylimits.fk_login</code>. * The column <code>done.v_daylimits.fk_login</code>.
*/ */
public final TableField<VDaylimitsRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VDaylimitsRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** private VDaylimits(Name alias, Table<VDaylimitsRecord> aliased) {
* Create a <code>done.v_daylimits</code> table reference this(alias, aliased, null);
*/ }
public VDaylimits() {
this(DSL.name("v_daylimits"), null); private VDaylimits(Name alias, Table<VDaylimitsRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -93,12 +87,11 @@ public class VDaylimits extends TableImpl<VDaylimitsRecord> {
this(alias, V_DAYLIMITS); this(alias, V_DAYLIMITS);
} }
private VDaylimits(Name alias, Table<VDaylimitsRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_daylimits</code> table reference
} */
public VDaylimits() {
private VDaylimits(Name alias, Table<VDaylimitsRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_daylimits"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VDaylimits(Table<O> child, ForeignKey<O, VDaylimitsRecord> key) { public <O extends Record> VDaylimits(Table<O> child, ForeignKey<O, VDaylimitsRecord> key) {
@ -141,7 +134,7 @@ public class VDaylimits extends TableImpl<VDaylimitsRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row4<Timestamp, OffsetDateTime, String, Integer> fieldsRow() { public Row4<LocalDateTime, OffsetDateTime, String, Integer> fieldsRow() {
return (Row4) super.fieldsRow(); return (Row4) super.fieldsRow();
} }
} }

View File

@ -7,11 +7,9 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VDaysummaryRecord; import de.jottyfan.timetrack.db.done.tables.records.VDaysummaryRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Name; import org.jooq.Name;
@ -20,7 +18,9 @@ import org.jooq.Row7;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
import org.jooq.types.YearToSecond; import org.jooq.types.YearToSecond;
@ -28,17 +28,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaysummary extends TableImpl<VDaysummaryRecord> { public class VDaysummary extends TableImpl<VDaysummaryRecord> {
private static final long serialVersionUID = 1541117915; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_daysummary</code> * The reference instance of <code>done.v_daysummary</code>
@ -56,43 +49,44 @@ public class VDaysummary extends TableImpl<VDaysummaryRecord> {
/** /**
* The column <code>done.v_daysummary.breaktime</code>. * The column <code>done.v_daysummary.breaktime</code>.
*/ */
public final TableField<VDaysummaryRecord, YearToSecond> BREAKTIME = createField(DSL.name("breaktime"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); public final TableField<VDaysummaryRecord, YearToSecond> BREAKTIME = createField(DSL.name("breaktime"), SQLDataType.INTERVAL, this, "");
/** /**
* The column <code>done.v_daysummary.worktime</code>. * The column <code>done.v_daysummary.worktime</code>.
*/ */
public final TableField<VDaysummaryRecord, YearToSecond> WORKTIME = createField(DSL.name("worktime"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); public final TableField<VDaysummaryRecord, YearToSecond> WORKTIME = createField(DSL.name("worktime"), SQLDataType.INTERVAL, this, "");
/** /**
* The column <code>done.v_daysummary.work_start</code>. * The column <code>done.v_daysummary.work_start</code>.
*/ */
public final TableField<VDaysummaryRecord, Timestamp> WORK_START = createField(DSL.name("work_start"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); public final TableField<VDaysummaryRecord, LocalDateTime> WORK_START = createField(DSL.name("work_start"), SQLDataType.LOCALDATETIME(6), this, "");
/** /**
* The column <code>done.v_daysummary.work_end</code>. * The column <code>done.v_daysummary.work_end</code>.
*/ */
public final TableField<VDaysummaryRecord, OffsetDateTime> WORK_END = createField(DSL.name("work_end"), org.jooq.impl.SQLDataType.TIMESTAMPWITHTIMEZONE, this, ""); public final TableField<VDaysummaryRecord, OffsetDateTime> WORK_END = createField(DSL.name("work_end"), SQLDataType.TIMESTAMPWITHTIMEZONE(6), this, "");
/** /**
* The column <code>done.v_daysummary.day</code>. * The column <code>done.v_daysummary.day</code>.
*/ */
public final TableField<VDaysummaryRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDaysummaryRecord, String> DAY = createField(DSL.name("day"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_daysummary.login</code>. * The column <code>done.v_daysummary.login</code>.
*/ */
public final TableField<VDaysummaryRecord, String> LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDaysummaryRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_daysummary.fk_login</code>. * The column <code>done.v_daysummary.fk_login</code>.
*/ */
public final TableField<VDaysummaryRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VDaysummaryRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** private VDaysummary(Name alias, Table<VDaysummaryRecord> aliased) {
* Create a <code>done.v_daysummary</code> table reference this(alias, aliased, null);
*/ }
public VDaysummary() {
this(DSL.name("v_daysummary"), null); private VDaysummary(Name alias, Table<VDaysummaryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -109,12 +103,11 @@ public class VDaysummary extends TableImpl<VDaysummaryRecord> {
this(alias, V_DAYSUMMARY); this(alias, V_DAYSUMMARY);
} }
private VDaysummary(Name alias, Table<VDaysummaryRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_daysummary</code> table reference
} */
public VDaysummary() {
private VDaysummary(Name alias, Table<VDaysummaryRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_daysummary"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VDaysummary(Table<O> child, ForeignKey<O, VDaysummaryRecord> key) { public <O extends Record> VDaysummary(Table<O> child, ForeignKey<O, VDaysummaryRecord> key) {
@ -157,7 +150,7 @@ public class VDaysummary extends TableImpl<VDaysummaryRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row7<YearToSecond, YearToSecond, Timestamp, OffsetDateTime, String, String, Integer> fieldsRow() { public Row7<YearToSecond, YearToSecond, LocalDateTime, OffsetDateTime, String, String, Integer> fieldsRow() {
return (Row7) super.fieldsRow(); return (Row7) super.fieldsRow();
} }
} }

View File

@ -7,9 +7,7 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VDoneRecord; import de.jottyfan.timetrack.db.done.tables.records.VDoneRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -19,24 +17,19 @@ import org.jooq.Row8;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDone extends TableImpl<VDoneRecord> { public class VDone extends TableImpl<VDoneRecord> {
private static final long serialVersionUID = -1832237834; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_done</code> * The reference instance of <code>done.v_done</code>
@ -54,48 +47,49 @@ public class VDone extends TableImpl<VDoneRecord> {
/** /**
* The column <code>done.v_done.fk_done</code>. * The column <code>done.v_done.fk_done</code>.
*/ */
public final TableField<VDoneRecord, Integer> FK_DONE = createField(DSL.name("fk_done"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VDoneRecord, Integer> FK_DONE = createField(DSL.name("fk_done"), SQLDataType.INTEGER, this, "");
/** /**
* The column <code>done.v_done.fk_login</code>. * The column <code>done.v_done.fk_login</code>.
*/ */
public final TableField<VDoneRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VDoneRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** /**
* The column <code>done.v_done.time_from</code>. * The column <code>done.v_done.time_from</code>.
*/ */
public final TableField<VDoneRecord, Timestamp> TIME_FROM = createField(DSL.name("time_from"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); public final TableField<VDoneRecord, LocalDateTime> TIME_FROM = createField(DSL.name("time_from"), SQLDataType.LOCALDATETIME(6), this, "");
/** /**
* The column <code>done.v_done.time_until</code>. * The column <code>done.v_done.time_until</code>.
*/ */
public final TableField<VDoneRecord, Timestamp> TIME_UNTIL = createField(DSL.name("time_until"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); public final TableField<VDoneRecord, LocalDateTime> TIME_UNTIL = createField(DSL.name("time_until"), SQLDataType.LOCALDATETIME(6), this, "");
/** /**
* The column <code>done.v_done.project_name</code>. * The column <code>done.v_done.project_name</code>.
*/ */
public final TableField<VDoneRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDoneRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_done.module_name</code>. * The column <code>done.v_done.module_name</code>.
*/ */
public final TableField<VDoneRecord, String> MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDoneRecord, String> MODULE_NAME = createField(DSL.name("module_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_done.job_name</code>. * The column <code>done.v_done.job_name</code>.
*/ */
public final TableField<VDoneRecord, String> JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDoneRecord, String> JOB_NAME = createField(DSL.name("job_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_done.login</code>. * The column <code>done.v_done.login</code>.
*/ */
public final TableField<VDoneRecord, String> LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDoneRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB, this, "");
/** private VDone(Name alias, Table<VDoneRecord> aliased) {
* Create a <code>done.v_done</code> table reference this(alias, aliased, null);
*/ }
public VDone() {
this(DSL.name("v_done"), null); private VDone(Name alias, Table<VDoneRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -112,12 +106,11 @@ public class VDone extends TableImpl<VDoneRecord> {
this(alias, V_DONE); this(alias, V_DONE);
} }
private VDone(Name alias, Table<VDoneRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_done</code> table reference
} */
public VDone() {
private VDone(Name alias, Table<VDoneRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_done"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VDone(Table<O> child, ForeignKey<O, VDoneRecord> key) { public <O extends Record> VDone(Table<O> child, ForeignKey<O, VDoneRecord> key) {
@ -160,7 +153,7 @@ public class VDone extends TableImpl<VDoneRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row8<Integer, Integer, Timestamp, Timestamp, String, String, String, String> fieldsRow() { public Row8<Integer, Integer, LocalDateTime, LocalDateTime, String, String, String, String> fieldsRow() {
return (Row8) super.fieldsRow(); return (Row8) super.fieldsRow();
} }
} }

View File

@ -7,8 +7,6 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VDurationRecord; import de.jottyfan.timetrack.db.done.tables.records.VDurationRecord;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Name; import org.jooq.Name;
@ -17,7 +15,9 @@ import org.jooq.Row7;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
import org.jooq.types.YearToSecond; import org.jooq.types.YearToSecond;
@ -25,17 +25,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDuration extends TableImpl<VDurationRecord> { public class VDuration extends TableImpl<VDurationRecord> {
private static final long serialVersionUID = -942666083; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_duration</code> * The reference instance of <code>done.v_duration</code>
@ -53,43 +46,44 @@ public class VDuration extends TableImpl<VDurationRecord> {
/** /**
* The column <code>done.v_duration.day</code>. * The column <code>done.v_duration.day</code>.
*/ */
public final TableField<VDurationRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDurationRecord, String> DAY = createField(DSL.name("day"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_duration.duration</code>. * The column <code>done.v_duration.duration</code>.
*/ */
public final TableField<VDurationRecord, YearToSecond> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); public final TableField<VDurationRecord, YearToSecond> DURATION = createField(DSL.name("duration"), SQLDataType.INTERVAL, this, "");
/** /**
* The column <code>done.v_duration.project_name</code>. * The column <code>done.v_duration.project_name</code>.
*/ */
public final TableField<VDurationRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDurationRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_duration.module_name</code>. * The column <code>done.v_duration.module_name</code>.
*/ */
public final TableField<VDurationRecord, String> MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDurationRecord, String> MODULE_NAME = createField(DSL.name("module_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_duration.job_name</code>. * The column <code>done.v_duration.job_name</code>.
*/ */
public final TableField<VDurationRecord, String> JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDurationRecord, String> JOB_NAME = createField(DSL.name("job_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_duration.login</code>. * The column <code>done.v_duration.login</code>.
*/ */
public final TableField<VDurationRecord, String> LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VDurationRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_duration.fk_login</code>. * The column <code>done.v_duration.fk_login</code>.
*/ */
public final TableField<VDurationRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VDurationRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** private VDuration(Name alias, Table<VDurationRecord> aliased) {
* Create a <code>done.v_duration</code> table reference this(alias, aliased, null);
*/ }
public VDuration() {
this(DSL.name("v_duration"), null); private VDuration(Name alias, Table<VDurationRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -106,12 +100,11 @@ public class VDuration extends TableImpl<VDurationRecord> {
this(alias, V_DURATION); this(alias, V_DURATION);
} }
private VDuration(Name alias, Table<VDurationRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_duration</code> table reference
} */
public VDuration() {
private VDuration(Name alias, Table<VDurationRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_duration"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VDuration(Table<O> child, ForeignKey<O, VDurationRecord> key) { public <O extends Record> VDuration(Table<O> child, ForeignKey<O, VDurationRecord> key) {

View File

@ -7,9 +7,7 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VEucanshareRecord; import de.jottyfan.timetrack.db.done.tables.records.VEucanshareRecord;
import java.sql.Date; import java.time.LocalDate;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -19,7 +17,9 @@ import org.jooq.Row8;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
import org.jooq.types.YearToSecond; import org.jooq.types.YearToSecond;
@ -27,17 +27,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VEucanshare extends TableImpl<VEucanshareRecord> { public class VEucanshare extends TableImpl<VEucanshareRecord> {
private static final long serialVersionUID = 1375477301; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_eucanshare</code> * The reference instance of <code>done.v_eucanshare</code>
@ -55,48 +48,49 @@ public class VEucanshare extends TableImpl<VEucanshareRecord> {
/** /**
* The column <code>done.v_eucanshare.fk_done</code>. * The column <code>done.v_eucanshare.fk_done</code>.
*/ */
public final TableField<VEucanshareRecord, Integer> FK_DONE = createField(DSL.name("fk_done"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VEucanshareRecord, Integer> FK_DONE = createField(DSL.name("fk_done"), SQLDataType.INTEGER, this, "");
/** /**
* The column <code>done.v_eucanshare.workday</code>. * The column <code>done.v_eucanshare.workday</code>.
*/ */
public final TableField<VEucanshareRecord, Date> WORKDAY = createField(DSL.name("workday"), org.jooq.impl.SQLDataType.DATE, this, ""); public final TableField<VEucanshareRecord, LocalDate> WORKDAY = createField(DSL.name("workday"), SQLDataType.LOCALDATE, this, "");
/** /**
* The column <code>done.v_eucanshare.duration</code>. * The column <code>done.v_eucanshare.duration</code>.
*/ */
public final TableField<VEucanshareRecord, YearToSecond> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); public final TableField<VEucanshareRecord, YearToSecond> DURATION = createField(DSL.name("duration"), SQLDataType.INTERVAL, this, "");
/** /**
* The column <code>done.v_eucanshare.project_name</code>. * The column <code>done.v_eucanshare.project_name</code>.
*/ */
public final TableField<VEucanshareRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VEucanshareRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_eucanshare.module_name</code>. * The column <code>done.v_eucanshare.module_name</code>.
*/ */
public final TableField<VEucanshareRecord, String> MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VEucanshareRecord, String> MODULE_NAME = createField(DSL.name("module_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_eucanshare.job_name</code>. * The column <code>done.v_eucanshare.job_name</code>.
*/ */
public final TableField<VEucanshareRecord, String> JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VEucanshareRecord, String> JOB_NAME = createField(DSL.name("job_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_eucanshare.fk_login</code>. * The column <code>done.v_eucanshare.fk_login</code>.
*/ */
public final TableField<VEucanshareRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VEucanshareRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** /**
* The column <code>done.v_eucanshare.wp</code>. * The column <code>done.v_eucanshare.wp</code>.
*/ */
public final TableField<VEucanshareRecord, String> WP = createField(DSL.name("wp"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VEucanshareRecord, String> WP = createField(DSL.name("wp"), SQLDataType.CLOB, this, "");
/** private VEucanshare(Name alias, Table<VEucanshareRecord> aliased) {
* Create a <code>done.v_eucanshare</code> table reference this(alias, aliased, null);
*/ }
public VEucanshare() {
this(DSL.name("v_eucanshare"), null); private VEucanshare(Name alias, Table<VEucanshareRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -113,12 +107,11 @@ public class VEucanshare extends TableImpl<VEucanshareRecord> {
this(alias, V_EUCANSHARE); this(alias, V_EUCANSHARE);
} }
private VEucanshare(Name alias, Table<VEucanshareRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_eucanshare</code> table reference
} */
public VEucanshare() {
private VEucanshare(Name alias, Table<VEucanshareRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_eucanshare"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VEucanshare(Table<O> child, ForeignKey<O, VEucanshareRecord> key) { public <O extends Record> VEucanshare(Table<O> child, ForeignKey<O, VEucanshareRecord> key) {
@ -161,7 +154,7 @@ public class VEucanshare extends TableImpl<VEucanshareRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row8<Integer, Date, YearToSecond, String, String, String, Integer, String> fieldsRow() { public Row8<Integer, LocalDate, YearToSecond, String, String, String, Integer, String> fieldsRow() {
return (Row8) super.fieldsRow(); return (Row8) super.fieldsRow();
} }
} }

View File

@ -7,9 +7,7 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VHamsterRecord; import de.jottyfan.timetrack.db.done.tables.records.VHamsterRecord;
import java.sql.Date; import java.time.LocalDate;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -19,7 +17,9 @@ import org.jooq.Row6;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
import org.jooq.types.YearToSecond; import org.jooq.types.YearToSecond;
@ -27,17 +27,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VHamster extends TableImpl<VHamsterRecord> { public class VHamster extends TableImpl<VHamsterRecord> {
private static final long serialVersionUID = -1309111431; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_hamster</code> * The reference instance of <code>done.v_hamster</code>
@ -55,38 +48,39 @@ public class VHamster extends TableImpl<VHamsterRecord> {
/** /**
* The column <code>done.v_hamster.workday</code>. * The column <code>done.v_hamster.workday</code>.
*/ */
public final TableField<VHamsterRecord, Date> WORKDAY = createField(DSL.name("workday"), org.jooq.impl.SQLDataType.DATE, this, ""); public final TableField<VHamsterRecord, LocalDate> WORKDAY = createField(DSL.name("workday"), SQLDataType.LOCALDATE, this, "");
/** /**
* The column <code>done.v_hamster.duration</code>. * The column <code>done.v_hamster.duration</code>.
*/ */
public final TableField<VHamsterRecord, YearToSecond> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); public final TableField<VHamsterRecord, YearToSecond> DURATION = createField(DSL.name("duration"), SQLDataType.INTERVAL, this, "");
/** /**
* The column <code>done.v_hamster.project_name</code>. * The column <code>done.v_hamster.project_name</code>.
*/ */
public final TableField<VHamsterRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VHamsterRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_hamster.module_name</code>. * The column <code>done.v_hamster.module_name</code>.
*/ */
public final TableField<VHamsterRecord, String> MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VHamsterRecord, String> MODULE_NAME = createField(DSL.name("module_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_hamster.job_name</code>. * The column <code>done.v_hamster.job_name</code>.
*/ */
public final TableField<VHamsterRecord, String> JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VHamsterRecord, String> JOB_NAME = createField(DSL.name("job_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_hamster.login</code>. * The column <code>done.v_hamster.login</code>.
*/ */
public final TableField<VHamsterRecord, String> LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VHamsterRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB, this, "");
/** private VHamster(Name alias, Table<VHamsterRecord> aliased) {
* Create a <code>done.v_hamster</code> table reference this(alias, aliased, null);
*/ }
public VHamster() {
this(DSL.name("v_hamster"), null); private VHamster(Name alias, Table<VHamsterRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -103,12 +97,11 @@ public class VHamster extends TableImpl<VHamsterRecord> {
this(alias, V_HAMSTER); this(alias, V_HAMSTER);
} }
private VHamster(Name alias, Table<VHamsterRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_hamster</code> table reference
} */
public VHamster() {
private VHamster(Name alias, Table<VHamsterRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_hamster"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VHamster(Table<O> child, ForeignKey<O, VHamsterRecord> key) { public <O extends Record> VHamster(Table<O> child, ForeignKey<O, VHamsterRecord> key) {
@ -151,7 +144,7 @@ public class VHamster extends TableImpl<VHamsterRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row6<Date, YearToSecond, String, String, String, String> fieldsRow() { public Row6<LocalDate, YearToSecond, String, String, String, String> fieldsRow() {
return (Row6) super.fieldsRow(); return (Row6) super.fieldsRow();
} }
} }

View File

@ -7,9 +7,7 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VHamstersummaryRecord; import de.jottyfan.timetrack.db.done.tables.records.VHamstersummaryRecord;
import java.sql.Date; import java.time.LocalDate;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -19,24 +17,19 @@ import org.jooq.Row6;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VHamstersummary extends TableImpl<VHamstersummaryRecord> { public class VHamstersummary extends TableImpl<VHamstersummaryRecord> {
private static final long serialVersionUID = -1084154956; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_hamstersummary</code> * The reference instance of <code>done.v_hamstersummary</code>
@ -54,38 +47,39 @@ public class VHamstersummary extends TableImpl<VHamstersummaryRecord> {
/** /**
* The column <code>done.v_hamstersummary.workday</code>. * The column <code>done.v_hamstersummary.workday</code>.
*/ */
public final TableField<VHamstersummaryRecord, Date> WORKDAY = createField(DSL.name("workday"), org.jooq.impl.SQLDataType.DATE, this, ""); public final TableField<VHamstersummaryRecord, LocalDate> WORKDAY = createField(DSL.name("workday"), SQLDataType.LOCALDATE, this, "");
/** /**
* The column <code>done.v_hamstersummary.duration</code>. * The column <code>done.v_hamstersummary.duration</code>.
*/ */
public final TableField<VHamstersummaryRecord, String> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VHamstersummaryRecord, String> DURATION = createField(DSL.name("duration"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_hamstersummary.project_name</code>. * The column <code>done.v_hamstersummary.project_name</code>.
*/ */
public final TableField<VHamstersummaryRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VHamstersummaryRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_hamstersummary.module_name</code>. * The column <code>done.v_hamstersummary.module_name</code>.
*/ */
public final TableField<VHamstersummaryRecord, String> MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VHamstersummaryRecord, String> MODULE_NAME = createField(DSL.name("module_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_hamstersummary.job_name</code>. * The column <code>done.v_hamstersummary.job_name</code>.
*/ */
public final TableField<VHamstersummaryRecord, String> JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VHamstersummaryRecord, String> JOB_NAME = createField(DSL.name("job_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_hamstersummary.login</code>. * The column <code>done.v_hamstersummary.login</code>.
*/ */
public final TableField<VHamstersummaryRecord, String> LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VHamstersummaryRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB, this, "");
/** private VHamstersummary(Name alias, Table<VHamstersummaryRecord> aliased) {
* Create a <code>done.v_hamstersummary</code> table reference this(alias, aliased, null);
*/ }
public VHamstersummary() {
this(DSL.name("v_hamstersummary"), null); private VHamstersummary(Name alias, Table<VHamstersummaryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -102,12 +96,11 @@ public class VHamstersummary extends TableImpl<VHamstersummaryRecord> {
this(alias, V_HAMSTERSUMMARY); this(alias, V_HAMSTERSUMMARY);
} }
private VHamstersummary(Name alias, Table<VHamstersummaryRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_hamstersummary</code> table reference
} */
public VHamstersummary() {
private VHamstersummary(Name alias, Table<VHamstersummaryRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_hamstersummary"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VHamstersummary(Table<O> child, ForeignKey<O, VHamstersummaryRecord> key) { public <O extends Record> VHamstersummary(Table<O> child, ForeignKey<O, VHamstersummaryRecord> key) {
@ -150,7 +143,7 @@ public class VHamstersummary extends TableImpl<VHamstersummaryRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row6<Date, String, String, String, String, String> fieldsRow() { public Row6<LocalDate, String, String, String, String, String> fieldsRow() {
return (Row6) super.fieldsRow(); return (Row6) super.fieldsRow();
} }
} }

View File

@ -7,8 +7,6 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VTasklistRecord; import de.jottyfan.timetrack.db.done.tables.records.VTasklistRecord;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Name; import org.jooq.Name;
@ -17,24 +15,19 @@ import org.jooq.Row6;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTasklist extends TableImpl<VTasklistRecord> { public class VTasklist extends TableImpl<VTasklistRecord> {
private static final long serialVersionUID = -601090984; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_tasklist</code> * The reference instance of <code>done.v_tasklist</code>
@ -52,38 +45,39 @@ public class VTasklist extends TableImpl<VTasklistRecord> {
/** /**
* The column <code>done.v_tasklist.day</code>. * The column <code>done.v_tasklist.day</code>.
*/ */
public final TableField<VTasklistRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTasklistRecord, String> DAY = createField(DSL.name("day"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_tasklist.duration</code>. * The column <code>done.v_tasklist.duration</code>.
*/ */
public final TableField<VTasklistRecord, String> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTasklistRecord, String> DURATION = createField(DSL.name("duration"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_tasklist.project_name</code>. * The column <code>done.v_tasklist.project_name</code>.
*/ */
public final TableField<VTasklistRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTasklistRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_tasklist.module_name</code>. * The column <code>done.v_tasklist.module_name</code>.
*/ */
public final TableField<VTasklistRecord, String> MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTasklistRecord, String> MODULE_NAME = createField(DSL.name("module_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_tasklist.job_name</code>. * The column <code>done.v_tasklist.job_name</code>.
*/ */
public final TableField<VTasklistRecord, String> JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTasklistRecord, String> JOB_NAME = createField(DSL.name("job_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_tasklist.fk_login</code>. * The column <code>done.v_tasklist.fk_login</code>.
*/ */
public final TableField<VTasklistRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VTasklistRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** private VTasklist(Name alias, Table<VTasklistRecord> aliased) {
* Create a <code>done.v_tasklist</code> table reference this(alias, aliased, null);
*/ }
public VTasklist() {
this(DSL.name("v_tasklist"), null); private VTasklist(Name alias, Table<VTasklistRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -100,12 +94,11 @@ public class VTasklist extends TableImpl<VTasklistRecord> {
this(alias, V_TASKLIST); this(alias, V_TASKLIST);
} }
private VTasklist(Name alias, Table<VTasklistRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_tasklist</code> table reference
} */
public VTasklist() {
private VTasklist(Name alias, Table<VTasklistRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_tasklist"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VTasklist(Table<O> child, ForeignKey<O, VTasklistRecord> key) { public <O extends Record> VTasklist(Table<O> child, ForeignKey<O, VTasklistRecord> key) {

View File

@ -7,8 +7,6 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VTimelengthRecord; import de.jottyfan.timetrack.db.done.tables.records.VTimelengthRecord;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Name; import org.jooq.Name;
@ -17,7 +15,9 @@ import org.jooq.Row4;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
import org.jooq.types.YearToSecond; import org.jooq.types.YearToSecond;
@ -25,17 +25,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTimelength extends TableImpl<VTimelengthRecord> { public class VTimelength extends TableImpl<VTimelengthRecord> {
private static final long serialVersionUID = -181048501; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_timelength</code> * The reference instance of <code>done.v_timelength</code>
@ -53,28 +46,29 @@ public class VTimelength extends TableImpl<VTimelengthRecord> {
/** /**
* The column <code>done.v_timelength.day</code>. * The column <code>done.v_timelength.day</code>.
*/ */
public final TableField<VTimelengthRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTimelengthRecord, String> DAY = createField(DSL.name("day"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_timelength.duration</code>. * The column <code>done.v_timelength.duration</code>.
*/ */
public final TableField<VTimelengthRecord, YearToSecond> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); public final TableField<VTimelengthRecord, YearToSecond> DURATION = createField(DSL.name("duration"), SQLDataType.INTERVAL, this, "");
/** /**
* The column <code>done.v_timelength.fk_done</code>. * The column <code>done.v_timelength.fk_done</code>.
*/ */
public final TableField<VTimelengthRecord, Integer> FK_DONE = createField(DSL.name("fk_done"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VTimelengthRecord, Integer> FK_DONE = createField(DSL.name("fk_done"), SQLDataType.INTEGER, this, "");
/** /**
* The column <code>done.v_timelength.fk_login</code>. * The column <code>done.v_timelength.fk_login</code>.
*/ */
public final TableField<VTimelengthRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VTimelengthRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** private VTimelength(Name alias, Table<VTimelengthRecord> aliased) {
* Create a <code>done.v_timelength</code> table reference this(alias, aliased, null);
*/ }
public VTimelength() {
this(DSL.name("v_timelength"), null); private VTimelength(Name alias, Table<VTimelengthRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -91,12 +85,11 @@ public class VTimelength extends TableImpl<VTimelengthRecord> {
this(alias, V_TIMELENGTH); this(alias, V_TIMELENGTH);
} }
private VTimelength(Name alias, Table<VTimelengthRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_timelength</code> table reference
} */
public VTimelength() {
private VTimelength(Name alias, Table<VTimelengthRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_timelength"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VTimelength(Table<O> child, ForeignKey<O, VTimelengthRecord> key) { public <O extends Record> VTimelength(Table<O> child, ForeignKey<O, VTimelengthRecord> key) {

View File

@ -7,8 +7,6 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VTotalofdayRecord; import de.jottyfan.timetrack.db.done.tables.records.VTotalofdayRecord;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Name; import org.jooq.Name;
@ -17,24 +15,19 @@ import org.jooq.Row6;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTotalofday extends TableImpl<VTotalofdayRecord> { public class VTotalofday extends TableImpl<VTotalofdayRecord> {
private static final long serialVersionUID = 46814145; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_totalofday</code> * The reference instance of <code>done.v_totalofday</code>
@ -52,38 +45,39 @@ public class VTotalofday extends TableImpl<VTotalofdayRecord> {
/** /**
* The column <code>done.v_totalofday.breaktime</code>. * The column <code>done.v_totalofday.breaktime</code>.
*/ */
public final TableField<VTotalofdayRecord, String> BREAKTIME = createField(DSL.name("breaktime"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTotalofdayRecord, String> BREAKTIME = createField(DSL.name("breaktime"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_totalofday.worktime</code>. * The column <code>done.v_totalofday.worktime</code>.
*/ */
public final TableField<VTotalofdayRecord, String> WORKTIME = createField(DSL.name("worktime"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTotalofdayRecord, String> WORKTIME = createField(DSL.name("worktime"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_totalofday.starttime</code>. * The column <code>done.v_totalofday.starttime</code>.
*/ */
public final TableField<VTotalofdayRecord, String> STARTTIME = createField(DSL.name("starttime"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTotalofdayRecord, String> STARTTIME = createField(DSL.name("starttime"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_totalofday.endtime</code>. * The column <code>done.v_totalofday.endtime</code>.
*/ */
public final TableField<VTotalofdayRecord, String> ENDTIME = createField(DSL.name("endtime"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTotalofdayRecord, String> ENDTIME = createField(DSL.name("endtime"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_totalofday.day</code>. * The column <code>done.v_totalofday.day</code>.
*/ */
public final TableField<VTotalofdayRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VTotalofdayRecord, String> DAY = createField(DSL.name("day"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_totalofday.fk_login</code>. * The column <code>done.v_totalofday.fk_login</code>.
*/ */
public final TableField<VTotalofdayRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VTotalofdayRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** private VTotalofday(Name alias, Table<VTotalofdayRecord> aliased) {
* Create a <code>done.v_totalofday</code> table reference this(alias, aliased, null);
*/ }
public VTotalofday() {
this(DSL.name("v_totalofday"), null); private VTotalofday(Name alias, Table<VTotalofdayRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -100,12 +94,11 @@ public class VTotalofday extends TableImpl<VTotalofdayRecord> {
this(alias, V_TOTALOFDAY); this(alias, V_TOTALOFDAY);
} }
private VTotalofday(Name alias, Table<VTotalofdayRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_totalofday</code> table reference
} */
public VTotalofday() {
private VTotalofday(Name alias, Table<VTotalofdayRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_totalofday"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VTotalofday(Table<O> child, ForeignKey<O, VTotalofdayRecord> key) { public <O extends Record> VTotalofday(Table<O> child, ForeignKey<O, VTotalofdayRecord> key) {

View File

@ -7,8 +7,6 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VWorktimeRecord; import de.jottyfan.timetrack.db.done.tables.records.VWorktimeRecord;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Name; import org.jooq.Name;
@ -17,24 +15,19 @@ import org.jooq.Row8;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VWorktime extends TableImpl<VWorktimeRecord> { public class VWorktime extends TableImpl<VWorktimeRecord> {
private static final long serialVersionUID = -330427149; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>done.v_worktime</code> * The reference instance of <code>done.v_worktime</code>
@ -52,48 +45,49 @@ public class VWorktime extends TableImpl<VWorktimeRecord> {
/** /**
* The column <code>done.v_worktime.day</code>. * The column <code>done.v_worktime.day</code>.
*/ */
public final TableField<VWorktimeRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VWorktimeRecord, String> DAY = createField(DSL.name("day"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_worktime.duration</code>. * The column <code>done.v_worktime.duration</code>.
*/ */
public final TableField<VWorktimeRecord, String> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VWorktimeRecord, String> DURATION = createField(DSL.name("duration"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_worktime.duration_hours</code>. * The column <code>done.v_worktime.duration_hours</code>.
*/ */
public final TableField<VWorktimeRecord, Double> DURATION_HOURS = createField(DSL.name("duration_hours"), org.jooq.impl.SQLDataType.DOUBLE, this, ""); public final TableField<VWorktimeRecord, Double> DURATION_HOURS = createField(DSL.name("duration_hours"), SQLDataType.DOUBLE, this, "");
/** /**
* The column <code>done.v_worktime.project_name</code>. * The column <code>done.v_worktime.project_name</code>.
*/ */
public final TableField<VWorktimeRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VWorktimeRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_worktime.module_name</code>. * The column <code>done.v_worktime.module_name</code>.
*/ */
public final TableField<VWorktimeRecord, String> MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VWorktimeRecord, String> MODULE_NAME = createField(DSL.name("module_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_worktime.job_name</code>. * The column <code>done.v_worktime.job_name</code>.
*/ */
public final TableField<VWorktimeRecord, String> JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VWorktimeRecord, String> JOB_NAME = createField(DSL.name("job_name"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_worktime.wp</code>. * The column <code>done.v_worktime.wp</code>.
*/ */
public final TableField<VWorktimeRecord, String> WP = createField(DSL.name("wp"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VWorktimeRecord, String> WP = createField(DSL.name("wp"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>done.v_worktime.fk_login</code>. * The column <code>done.v_worktime.fk_login</code>.
*/ */
public final TableField<VWorktimeRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); public final TableField<VWorktimeRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER, this, "");
/** private VWorktime(Name alias, Table<VWorktimeRecord> aliased) {
* Create a <code>done.v_worktime</code> table reference this(alias, aliased, null);
*/ }
public VWorktime() {
this(DSL.name("v_worktime"), null); private VWorktime(Name alias, Table<VWorktimeRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -110,12 +104,11 @@ public class VWorktime extends TableImpl<VWorktimeRecord> {
this(alias, V_WORKTIME); this(alias, V_WORKTIME);
} }
private VWorktime(Name alias, Table<VWorktimeRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>done.v_worktime</code> table reference
} */
public VWorktime() {
private VWorktime(Name alias, Table<VWorktimeRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_worktime"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VWorktime(Table<O> child, ForeignKey<O, VWorktimeRecord> key) { public <O extends Record> VWorktime(Table<O> child, ForeignKey<O, VWorktimeRecord> key) {

View File

@ -6,43 +6,35 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.TDone; import de.jottyfan.timetrack.db.done.tables.TDone;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record1;
import org.jooq.Record9; import org.jooq.Record9;
import org.jooq.Row9; import org.jooq.Row9;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer, String> { public class TDoneRecord extends UpdatableRecordImpl<TDoneRecord> implements Record9<LocalDateTime, Integer, LocalDateTime, LocalDateTime, Integer, Integer, Integer, Integer, String> {
private static final long serialVersionUID = -1941900551; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.t_done.lastchange</code>. * Setter for <code>done.t_done.lastchange</code>.
*/ */
public void setLastchange(Timestamp value) { public void setLastchange(LocalDateTime value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>done.t_done.lastchange</code>. * Getter for <code>done.t_done.lastchange</code>.
*/ */
public Timestamp getLastchange() { public LocalDateTime getLastchange() {
return (Timestamp) get(0); return (LocalDateTime) get(0);
} }
/** /**
@ -62,29 +54,29 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
/** /**
* Setter for <code>done.t_done.time_from</code>. * Setter for <code>done.t_done.time_from</code>.
*/ */
public void setTimeFrom(Timestamp value) { public void setTimeFrom(LocalDateTime value) {
set(2, value); set(2, value);
} }
/** /**
* Getter for <code>done.t_done.time_from</code>. * Getter for <code>done.t_done.time_from</code>.
*/ */
public Timestamp getTimeFrom() { public LocalDateTime getTimeFrom() {
return (Timestamp) get(2); return (LocalDateTime) get(2);
} }
/** /**
* Setter for <code>done.t_done.time_until</code>. * Setter for <code>done.t_done.time_until</code>.
*/ */
public void setTimeUntil(Timestamp value) { public void setTimeUntil(LocalDateTime value) {
set(3, value); set(3, value);
} }
/** /**
* Getter for <code>done.t_done.time_until</code>. * Getter for <code>done.t_done.time_until</code>.
*/ */
public Timestamp getTimeUntil() { public LocalDateTime getTimeUntil() {
return (Timestamp) get(3); return (LocalDateTime) get(3);
} }
/** /**
@ -157,22 +149,31 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
return (String) get(8); return (String) get(8);
} }
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record9 type implementation // Record9 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row9<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer, String> fieldsRow() { public Row9<LocalDateTime, Integer, LocalDateTime, LocalDateTime, Integer, Integer, Integer, Integer, String> fieldsRow() {
return (Row9) super.fieldsRow(); return (Row9) super.fieldsRow();
} }
@Override @Override
public Row9<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer, String> valuesRow() { public Row9<LocalDateTime, Integer, LocalDateTime, LocalDateTime, Integer, Integer, Integer, Integer, String> valuesRow() {
return (Row9) super.valuesRow(); return (Row9) super.valuesRow();
} }
@Override @Override
public Field<Timestamp> field1() { public Field<LocalDateTime> field1() {
return TDone.T_DONE.LASTCHANGE; return TDone.T_DONE.LASTCHANGE;
} }
@ -182,12 +183,12 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
} }
@Override @Override
public Field<Timestamp> field3() { public Field<LocalDateTime> field3() {
return TDone.T_DONE.TIME_FROM; return TDone.T_DONE.TIME_FROM;
} }
@Override @Override
public Field<Timestamp> field4() { public Field<LocalDateTime> field4() {
return TDone.T_DONE.TIME_UNTIL; return TDone.T_DONE.TIME_UNTIL;
} }
@ -217,7 +218,7 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
} }
@Override @Override
public Timestamp component1() { public LocalDateTime component1() {
return getLastchange(); return getLastchange();
} }
@ -227,12 +228,12 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
} }
@Override @Override
public Timestamp component3() { public LocalDateTime component3() {
return getTimeFrom(); return getTimeFrom();
} }
@Override @Override
public Timestamp component4() { public LocalDateTime component4() {
return getTimeUntil(); return getTimeUntil();
} }
@ -262,7 +263,7 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
} }
@Override @Override
public Timestamp value1() { public LocalDateTime value1() {
return getLastchange(); return getLastchange();
} }
@ -272,12 +273,12 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
} }
@Override @Override
public Timestamp value3() { public LocalDateTime value3() {
return getTimeFrom(); return getTimeFrom();
} }
@Override @Override
public Timestamp value4() { public LocalDateTime value4() {
return getTimeUntil(); return getTimeUntil();
} }
@ -307,7 +308,7 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
} }
@Override @Override
public TDoneRecord value1(Timestamp value) { public TDoneRecord value1(LocalDateTime value) {
setLastchange(value); setLastchange(value);
return this; return this;
} }
@ -319,13 +320,13 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
} }
@Override @Override
public TDoneRecord value3(Timestamp value) { public TDoneRecord value3(LocalDateTime value) {
setTimeFrom(value); setTimeFrom(value);
return this; return this;
} }
@Override @Override
public TDoneRecord value4(Timestamp value) { public TDoneRecord value4(LocalDateTime value) {
setTimeUntil(value); setTimeUntil(value);
return this; return this;
} }
@ -361,7 +362,7 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
} }
@Override @Override
public TDoneRecord values(Timestamp value1, Integer value2, Timestamp value3, Timestamp value4, Integer value5, Integer value6, Integer value7, Integer value8, String value9) { public TDoneRecord values(LocalDateTime value1, Integer value2, LocalDateTime value3, LocalDateTime value4, Integer value5, Integer value6, Integer value7, Integer value8, String value9) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -388,17 +389,17 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9
/** /**
* Create a detached, initialised TDoneRecord * Create a detached, initialised TDoneRecord
*/ */
public TDoneRecord(Timestamp lastchange, Integer pk, Timestamp timeFrom, Timestamp timeUntil, Integer fkProject, Integer fkModule, Integer fkJob, Integer fkLogin, String wp) { public TDoneRecord(LocalDateTime lastchange, Integer pk, LocalDateTime timeFrom, LocalDateTime timeUntil, Integer fkProject, Integer fkModule, Integer fkJob, Integer fkLogin, String wp) {
super(TDone.T_DONE); super(TDone.T_DONE);
set(0, lastchange); setLastchange(lastchange);
set(1, pk); setPk(pk);
set(2, timeFrom); setTimeFrom(timeFrom);
set(3, timeUntil); setTimeUntil(timeUntil);
set(4, fkProject); setFkProject(fkProject);
set(5, fkModule); setFkModule(fkModule);
set(6, fkJob); setFkJob(fkJob);
set(7, fkLogin); setFkLogin(fkLogin);
set(8, wp); setWp(wp);
} }
} }

View File

@ -6,43 +6,35 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.TJob; import de.jottyfan.timetrack.db.done.tables.TJob;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record1;
import org.jooq.Record3; import org.jooq.Record3;
import org.jooq.Row3; import org.jooq.Row3;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TJobRecord extends TableRecordImpl<TJobRecord> implements Record3<Timestamp, Integer, String> { public class TJobRecord extends UpdatableRecordImpl<TJobRecord> implements Record3<LocalDateTime, Integer, String> {
private static final long serialVersionUID = -1298990074; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.t_job.lastchange</code>. * Setter for <code>done.t_job.lastchange</code>.
*/ */
public void setLastchange(Timestamp value) { public void setLastchange(LocalDateTime value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>done.t_job.lastchange</code>. * Getter for <code>done.t_job.lastchange</code>.
*/ */
public Timestamp getLastchange() { public LocalDateTime getLastchange() {
return (Timestamp) get(0); return (LocalDateTime) get(0);
} }
/** /**
@ -73,22 +65,31 @@ public class TJobRecord extends TableRecordImpl<TJobRecord> implements Record3<T
return (String) get(2); return (String) get(2);
} }
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record3 type implementation // Record3 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row3<Timestamp, Integer, String> fieldsRow() { public Row3<LocalDateTime, Integer, String> fieldsRow() {
return (Row3) super.fieldsRow(); return (Row3) super.fieldsRow();
} }
@Override @Override
public Row3<Timestamp, Integer, String> valuesRow() { public Row3<LocalDateTime, Integer, String> valuesRow() {
return (Row3) super.valuesRow(); return (Row3) super.valuesRow();
} }
@Override @Override
public Field<Timestamp> field1() { public Field<LocalDateTime> field1() {
return TJob.T_JOB.LASTCHANGE; return TJob.T_JOB.LASTCHANGE;
} }
@ -103,7 +104,7 @@ public class TJobRecord extends TableRecordImpl<TJobRecord> implements Record3<T
} }
@Override @Override
public Timestamp component1() { public LocalDateTime component1() {
return getLastchange(); return getLastchange();
} }
@ -118,7 +119,7 @@ public class TJobRecord extends TableRecordImpl<TJobRecord> implements Record3<T
} }
@Override @Override
public Timestamp value1() { public LocalDateTime value1() {
return getLastchange(); return getLastchange();
} }
@ -133,7 +134,7 @@ public class TJobRecord extends TableRecordImpl<TJobRecord> implements Record3<T
} }
@Override @Override
public TJobRecord value1(Timestamp value) { public TJobRecord value1(LocalDateTime value) {
setLastchange(value); setLastchange(value);
return this; return this;
} }
@ -151,7 +152,7 @@ public class TJobRecord extends TableRecordImpl<TJobRecord> implements Record3<T
} }
@Override @Override
public TJobRecord values(Timestamp value1, Integer value2, String value3) { public TJobRecord values(LocalDateTime value1, Integer value2, String value3) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -172,11 +173,11 @@ public class TJobRecord extends TableRecordImpl<TJobRecord> implements Record3<T
/** /**
* Create a detached, initialised TJobRecord * Create a detached, initialised TJobRecord
*/ */
public TJobRecord(Timestamp lastchange, Integer pk, String name) { public TJobRecord(LocalDateTime lastchange, Integer pk, String name) {
super(TJob.T_JOB); super(TJob.T_JOB);
set(0, lastchange); setLastchange(lastchange);
set(1, pk); setPk(pk);
set(2, name); setName(name);
} }
} }

View File

@ -6,43 +6,35 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.TModule; import de.jottyfan.timetrack.db.done.tables.TModule;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record1;
import org.jooq.Record3; import org.jooq.Record3;
import org.jooq.Row3; import org.jooq.Row3;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TModuleRecord extends TableRecordImpl<TModuleRecord> implements Record3<Timestamp, Integer, String> { public class TModuleRecord extends UpdatableRecordImpl<TModuleRecord> implements Record3<LocalDateTime, Integer, String> {
private static final long serialVersionUID = 1225434375; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.t_module.lastchange</code>. * Setter for <code>done.t_module.lastchange</code>.
*/ */
public void setLastchange(Timestamp value) { public void setLastchange(LocalDateTime value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>done.t_module.lastchange</code>. * Getter for <code>done.t_module.lastchange</code>.
*/ */
public Timestamp getLastchange() { public LocalDateTime getLastchange() {
return (Timestamp) get(0); return (LocalDateTime) get(0);
} }
/** /**
@ -73,22 +65,31 @@ public class TModuleRecord extends TableRecordImpl<TModuleRecord> implements Rec
return (String) get(2); return (String) get(2);
} }
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record3 type implementation // Record3 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row3<Timestamp, Integer, String> fieldsRow() { public Row3<LocalDateTime, Integer, String> fieldsRow() {
return (Row3) super.fieldsRow(); return (Row3) super.fieldsRow();
} }
@Override @Override
public Row3<Timestamp, Integer, String> valuesRow() { public Row3<LocalDateTime, Integer, String> valuesRow() {
return (Row3) super.valuesRow(); return (Row3) super.valuesRow();
} }
@Override @Override
public Field<Timestamp> field1() { public Field<LocalDateTime> field1() {
return TModule.T_MODULE.LASTCHANGE; return TModule.T_MODULE.LASTCHANGE;
} }
@ -103,7 +104,7 @@ public class TModuleRecord extends TableRecordImpl<TModuleRecord> implements Rec
} }
@Override @Override
public Timestamp component1() { public LocalDateTime component1() {
return getLastchange(); return getLastchange();
} }
@ -118,7 +119,7 @@ public class TModuleRecord extends TableRecordImpl<TModuleRecord> implements Rec
} }
@Override @Override
public Timestamp value1() { public LocalDateTime value1() {
return getLastchange(); return getLastchange();
} }
@ -133,7 +134,7 @@ public class TModuleRecord extends TableRecordImpl<TModuleRecord> implements Rec
} }
@Override @Override
public TModuleRecord value1(Timestamp value) { public TModuleRecord value1(LocalDateTime value) {
setLastchange(value); setLastchange(value);
return this; return this;
} }
@ -151,7 +152,7 @@ public class TModuleRecord extends TableRecordImpl<TModuleRecord> implements Rec
} }
@Override @Override
public TModuleRecord values(Timestamp value1, Integer value2, String value3) { public TModuleRecord values(LocalDateTime value1, Integer value2, String value3) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -172,11 +173,11 @@ public class TModuleRecord extends TableRecordImpl<TModuleRecord> implements Rec
/** /**
* Create a detached, initialised TModuleRecord * Create a detached, initialised TModuleRecord
*/ */
public TModuleRecord(Timestamp lastchange, Integer pk, String name) { public TModuleRecord(LocalDateTime lastchange, Integer pk, String name) {
super(TModule.T_MODULE); super(TModule.T_MODULE);
set(0, lastchange); setLastchange(lastchange);
set(1, pk); setPk(pk);
set(2, name); setName(name);
} }
} }

View File

@ -6,43 +6,35 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.TProject; import de.jottyfan.timetrack.db.done.tables.TProject;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record1;
import org.jooq.Record3; import org.jooq.Record3;
import org.jooq.Row3; import org.jooq.Row3;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TProjectRecord extends TableRecordImpl<TProjectRecord> implements Record3<Timestamp, Integer, String> { public class TProjectRecord extends UpdatableRecordImpl<TProjectRecord> implements Record3<LocalDateTime, Integer, String> {
private static final long serialVersionUID = 1716720610; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.t_project.lastchange</code>. * Setter for <code>done.t_project.lastchange</code>.
*/ */
public void setLastchange(Timestamp value) { public void setLastchange(LocalDateTime value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>done.t_project.lastchange</code>. * Getter for <code>done.t_project.lastchange</code>.
*/ */
public Timestamp getLastchange() { public LocalDateTime getLastchange() {
return (Timestamp) get(0); return (LocalDateTime) get(0);
} }
/** /**
@ -73,22 +65,31 @@ public class TProjectRecord extends TableRecordImpl<TProjectRecord> implements R
return (String) get(2); return (String) get(2);
} }
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record3 type implementation // Record3 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row3<Timestamp, Integer, String> fieldsRow() { public Row3<LocalDateTime, Integer, String> fieldsRow() {
return (Row3) super.fieldsRow(); return (Row3) super.fieldsRow();
} }
@Override @Override
public Row3<Timestamp, Integer, String> valuesRow() { public Row3<LocalDateTime, Integer, String> valuesRow() {
return (Row3) super.valuesRow(); return (Row3) super.valuesRow();
} }
@Override @Override
public Field<Timestamp> field1() { public Field<LocalDateTime> field1() {
return TProject.T_PROJECT.LASTCHANGE; return TProject.T_PROJECT.LASTCHANGE;
} }
@ -103,7 +104,7 @@ public class TProjectRecord extends TableRecordImpl<TProjectRecord> implements R
} }
@Override @Override
public Timestamp component1() { public LocalDateTime component1() {
return getLastchange(); return getLastchange();
} }
@ -118,7 +119,7 @@ public class TProjectRecord extends TableRecordImpl<TProjectRecord> implements R
} }
@Override @Override
public Timestamp value1() { public LocalDateTime value1() {
return getLastchange(); return getLastchange();
} }
@ -133,7 +134,7 @@ public class TProjectRecord extends TableRecordImpl<TProjectRecord> implements R
} }
@Override @Override
public TProjectRecord value1(Timestamp value) { public TProjectRecord value1(LocalDateTime value) {
setLastchange(value); setLastchange(value);
return this; return this;
} }
@ -151,7 +152,7 @@ public class TProjectRecord extends TableRecordImpl<TProjectRecord> implements R
} }
@Override @Override
public TProjectRecord values(Timestamp value1, Integer value2, String value3) { public TProjectRecord values(LocalDateTime value1, Integer value2, String value3) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -172,11 +173,11 @@ public class TProjectRecord extends TableRecordImpl<TProjectRecord> implements R
/** /**
* Create a detached, initialised TProjectRecord * Create a detached, initialised TProjectRecord
*/ */
public TProjectRecord(Timestamp lastchange, Integer pk, String name) { public TProjectRecord(LocalDateTime lastchange, Integer pk, String name) {
super(TProject.T_PROJECT); super(TProject.T_PROJECT);
set(0, lastchange); setLastchange(lastchange);
set(1, pk); setPk(pk);
set(2, name); setName(name);
} }
} }

View File

@ -6,8 +6,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VDaily; import de.jottyfan.timetrack.db.done.tables.VDaily;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record4; import org.jooq.Record4;
import org.jooq.Row4; import org.jooq.Row4;
@ -18,17 +16,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDailyRecord extends TableRecordImpl<VDailyRecord> implements Record4<YearToSecond, String, String, Integer> { public class VDailyRecord extends TableRecordImpl<VDailyRecord> implements Record4<YearToSecond, String, String, Integer> {
private static final long serialVersionUID = 272286224; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_daily.worktime</code>. * Setter for <code>done.v_daily.worktime</code>.
@ -210,9 +201,9 @@ public class VDailyRecord extends TableRecordImpl<VDailyRecord> implements Recor
public VDailyRecord(YearToSecond worktime, String day, String login, Integer fkLogin) { public VDailyRecord(YearToSecond worktime, String day, String login, Integer fkLogin) {
super(VDaily.V_DAILY); super(VDaily.V_DAILY);
set(0, worktime); setWorktime(worktime);
set(1, day); setDay(day);
set(2, login); setLogin(login);
set(3, fkLogin); setFkLogin(fkLogin);
} }
} }

View File

@ -6,11 +6,9 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VDaylimits; import de.jottyfan.timetrack.db.done.tables.VDaylimits;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record4; import org.jooq.Record4;
import org.jooq.Row4; import org.jooq.Row4;
@ -20,30 +18,23 @@ import org.jooq.impl.TableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implements Record4<Timestamp, OffsetDateTime, String, Integer> { public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implements Record4<LocalDateTime, OffsetDateTime, String, Integer> {
private static final long serialVersionUID = -1076103395; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_daylimits.work_start</code>. * Setter for <code>done.v_daylimits.work_start</code>.
*/ */
public void setWorkStart(Timestamp value) { public void setWorkStart(LocalDateTime value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>done.v_daylimits.work_start</code>. * Getter for <code>done.v_daylimits.work_start</code>.
*/ */
public Timestamp getWorkStart() { public LocalDateTime getWorkStart() {
return (Timestamp) get(0); return (LocalDateTime) get(0);
} }
/** /**
@ -93,17 +84,17 @@ public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implemen
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row4<Timestamp, OffsetDateTime, String, Integer> fieldsRow() { public Row4<LocalDateTime, OffsetDateTime, String, Integer> fieldsRow() {
return (Row4) super.fieldsRow(); return (Row4) super.fieldsRow();
} }
@Override @Override
public Row4<Timestamp, OffsetDateTime, String, Integer> valuesRow() { public Row4<LocalDateTime, OffsetDateTime, String, Integer> valuesRow() {
return (Row4) super.valuesRow(); return (Row4) super.valuesRow();
} }
@Override @Override
public Field<Timestamp> field1() { public Field<LocalDateTime> field1() {
return VDaylimits.V_DAYLIMITS.WORK_START; return VDaylimits.V_DAYLIMITS.WORK_START;
} }
@ -123,7 +114,7 @@ public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implemen
} }
@Override @Override
public Timestamp component1() { public LocalDateTime component1() {
return getWorkStart(); return getWorkStart();
} }
@ -143,7 +134,7 @@ public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implemen
} }
@Override @Override
public Timestamp value1() { public LocalDateTime value1() {
return getWorkStart(); return getWorkStart();
} }
@ -163,7 +154,7 @@ public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implemen
} }
@Override @Override
public VDaylimitsRecord value1(Timestamp value) { public VDaylimitsRecord value1(LocalDateTime value) {
setWorkStart(value); setWorkStart(value);
return this; return this;
} }
@ -187,7 +178,7 @@ public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implemen
} }
@Override @Override
public VDaylimitsRecord values(Timestamp value1, OffsetDateTime value2, String value3, Integer value4) { public VDaylimitsRecord values(LocalDateTime value1, OffsetDateTime value2, String value3, Integer value4) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -209,12 +200,12 @@ public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implemen
/** /**
* Create a detached, initialised VDaylimitsRecord * Create a detached, initialised VDaylimitsRecord
*/ */
public VDaylimitsRecord(Timestamp workStart, OffsetDateTime workEnd, String day, Integer fkLogin) { public VDaylimitsRecord(LocalDateTime workStart, OffsetDateTime workEnd, String day, Integer fkLogin) {
super(VDaylimits.V_DAYLIMITS); super(VDaylimits.V_DAYLIMITS);
set(0, workStart); setWorkStart(workStart);
set(1, workEnd); setWorkEnd(workEnd);
set(2, day); setDay(day);
set(3, fkLogin); setFkLogin(fkLogin);
} }
} }

View File

@ -6,11 +6,9 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VDaysummary; import de.jottyfan.timetrack.db.done.tables.VDaysummary;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record7; import org.jooq.Record7;
import org.jooq.Row7; import org.jooq.Row7;
@ -21,17 +19,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implements Record7<YearToSecond, YearToSecond, Timestamp, OffsetDateTime, String, String, Integer> { public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implements Record7<YearToSecond, YearToSecond, LocalDateTime, OffsetDateTime, String, String, Integer> {
private static final long serialVersionUID = -524282795; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_daysummary.breaktime</code>. * Setter for <code>done.v_daysummary.breaktime</code>.
@ -64,15 +55,15 @@ public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implem
/** /**
* Setter for <code>done.v_daysummary.work_start</code>. * Setter for <code>done.v_daysummary.work_start</code>.
*/ */
public void setWorkStart(Timestamp value) { public void setWorkStart(LocalDateTime value) {
set(2, value); set(2, value);
} }
/** /**
* Getter for <code>done.v_daysummary.work_start</code>. * Getter for <code>done.v_daysummary.work_start</code>.
*/ */
public Timestamp getWorkStart() { public LocalDateTime getWorkStart() {
return (Timestamp) get(2); return (LocalDateTime) get(2);
} }
/** /**
@ -136,12 +127,12 @@ public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implem
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row7<YearToSecond, YearToSecond, Timestamp, OffsetDateTime, String, String, Integer> fieldsRow() { public Row7<YearToSecond, YearToSecond, LocalDateTime, OffsetDateTime, String, String, Integer> fieldsRow() {
return (Row7) super.fieldsRow(); return (Row7) super.fieldsRow();
} }
@Override @Override
public Row7<YearToSecond, YearToSecond, Timestamp, OffsetDateTime, String, String, Integer> valuesRow() { public Row7<YearToSecond, YearToSecond, LocalDateTime, OffsetDateTime, String, String, Integer> valuesRow() {
return (Row7) super.valuesRow(); return (Row7) super.valuesRow();
} }
@ -156,7 +147,7 @@ public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implem
} }
@Override @Override
public Field<Timestamp> field3() { public Field<LocalDateTime> field3() {
return VDaysummary.V_DAYSUMMARY.WORK_START; return VDaysummary.V_DAYSUMMARY.WORK_START;
} }
@ -191,7 +182,7 @@ public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implem
} }
@Override @Override
public Timestamp component3() { public LocalDateTime component3() {
return getWorkStart(); return getWorkStart();
} }
@ -226,7 +217,7 @@ public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implem
} }
@Override @Override
public Timestamp value3() { public LocalDateTime value3() {
return getWorkStart(); return getWorkStart();
} }
@ -263,7 +254,7 @@ public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implem
} }
@Override @Override
public VDaysummaryRecord value3(Timestamp value) { public VDaysummaryRecord value3(LocalDateTime value) {
setWorkStart(value); setWorkStart(value);
return this; return this;
} }
@ -293,7 +284,7 @@ public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implem
} }
@Override @Override
public VDaysummaryRecord values(YearToSecond value1, YearToSecond value2, Timestamp value3, OffsetDateTime value4, String value5, String value6, Integer value7) { public VDaysummaryRecord values(YearToSecond value1, YearToSecond value2, LocalDateTime value3, OffsetDateTime value4, String value5, String value6, Integer value7) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -318,15 +309,15 @@ public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implem
/** /**
* Create a detached, initialised VDaysummaryRecord * Create a detached, initialised VDaysummaryRecord
*/ */
public VDaysummaryRecord(YearToSecond breaktime, YearToSecond worktime, Timestamp workStart, OffsetDateTime workEnd, String day, String login, Integer fkLogin) { public VDaysummaryRecord(YearToSecond breaktime, YearToSecond worktime, LocalDateTime workStart, OffsetDateTime workEnd, String day, String login, Integer fkLogin) {
super(VDaysummary.V_DAYSUMMARY); super(VDaysummary.V_DAYSUMMARY);
set(0, breaktime); setBreaktime(breaktime);
set(1, worktime); setWorktime(worktime);
set(2, workStart); setWorkStart(workStart);
set(3, workEnd); setWorkEnd(workEnd);
set(4, day); setDay(day);
set(5, login); setLogin(login);
set(6, fkLogin); setFkLogin(fkLogin);
} }
} }

View File

@ -6,9 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VDone; import de.jottyfan.timetrack.db.done.tables.VDone;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record8; import org.jooq.Record8;
@ -19,17 +17,10 @@ import org.jooq.impl.TableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8<Integer, Integer, Timestamp, Timestamp, String, String, String, String> { public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8<Integer, Integer, LocalDateTime, LocalDateTime, String, String, String, String> {
private static final long serialVersionUID = 933997970; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_done.fk_done</code>. * Setter for <code>done.v_done.fk_done</code>.
@ -62,29 +53,29 @@ public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8
/** /**
* Setter for <code>done.v_done.time_from</code>. * Setter for <code>done.v_done.time_from</code>.
*/ */
public void setTimeFrom(Timestamp value) { public void setTimeFrom(LocalDateTime value) {
set(2, value); set(2, value);
} }
/** /**
* Getter for <code>done.v_done.time_from</code>. * Getter for <code>done.v_done.time_from</code>.
*/ */
public Timestamp getTimeFrom() { public LocalDateTime getTimeFrom() {
return (Timestamp) get(2); return (LocalDateTime) get(2);
} }
/** /**
* Setter for <code>done.v_done.time_until</code>. * Setter for <code>done.v_done.time_until</code>.
*/ */
public void setTimeUntil(Timestamp value) { public void setTimeUntil(LocalDateTime value) {
set(3, value); set(3, value);
} }
/** /**
* Getter for <code>done.v_done.time_until</code>. * Getter for <code>done.v_done.time_until</code>.
*/ */
public Timestamp getTimeUntil() { public LocalDateTime getTimeUntil() {
return (Timestamp) get(3); return (LocalDateTime) get(3);
} }
/** /**
@ -148,12 +139,12 @@ public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row8<Integer, Integer, Timestamp, Timestamp, String, String, String, String> fieldsRow() { public Row8<Integer, Integer, LocalDateTime, LocalDateTime, String, String, String, String> fieldsRow() {
return (Row8) super.fieldsRow(); return (Row8) super.fieldsRow();
} }
@Override @Override
public Row8<Integer, Integer, Timestamp, Timestamp, String, String, String, String> valuesRow() { public Row8<Integer, Integer, LocalDateTime, LocalDateTime, String, String, String, String> valuesRow() {
return (Row8) super.valuesRow(); return (Row8) super.valuesRow();
} }
@ -168,12 +159,12 @@ public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8
} }
@Override @Override
public Field<Timestamp> field3() { public Field<LocalDateTime> field3() {
return VDone.V_DONE.TIME_FROM; return VDone.V_DONE.TIME_FROM;
} }
@Override @Override
public Field<Timestamp> field4() { public Field<LocalDateTime> field4() {
return VDone.V_DONE.TIME_UNTIL; return VDone.V_DONE.TIME_UNTIL;
} }
@ -208,12 +199,12 @@ public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8
} }
@Override @Override
public Timestamp component3() { public LocalDateTime component3() {
return getTimeFrom(); return getTimeFrom();
} }
@Override @Override
public Timestamp component4() { public LocalDateTime component4() {
return getTimeUntil(); return getTimeUntil();
} }
@ -248,12 +239,12 @@ public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8
} }
@Override @Override
public Timestamp value3() { public LocalDateTime value3() {
return getTimeFrom(); return getTimeFrom();
} }
@Override @Override
public Timestamp value4() { public LocalDateTime value4() {
return getTimeUntil(); return getTimeUntil();
} }
@ -290,13 +281,13 @@ public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8
} }
@Override @Override
public VDoneRecord value3(Timestamp value) { public VDoneRecord value3(LocalDateTime value) {
setTimeFrom(value); setTimeFrom(value);
return this; return this;
} }
@Override @Override
public VDoneRecord value4(Timestamp value) { public VDoneRecord value4(LocalDateTime value) {
setTimeUntil(value); setTimeUntil(value);
return this; return this;
} }
@ -326,7 +317,7 @@ public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8
} }
@Override @Override
public VDoneRecord values(Integer value1, Integer value2, Timestamp value3, Timestamp value4, String value5, String value6, String value7, String value8) { public VDoneRecord values(Integer value1, Integer value2, LocalDateTime value3, LocalDateTime value4, String value5, String value6, String value7, String value8) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -352,16 +343,16 @@ public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8
/** /**
* Create a detached, initialised VDoneRecord * Create a detached, initialised VDoneRecord
*/ */
public VDoneRecord(Integer fkDone, Integer fkLogin, Timestamp timeFrom, Timestamp timeUntil, String projectName, String moduleName, String jobName, String login) { public VDoneRecord(Integer fkDone, Integer fkLogin, LocalDateTime timeFrom, LocalDateTime timeUntil, String projectName, String moduleName, String jobName, String login) {
super(VDone.V_DONE); super(VDone.V_DONE);
set(0, fkDone); setFkDone(fkDone);
set(1, fkLogin); setFkLogin(fkLogin);
set(2, timeFrom); setTimeFrom(timeFrom);
set(3, timeUntil); setTimeUntil(timeUntil);
set(4, projectName); setProjectName(projectName);
set(5, moduleName); setModuleName(moduleName);
set(6, jobName); setJobName(jobName);
set(7, login); setLogin(login);
} }
} }

View File

@ -6,8 +6,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VDuration; import de.jottyfan.timetrack.db.done.tables.VDuration;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record7; import org.jooq.Record7;
import org.jooq.Row7; import org.jooq.Row7;
@ -18,17 +16,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDurationRecord extends TableRecordImpl<VDurationRecord> implements Record7<String, YearToSecond, String, String, String, String, Integer> { public class VDurationRecord extends TableRecordImpl<VDurationRecord> implements Record7<String, YearToSecond, String, String, String, String, Integer> {
private static final long serialVersionUID = -1641325525; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_duration.day</code>. * Setter for <code>done.v_duration.day</code>.
@ -318,12 +309,12 @@ public class VDurationRecord extends TableRecordImpl<VDurationRecord> implements
public VDurationRecord(String day, YearToSecond duration, String projectName, String moduleName, String jobName, String login, Integer fkLogin) { public VDurationRecord(String day, YearToSecond duration, String projectName, String moduleName, String jobName, String login, Integer fkLogin) {
super(VDuration.V_DURATION); super(VDuration.V_DURATION);
set(0, day); setDay(day);
set(1, duration); setDuration(duration);
set(2, projectName); setProjectName(projectName);
set(3, moduleName); setModuleName(moduleName);
set(4, jobName); setJobName(jobName);
set(5, login); setLogin(login);
set(6, fkLogin); setFkLogin(fkLogin);
} }
} }

View File

@ -6,9 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VEucanshare; import de.jottyfan.timetrack.db.done.tables.VEucanshare;
import java.sql.Date; import java.time.LocalDate;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record8; import org.jooq.Record8;
@ -20,17 +18,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implements Record8<Integer, Date, YearToSecond, String, String, String, Integer, String> { public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implements Record8<Integer, LocalDate, YearToSecond, String, String, String, Integer, String> {
private static final long serialVersionUID = 2139665588; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_eucanshare.fk_done</code>. * Setter for <code>done.v_eucanshare.fk_done</code>.
@ -49,15 +40,15 @@ public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implem
/** /**
* Setter for <code>done.v_eucanshare.workday</code>. * Setter for <code>done.v_eucanshare.workday</code>.
*/ */
public void setWorkday(Date value) { public void setWorkday(LocalDate value) {
set(1, value); set(1, value);
} }
/** /**
* Getter for <code>done.v_eucanshare.workday</code>. * Getter for <code>done.v_eucanshare.workday</code>.
*/ */
public Date getWorkday() { public LocalDate getWorkday() {
return (Date) get(1); return (LocalDate) get(1);
} }
/** /**
@ -149,12 +140,12 @@ public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implem
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row8<Integer, Date, YearToSecond, String, String, String, Integer, String> fieldsRow() { public Row8<Integer, LocalDate, YearToSecond, String, String, String, Integer, String> fieldsRow() {
return (Row8) super.fieldsRow(); return (Row8) super.fieldsRow();
} }
@Override @Override
public Row8<Integer, Date, YearToSecond, String, String, String, Integer, String> valuesRow() { public Row8<Integer, LocalDate, YearToSecond, String, String, String, Integer, String> valuesRow() {
return (Row8) super.valuesRow(); return (Row8) super.valuesRow();
} }
@ -164,7 +155,7 @@ public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implem
} }
@Override @Override
public Field<Date> field2() { public Field<LocalDate> field2() {
return VEucanshare.V_EUCANSHARE.WORKDAY; return VEucanshare.V_EUCANSHARE.WORKDAY;
} }
@ -204,7 +195,7 @@ public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implem
} }
@Override @Override
public Date component2() { public LocalDate component2() {
return getWorkday(); return getWorkday();
} }
@ -244,7 +235,7 @@ public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implem
} }
@Override @Override
public Date value2() { public LocalDate value2() {
return getWorkday(); return getWorkday();
} }
@ -285,7 +276,7 @@ public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implem
} }
@Override @Override
public VEucanshareRecord value2(Date value) { public VEucanshareRecord value2(LocalDate value) {
setWorkday(value); setWorkday(value);
return this; return this;
} }
@ -327,7 +318,7 @@ public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implem
} }
@Override @Override
public VEucanshareRecord values(Integer value1, Date value2, YearToSecond value3, String value4, String value5, String value6, Integer value7, String value8) { public VEucanshareRecord values(Integer value1, LocalDate value2, YearToSecond value3, String value4, String value5, String value6, Integer value7, String value8) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -353,16 +344,16 @@ public class VEucanshareRecord extends TableRecordImpl<VEucanshareRecord> implem
/** /**
* Create a detached, initialised VEucanshareRecord * Create a detached, initialised VEucanshareRecord
*/ */
public VEucanshareRecord(Integer fkDone, Date workday, YearToSecond duration, String projectName, String moduleName, String jobName, Integer fkLogin, String wp) { public VEucanshareRecord(Integer fkDone, LocalDate workday, YearToSecond duration, String projectName, String moduleName, String jobName, Integer fkLogin, String wp) {
super(VEucanshare.V_EUCANSHARE); super(VEucanshare.V_EUCANSHARE);
set(0, fkDone); setFkDone(fkDone);
set(1, workday); setWorkday(workday);
set(2, duration); setDuration(duration);
set(3, projectName); setProjectName(projectName);
set(4, moduleName); setModuleName(moduleName);
set(5, jobName); setJobName(jobName);
set(6, fkLogin); setFkLogin(fkLogin);
set(7, wp); setWp(wp);
} }
} }

View File

@ -6,9 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VHamster; import de.jottyfan.timetrack.db.done.tables.VHamster;
import java.sql.Date; import java.time.LocalDate;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record6; import org.jooq.Record6;
@ -20,30 +18,23 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements Record6<Date, YearToSecond, String, String, String, String> { public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements Record6<LocalDate, YearToSecond, String, String, String, String> {
private static final long serialVersionUID = 1135919574; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_hamster.workday</code>. * Setter for <code>done.v_hamster.workday</code>.
*/ */
public void setWorkday(Date value) { public void setWorkday(LocalDate value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>done.v_hamster.workday</code>. * Getter for <code>done.v_hamster.workday</code>.
*/ */
public Date getWorkday() { public LocalDate getWorkday() {
return (Date) get(0); return (LocalDate) get(0);
} }
/** /**
@ -121,17 +112,17 @@ public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements R
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row6<Date, YearToSecond, String, String, String, String> fieldsRow() { public Row6<LocalDate, YearToSecond, String, String, String, String> fieldsRow() {
return (Row6) super.fieldsRow(); return (Row6) super.fieldsRow();
} }
@Override @Override
public Row6<Date, YearToSecond, String, String, String, String> valuesRow() { public Row6<LocalDate, YearToSecond, String, String, String, String> valuesRow() {
return (Row6) super.valuesRow(); return (Row6) super.valuesRow();
} }
@Override @Override
public Field<Date> field1() { public Field<LocalDate> field1() {
return VHamster.V_HAMSTER.WORKDAY; return VHamster.V_HAMSTER.WORKDAY;
} }
@ -161,7 +152,7 @@ public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements R
} }
@Override @Override
public Date component1() { public LocalDate component1() {
return getWorkday(); return getWorkday();
} }
@ -191,7 +182,7 @@ public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements R
} }
@Override @Override
public Date value1() { public LocalDate value1() {
return getWorkday(); return getWorkday();
} }
@ -221,7 +212,7 @@ public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements R
} }
@Override @Override
public VHamsterRecord value1(Date value) { public VHamsterRecord value1(LocalDate value) {
setWorkday(value); setWorkday(value);
return this; return this;
} }
@ -257,7 +248,7 @@ public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements R
} }
@Override @Override
public VHamsterRecord values(Date value1, YearToSecond value2, String value3, String value4, String value5, String value6) { public VHamsterRecord values(LocalDate value1, YearToSecond value2, String value3, String value4, String value5, String value6) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -281,14 +272,14 @@ public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements R
/** /**
* Create a detached, initialised VHamsterRecord * Create a detached, initialised VHamsterRecord
*/ */
public VHamsterRecord(Date workday, YearToSecond duration, String projectName, String moduleName, String jobName, String login) { public VHamsterRecord(LocalDate workday, YearToSecond duration, String projectName, String moduleName, String jobName, String login) {
super(VHamster.V_HAMSTER); super(VHamster.V_HAMSTER);
set(0, workday); setWorkday(workday);
set(1, duration); setDuration(duration);
set(2, projectName); setProjectName(projectName);
set(3, moduleName); setModuleName(moduleName);
set(4, jobName); setJobName(jobName);
set(5, login); setLogin(login);
} }
} }

View File

@ -6,9 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VHamstersummary; import de.jottyfan.timetrack.db.done.tables.VHamstersummary;
import java.sql.Date; import java.time.LocalDate;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record6; import org.jooq.Record6;
@ -19,30 +17,23 @@ import org.jooq.impl.TableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord> implements Record6<Date, String, String, String, String, String> { public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord> implements Record6<LocalDate, String, String, String, String, String> {
private static final long serialVersionUID = 1731792914; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_hamstersummary.workday</code>. * Setter for <code>done.v_hamstersummary.workday</code>.
*/ */
public void setWorkday(Date value) { public void setWorkday(LocalDate value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>done.v_hamstersummary.workday</code>. * Getter for <code>done.v_hamstersummary.workday</code>.
*/ */
public Date getWorkday() { public LocalDate getWorkday() {
return (Date) get(0); return (LocalDate) get(0);
} }
/** /**
@ -120,17 +111,17 @@ public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row6<Date, String, String, String, String, String> fieldsRow() { public Row6<LocalDate, String, String, String, String, String> fieldsRow() {
return (Row6) super.fieldsRow(); return (Row6) super.fieldsRow();
} }
@Override @Override
public Row6<Date, String, String, String, String, String> valuesRow() { public Row6<LocalDate, String, String, String, String, String> valuesRow() {
return (Row6) super.valuesRow(); return (Row6) super.valuesRow();
} }
@Override @Override
public Field<Date> field1() { public Field<LocalDate> field1() {
return VHamstersummary.V_HAMSTERSUMMARY.WORKDAY; return VHamstersummary.V_HAMSTERSUMMARY.WORKDAY;
} }
@ -160,7 +151,7 @@ public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord
} }
@Override @Override
public Date component1() { public LocalDate component1() {
return getWorkday(); return getWorkday();
} }
@ -190,7 +181,7 @@ public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord
} }
@Override @Override
public Date value1() { public LocalDate value1() {
return getWorkday(); return getWorkday();
} }
@ -220,7 +211,7 @@ public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord
} }
@Override @Override
public VHamstersummaryRecord value1(Date value) { public VHamstersummaryRecord value1(LocalDate value) {
setWorkday(value); setWorkday(value);
return this; return this;
} }
@ -256,7 +247,7 @@ public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord
} }
@Override @Override
public VHamstersummaryRecord values(Date value1, String value2, String value3, String value4, String value5, String value6) { public VHamstersummaryRecord values(LocalDate value1, String value2, String value3, String value4, String value5, String value6) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -280,14 +271,14 @@ public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord
/** /**
* Create a detached, initialised VHamstersummaryRecord * Create a detached, initialised VHamstersummaryRecord
*/ */
public VHamstersummaryRecord(Date workday, String duration, String projectName, String moduleName, String jobName, String login) { public VHamstersummaryRecord(LocalDate workday, String duration, String projectName, String moduleName, String jobName, String login) {
super(VHamstersummary.V_HAMSTERSUMMARY); super(VHamstersummary.V_HAMSTERSUMMARY);
set(0, workday); setWorkday(workday);
set(1, duration); setDuration(duration);
set(2, projectName); setProjectName(projectName);
set(3, moduleName); setModuleName(moduleName);
set(4, jobName); setJobName(jobName);
set(5, login); setLogin(login);
} }
} }

View File

@ -6,8 +6,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VTasklist; import de.jottyfan.timetrack.db.done.tables.VTasklist;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record6; import org.jooq.Record6;
import org.jooq.Row6; import org.jooq.Row6;
@ -17,17 +15,10 @@ import org.jooq.impl.TableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTasklistRecord extends TableRecordImpl<VTasklistRecord> implements Record6<String, String, String, String, String, Integer> { public class VTasklistRecord extends TableRecordImpl<VTasklistRecord> implements Record6<String, String, String, String, String, Integer> {
private static final long serialVersionUID = -1593590961; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_tasklist.day</code>. * Setter for <code>done.v_tasklist.day</code>.
@ -281,11 +272,11 @@ public class VTasklistRecord extends TableRecordImpl<VTasklistRecord> implements
public VTasklistRecord(String day, String duration, String projectName, String moduleName, String jobName, Integer fkLogin) { public VTasklistRecord(String day, String duration, String projectName, String moduleName, String jobName, Integer fkLogin) {
super(VTasklist.V_TASKLIST); super(VTasklist.V_TASKLIST);
set(0, day); setDay(day);
set(1, duration); setDuration(duration);
set(2, projectName); setProjectName(projectName);
set(3, moduleName); setModuleName(moduleName);
set(4, jobName); setJobName(jobName);
set(5, fkLogin); setFkLogin(fkLogin);
} }
} }

View File

@ -6,8 +6,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VTimelength; import de.jottyfan.timetrack.db.done.tables.VTimelength;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record4; import org.jooq.Record4;
import org.jooq.Row4; import org.jooq.Row4;
@ -18,17 +16,10 @@ import org.jooq.types.YearToSecond;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTimelengthRecord extends TableRecordImpl<VTimelengthRecord> implements Record4<String, YearToSecond, Integer, Integer> { public class VTimelengthRecord extends TableRecordImpl<VTimelengthRecord> implements Record4<String, YearToSecond, Integer, Integer> {
private static final long serialVersionUID = -328020269; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_timelength.day</code>. * Setter for <code>done.v_timelength.day</code>.
@ -210,9 +201,9 @@ public class VTimelengthRecord extends TableRecordImpl<VTimelengthRecord> implem
public VTimelengthRecord(String day, YearToSecond duration, Integer fkDone, Integer fkLogin) { public VTimelengthRecord(String day, YearToSecond duration, Integer fkDone, Integer fkLogin) {
super(VTimelength.V_TIMELENGTH); super(VTimelength.V_TIMELENGTH);
set(0, day); setDay(day);
set(1, duration); setDuration(duration);
set(2, fkDone); setFkDone(fkDone);
set(3, fkLogin); setFkLogin(fkLogin);
} }
} }

View File

@ -6,8 +6,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VTotalofday; import de.jottyfan.timetrack.db.done.tables.VTotalofday;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record6; import org.jooq.Record6;
import org.jooq.Row6; import org.jooq.Row6;
@ -17,17 +15,10 @@ import org.jooq.impl.TableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTotalofdayRecord extends TableRecordImpl<VTotalofdayRecord> implements Record6<String, String, String, String, String, Integer> { public class VTotalofdayRecord extends TableRecordImpl<VTotalofdayRecord> implements Record6<String, String, String, String, String, Integer> {
private static final long serialVersionUID = -1877583070; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_totalofday.breaktime</code>. * Setter for <code>done.v_totalofday.breaktime</code>.
@ -281,11 +272,11 @@ public class VTotalofdayRecord extends TableRecordImpl<VTotalofdayRecord> implem
public VTotalofdayRecord(String breaktime, String worktime, String starttime, String endtime, String day, Integer fkLogin) { public VTotalofdayRecord(String breaktime, String worktime, String starttime, String endtime, String day, Integer fkLogin) {
super(VTotalofday.V_TOTALOFDAY); super(VTotalofday.V_TOTALOFDAY);
set(0, breaktime); setBreaktime(breaktime);
set(1, worktime); setWorktime(worktime);
set(2, starttime); setStarttime(starttime);
set(3, endtime); setEndtime(endtime);
set(4, day); setDay(day);
set(5, fkLogin); setFkLogin(fkLogin);
} }
} }

View File

@ -6,8 +6,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VWorktime; import de.jottyfan.timetrack.db.done.tables.VWorktime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record8; import org.jooq.Record8;
import org.jooq.Row8; import org.jooq.Row8;
@ -17,17 +15,10 @@ import org.jooq.impl.TableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VWorktimeRecord extends TableRecordImpl<VWorktimeRecord> implements Record8<String, String, Double, String, String, String, String, Integer> { public class VWorktimeRecord extends TableRecordImpl<VWorktimeRecord> implements Record8<String, String, Double, String, String, String, String, Integer> {
private static final long serialVersionUID = 647750108; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>done.v_worktime.day</code>. * Setter for <code>done.v_worktime.day</code>.
@ -353,13 +344,13 @@ public class VWorktimeRecord extends TableRecordImpl<VWorktimeRecord> implements
public VWorktimeRecord(String day, String duration, Double durationHours, String projectName, String moduleName, String jobName, String wp, Integer fkLogin) { public VWorktimeRecord(String day, String duration, Double durationHours, String projectName, String moduleName, String jobName, String wp, Integer fkLogin) {
super(VWorktime.V_WORKTIME); super(VWorktime.V_WORKTIME);
set(0, day); setDay(day);
set(1, duration); setDuration(duration);
set(2, durationHours); setDurationHours(durationHours);
set(3, projectName); setProjectName(projectName);
set(4, moduleName); setModuleName(moduleName);
set(5, jobName); setJobName(jobName);
set(6, wp); setWp(wp);
set(7, fkLogin); setFkLogin(fkLogin);
} }
} }

View File

@ -1,42 +0,0 @@
/*
* This file is generated by jOOQ.
*/
package de.jottyfan.timetrack.db.note;
import de.jottyfan.timetrack.db.note.tables.TNote;
import javax.annotation.processing.Generated;
import org.jooq.Index;
import org.jooq.OrderField;
import org.jooq.impl.Internal;
/**
* A class modelling indexes of tables of the <code>note</code> schema.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Indexes {
// -------------------------------------------------------------------------
// INDEX definitions
// -------------------------------------------------------------------------
public static final Index T_NOTE_PKEY = Indexes0.T_NOTE_PKEY;
// -------------------------------------------------------------------------
// [#1459] distribute members to avoid static initialisers > 64kb
// -------------------------------------------------------------------------
private static class Indexes0 {
public static Index T_NOTE_PKEY = Internal.createIndex("t_note_pkey", TNote.T_NOTE, new OrderField[] { TNote.T_NOTE.PK }, true);
}
}

View File

@ -0,0 +1,28 @@
/*
* This file is generated by jOOQ.
*/
package de.jottyfan.timetrack.db.note;
import de.jottyfan.timetrack.db.note.tables.TNote;
import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord;
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
* note.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Keys {
// -------------------------------------------------------------------------
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
public static final UniqueKey<TNoteRecord> T_NOTE_PKEY = Internal.createUniqueKey(TNote.T_NOTE, DSL.name("t_note_pkey"), new TableField[] { TNote.T_NOTE.PK }, true);
}

View File

@ -7,12 +7,9 @@ package de.jottyfan.timetrack.db.note;
import de.jottyfan.timetrack.db.DefaultCatalog; import de.jottyfan.timetrack.db.DefaultCatalog;
import de.jottyfan.timetrack.db.note.tables.TNote; import de.jottyfan.timetrack.db.note.tables.TNote;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.impl.SchemaImpl; import org.jooq.impl.SchemaImpl;
@ -21,17 +18,10 @@ import org.jooq.impl.SchemaImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Note extends SchemaImpl { public class Note extends SchemaImpl {
private static final long serialVersionUID = 462162811; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>note</code> * The reference instance of <code>note</code>
@ -41,7 +31,7 @@ public class Note extends SchemaImpl {
/** /**
* The table <code>note.t_note</code>. * The table <code>note.t_note</code>.
*/ */
public final TNote T_NOTE = de.jottyfan.timetrack.db.note.tables.TNote.T_NOTE; public final TNote T_NOTE = TNote.T_NOTE;
/** /**
* No further instances allowed * No further instances allowed
@ -58,12 +48,6 @@ public class Note extends SchemaImpl {
@Override @Override
public final List<Table<?>> getTables() { public final List<Table<?>> getTables() {
List result = new ArrayList();
result.addAll(getTables0());
return result;
}
private final List<Table<?>> getTables0() {
return Arrays.<Table<?>>asList( return Arrays.<Table<?>>asList(
TNote.T_NOTE); TNote.T_NOTE);
} }

View File

@ -6,19 +6,10 @@ package de.jottyfan.timetrack.db.note;
import de.jottyfan.timetrack.db.note.tables.TNote; import de.jottyfan.timetrack.db.note.tables.TNote;
import javax.annotation.processing.Generated;
/** /**
* Convenience access to all tables in note * Convenience access to all tables in note.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables { public class Tables {

View File

@ -6,8 +6,6 @@ package de.jottyfan.timetrack.db.note.enums;
import de.jottyfan.timetrack.db.note.Note; import de.jottyfan.timetrack.db.note.Note;
import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.EnumType; import org.jooq.EnumType;
import org.jooq.Schema; import org.jooq.Schema;
@ -16,13 +14,6 @@ import org.jooq.Schema;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public enum EnumCategory implements EnumType { public enum EnumCategory implements EnumType {
@ -50,7 +41,7 @@ public enum EnumCategory implements EnumType {
@Override @Override
public Catalog getCatalog() { public Catalog getCatalog() {
return getSchema() == null ? null : getSchema().getCatalog(); return getSchema().getCatalog();
} }
@Override @Override

View File

@ -6,8 +6,6 @@ package de.jottyfan.timetrack.db.note.enums;
import de.jottyfan.timetrack.db.note.Note; import de.jottyfan.timetrack.db.note.Note;
import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.EnumType; import org.jooq.EnumType;
import org.jooq.Schema; import org.jooq.Schema;
@ -16,13 +14,6 @@ import org.jooq.Schema;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public enum EnumNotetype implements EnumType { public enum EnumNotetype implements EnumType {
@ -38,7 +29,7 @@ public enum EnumNotetype implements EnumType {
@Override @Override
public Catalog getCatalog() { public Catalog getCatalog() {
return getSchema() == null ? null : getSchema().getCatalog(); return getSchema().getCatalog();
} }
@Override @Override

View File

@ -4,45 +4,39 @@
package de.jottyfan.timetrack.db.note.tables; package de.jottyfan.timetrack.db.note.tables;
import de.jottyfan.timetrack.db.note.Indexes; import de.jottyfan.timetrack.db.note.Keys;
import de.jottyfan.timetrack.db.note.Note; import de.jottyfan.timetrack.db.note.Note;
import de.jottyfan.timetrack.db.note.enums.EnumCategory; import de.jottyfan.timetrack.db.note.enums.EnumCategory;
import de.jottyfan.timetrack.db.note.enums.EnumNotetype; import de.jottyfan.timetrack.db.note.enums.EnumNotetype;
import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord; import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Identity;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row6; import org.jooq.Row6;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TNote extends TableImpl<TNoteRecord> { public class TNote extends TableImpl<TNoteRecord> {
private static final long serialVersionUID = -601146141; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>note.t_note</code> * The reference instance of <code>note.t_note</code>
@ -60,38 +54,39 @@ public class TNote extends TableImpl<TNoteRecord> {
/** /**
* The column <code>note.t_note.pk</code>. * The column <code>note.t_note.pk</code>.
*/ */
public final TableField<TNoteRecord, Integer> PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TNoteRecord, Integer> PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/** /**
* The column <code>note.t_note.title</code>. * The column <code>note.t_note.title</code>.
*/ */
public final TableField<TNoteRecord, String> TITLE = createField(DSL.name("title"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<TNoteRecord, String> TITLE = createField(DSL.name("title"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>note.t_note.category</code>. * The column <code>note.t_note.category</code>.
*/ */
public final TableField<TNoteRecord, EnumCategory> CATEGORY = createField(DSL.name("category"), org.jooq.impl.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(de.jottyfan.timetrack.db.note.enums.EnumCategory.class), this, "");
/** /**
* The column <code>note.t_note.notetype</code>. * The column <code>note.t_note.notetype</code>.
*/ */
public final TableField<TNoteRecord, EnumNotetype> NOTETYPE = createField(DSL.name("notetype"), org.jooq.impl.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(de.jottyfan.timetrack.db.note.enums.EnumNotetype.class), this, "");
/** /**
* The column <code>note.t_note.content</code>. * The column <code>note.t_note.content</code>.
*/ */
public final TableField<TNoteRecord, String> CONTENT = createField(DSL.name("content"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<TNoteRecord, String> CONTENT = createField(DSL.name("content"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>note.t_note.lastchange</code>. * The column <code>note.t_note.lastchange</code>.
*/ */
public final TableField<TNoteRecord, Timestamp> LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); public final TableField<TNoteRecord, LocalDateTime> LASTCHANGE = createField(DSL.name("lastchange"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field("now()", SQLDataType.LOCALDATETIME)), this, "");
/** private TNote(Name alias, Table<TNoteRecord> aliased) {
* Create a <code>note.t_note</code> table reference this(alias, aliased, null);
*/ }
public TNote() {
this(DSL.name("t_note"), null); private TNote(Name alias, Table<TNoteRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
} }
/** /**
@ -108,12 +103,11 @@ public class TNote extends TableImpl<TNoteRecord> {
this(alias, T_NOTE); this(alias, T_NOTE);
} }
private TNote(Name alias, Table<TNoteRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>note.t_note</code> table reference
} */
public TNote() {
private TNote(Name alias, Table<TNoteRecord> aliased, Field<?>[] parameters) { this(DSL.name("t_note"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> TNote(Table<O> child, ForeignKey<O, TNoteRecord> key) { public <O extends Record> TNote(Table<O> child, ForeignKey<O, TNoteRecord> key) {
@ -126,8 +120,18 @@ public class TNote extends TableImpl<TNoteRecord> {
} }
@Override @Override
public List<Index> getIndexes() { public Identity<TNoteRecord, Integer> getIdentity() {
return Arrays.<Index>asList(Indexes.T_NOTE_PKEY); return (Identity<TNoteRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<TNoteRecord> getPrimaryKey() {
return Keys.T_NOTE_PKEY;
}
@Override
public List<UniqueKey<TNoteRecord>> getKeys() {
return Arrays.<UniqueKey<TNoteRecord>>asList(Keys.T_NOTE_PKEY);
} }
@Override @Override
@ -161,7 +165,7 @@ public class TNote extends TableImpl<TNoteRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row6<Integer, String, EnumCategory, EnumNotetype, String, Timestamp> fieldsRow() { public Row6<Integer, String, EnumCategory, EnumNotetype, String, LocalDateTime> fieldsRow() {
return (Row6) super.fieldsRow(); return (Row6) super.fieldsRow();
} }
} }

View File

@ -8,30 +8,22 @@ import de.jottyfan.timetrack.db.note.enums.EnumCategory;
import de.jottyfan.timetrack.db.note.enums.EnumNotetype; import de.jottyfan.timetrack.db.note.enums.EnumNotetype;
import de.jottyfan.timetrack.db.note.tables.TNote; import de.jottyfan.timetrack.db.note.tables.TNote;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record1;
import org.jooq.Record6; import org.jooq.Record6;
import org.jooq.Row6; import org.jooq.Row6;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6<Integer, String, EnumCategory, EnumNotetype, String, Timestamp> { public class TNoteRecord extends UpdatableRecordImpl<TNoteRecord> implements Record6<Integer, String, EnumCategory, EnumNotetype, String, LocalDateTime> {
private static final long serialVersionUID = 828107821; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>note.t_note.pk</code>. * Setter for <code>note.t_note.pk</code>.
@ -106,15 +98,24 @@ public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6
/** /**
* Setter for <code>note.t_note.lastchange</code>. * Setter for <code>note.t_note.lastchange</code>.
*/ */
public void setLastchange(Timestamp value) { public void setLastchange(LocalDateTime value) {
set(5, value); set(5, value);
} }
/** /**
* Getter for <code>note.t_note.lastchange</code>. * Getter for <code>note.t_note.lastchange</code>.
*/ */
public Timestamp getLastchange() { public LocalDateTime getLastchange() {
return (Timestamp) get(5); return (LocalDateTime) get(5);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Integer> key() {
return (Record1) super.key();
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@ -122,12 +123,12 @@ public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row6<Integer, String, EnumCategory, EnumNotetype, String, Timestamp> fieldsRow() { public Row6<Integer, String, EnumCategory, EnumNotetype, String, LocalDateTime> fieldsRow() {
return (Row6) super.fieldsRow(); return (Row6) super.fieldsRow();
} }
@Override @Override
public Row6<Integer, String, EnumCategory, EnumNotetype, String, Timestamp> valuesRow() { public Row6<Integer, String, EnumCategory, EnumNotetype, String, LocalDateTime> valuesRow() {
return (Row6) super.valuesRow(); return (Row6) super.valuesRow();
} }
@ -157,7 +158,7 @@ public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6
} }
@Override @Override
public Field<Timestamp> field6() { public Field<LocalDateTime> field6() {
return TNote.T_NOTE.LASTCHANGE; return TNote.T_NOTE.LASTCHANGE;
} }
@ -187,7 +188,7 @@ public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6
} }
@Override @Override
public Timestamp component6() { public LocalDateTime component6() {
return getLastchange(); return getLastchange();
} }
@ -217,7 +218,7 @@ public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6
} }
@Override @Override
public Timestamp value6() { public LocalDateTime value6() {
return getLastchange(); return getLastchange();
} }
@ -252,13 +253,13 @@ public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6
} }
@Override @Override
public TNoteRecord value6(Timestamp value) { public TNoteRecord value6(LocalDateTime value) {
setLastchange(value); setLastchange(value);
return this; return this;
} }
@Override @Override
public TNoteRecord values(Integer value1, String value2, EnumCategory value3, EnumNotetype value4, String value5, Timestamp value6) { public TNoteRecord values(Integer value1, String value2, EnumCategory value3, EnumNotetype value4, String value5, LocalDateTime value6) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -282,14 +283,14 @@ public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6
/** /**
* Create a detached, initialised TNoteRecord * Create a detached, initialised TNoteRecord
*/ */
public TNoteRecord(Integer pk, String title, EnumCategory category, EnumNotetype notetype, String content, Timestamp lastchange) { public TNoteRecord(Integer pk, String title, EnumCategory category, EnumNotetype notetype, String content, LocalDateTime lastchange) {
super(TNote.T_NOTE); super(TNote.T_NOTE);
set(0, pk); setPk(pk);
set(1, title); setTitle(title);
set(2, category); setCategory(category);
set(3, notetype); setNotetype(notetype);
set(4, content); setContent(content);
set(5, lastchange); setLastchange(lastchange);
} }
} }

View File

@ -1,54 +0,0 @@
/*
* This file is generated by jOOQ.
*/
package de.jottyfan.timetrack.db.profile;
import de.jottyfan.timetrack.db.profile.tables.TLogin;
import de.jottyfan.timetrack.db.profile.tables.TLoginrole;
import de.jottyfan.timetrack.db.profile.tables.TRole;
import javax.annotation.processing.Generated;
import org.jooq.Index;
import org.jooq.OrderField;
import org.jooq.impl.Internal;
/**
* A class modelling indexes of tables of the <code>profile</code> schema.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Indexes {
// -------------------------------------------------------------------------
// INDEX definitions
// -------------------------------------------------------------------------
public static final Index T_LOGIN_LOGIN_KEY = Indexes0.T_LOGIN_LOGIN_KEY;
public static final Index T_LOGIN_PKEY = Indexes0.T_LOGIN_PKEY;
public static final Index T_LOGINROLE_FK_LOGIN_FK_ROLE_KEY = Indexes0.T_LOGINROLE_FK_LOGIN_FK_ROLE_KEY;
public static final Index T_LOGINROLE_PKEY = Indexes0.T_LOGINROLE_PKEY;
public static final Index T_ROLE_NAME_KEY = Indexes0.T_ROLE_NAME_KEY;
public static final Index T_ROLE_PKEY = Indexes0.T_ROLE_PKEY;
// -------------------------------------------------------------------------
// [#1459] distribute members to avoid static initialisers > 64kb
// -------------------------------------------------------------------------
private static class Indexes0 {
public static Index T_LOGIN_LOGIN_KEY = Internal.createIndex("t_login_login_key", TLogin.T_LOGIN, new OrderField[] { TLogin.T_LOGIN.LOGIN }, true);
public static Index T_LOGIN_PKEY = Internal.createIndex("t_login_pkey", TLogin.T_LOGIN, new OrderField[] { TLogin.T_LOGIN.PK }, true);
public static Index T_LOGINROLE_FK_LOGIN_FK_ROLE_KEY = Internal.createIndex("t_loginrole_fk_login_fk_role_key", TLoginrole.T_LOGINROLE, new OrderField[] { TLoginrole.T_LOGINROLE.FK_LOGIN, TLoginrole.T_LOGINROLE.FK_ROLE }, true);
public static Index T_LOGINROLE_PKEY = Internal.createIndex("t_loginrole_pkey", TLoginrole.T_LOGINROLE, new OrderField[] { TLoginrole.T_LOGINROLE.PK }, true);
public static Index T_ROLE_NAME_KEY = Internal.createIndex("t_role_name_key", TRole.T_ROLE, new OrderField[] { TRole.T_ROLE.NAME }, true);
public static Index T_ROLE_PKEY = Internal.createIndex("t_role_pkey", TRole.T_ROLE, new OrderField[] { TRole.T_ROLE.PK }, true);
}
}

View File

@ -0,0 +1,45 @@
/*
* This file is generated by jOOQ.
*/
package de.jottyfan.timetrack.db.profile;
import de.jottyfan.timetrack.db.profile.tables.TLogin;
import de.jottyfan.timetrack.db.profile.tables.TLoginrole;
import de.jottyfan.timetrack.db.profile.tables.TRole;
import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord;
import de.jottyfan.timetrack.db.profile.tables.records.TLoginroleRecord;
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;
import org.jooq.impl.Internal;
/**
* A class modelling foreign key relationships and constraints of tables in
* profile.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Keys {
// -------------------------------------------------------------------------
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
public static final UniqueKey<TLoginRecord> T_LOGIN_LOGIN_KEY = Internal.createUniqueKey(TLogin.T_LOGIN, DSL.name("t_login_login_key"), new TableField[] { TLogin.T_LOGIN.LOGIN }, true);
public static final UniqueKey<TLoginRecord> T_LOGIN_PKEY = Internal.createUniqueKey(TLogin.T_LOGIN, DSL.name("t_login_pkey"), new TableField[] { TLogin.T_LOGIN.PK }, true);
public static final UniqueKey<TLoginroleRecord> T_LOGINROLE_FK_LOGIN_FK_ROLE_KEY = Internal.createUniqueKey(TLoginrole.T_LOGINROLE, DSL.name("t_loginrole_fk_login_fk_role_key"), new TableField[] { TLoginrole.T_LOGINROLE.FK_LOGIN, TLoginrole.T_LOGINROLE.FK_ROLE }, true);
public static final UniqueKey<TLoginroleRecord> T_LOGINROLE_PKEY = Internal.createUniqueKey(TLoginrole.T_LOGINROLE, DSL.name("t_loginrole_pkey"), new TableField[] { TLoginrole.T_LOGINROLE.PK }, 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);
}

View File

@ -10,12 +10,9 @@ import de.jottyfan.timetrack.db.profile.tables.TLoginrole;
import de.jottyfan.timetrack.db.profile.tables.TRole; import de.jottyfan.timetrack.db.profile.tables.TRole;
import de.jottyfan.timetrack.db.profile.tables.VLoginrole; import de.jottyfan.timetrack.db.profile.tables.VLoginrole;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.impl.SchemaImpl; import org.jooq.impl.SchemaImpl;
@ -24,17 +21,10 @@ import org.jooq.impl.SchemaImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Profile extends SchemaImpl { public class Profile extends SchemaImpl {
private static final long serialVersionUID = -215060084; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>profile</code> * The reference instance of <code>profile</code>
@ -44,22 +34,22 @@ public class Profile extends SchemaImpl {
/** /**
* The table <code>profile.t_login</code>. * The table <code>profile.t_login</code>.
*/ */
public final TLogin T_LOGIN = de.jottyfan.timetrack.db.profile.tables.TLogin.T_LOGIN; public final TLogin T_LOGIN = TLogin.T_LOGIN;
/** /**
* The table <code>profile.t_loginrole</code>. * The table <code>profile.t_loginrole</code>.
*/ */
public final TLoginrole T_LOGINROLE = de.jottyfan.timetrack.db.profile.tables.TLoginrole.T_LOGINROLE; public final TLoginrole T_LOGINROLE = TLoginrole.T_LOGINROLE;
/** /**
* The table <code>profile.t_role</code>. * The table <code>profile.t_role</code>.
*/ */
public final TRole T_ROLE = de.jottyfan.timetrack.db.profile.tables.TRole.T_ROLE; public final TRole T_ROLE = TRole.T_ROLE;
/** /**
* The table <code>profile.v_loginrole</code>. * The table <code>profile.v_loginrole</code>.
*/ */
public final VLoginrole V_LOGINROLE = de.jottyfan.timetrack.db.profile.tables.VLoginrole.V_LOGINROLE; public final VLoginrole V_LOGINROLE = VLoginrole.V_LOGINROLE;
/** /**
* No further instances allowed * No further instances allowed
@ -76,12 +66,6 @@ public class Profile extends SchemaImpl {
@Override @Override
public final List<Table<?>> getTables() { public final List<Table<?>> getTables() {
List result = new ArrayList();
result.addAll(getTables0());
return result;
}
private final List<Table<?>> getTables0() {
return Arrays.<Table<?>>asList( return Arrays.<Table<?>>asList(
TLogin.T_LOGIN, TLogin.T_LOGIN,
TLoginrole.T_LOGINROLE, TLoginrole.T_LOGINROLE,

View File

@ -9,19 +9,10 @@ import de.jottyfan.timetrack.db.profile.tables.TLoginrole;
import de.jottyfan.timetrack.db.profile.tables.TRole; import de.jottyfan.timetrack.db.profile.tables.TRole;
import de.jottyfan.timetrack.db.profile.tables.VLoginrole; import de.jottyfan.timetrack.db.profile.tables.VLoginrole;
import javax.annotation.processing.Generated;
/** /**
* Convenience access to all tables in profile * Convenience access to all tables in profile.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables { public class Tables {

View File

@ -4,43 +4,37 @@
package de.jottyfan.timetrack.db.profile.tables; package de.jottyfan.timetrack.db.profile.tables;
import de.jottyfan.timetrack.db.profile.Indexes; import de.jottyfan.timetrack.db.profile.Keys;
import de.jottyfan.timetrack.db.profile.Profile; import de.jottyfan.timetrack.db.profile.Profile;
import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord; import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Identity;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row7; import org.jooq.Row7;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TLogin extends TableImpl<TLoginRecord> { public class TLogin extends TableImpl<TLoginRecord> {
private static final long serialVersionUID = 2055988705; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>profile.t_login</code> * The reference instance of <code>profile.t_login</code>
@ -58,43 +52,44 @@ public class TLogin extends TableImpl<TLoginRecord> {
/** /**
* The column <code>profile.t_login.lastchange</code>. * The column <code>profile.t_login.lastchange</code>.
*/ */
public final TableField<TLoginRecord, Timestamp> LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); public final TableField<TLoginRecord, LocalDateTime> LASTCHANGE = createField(DSL.name("lastchange"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field("now()", SQLDataType.LOCALDATETIME)), this, "");
/** /**
* The column <code>profile.t_login.pk</code>. * The column <code>profile.t_login.pk</code>.
*/ */
public final TableField<TLoginRecord, Integer> PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TLoginRecord, Integer> PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/** /**
* The column <code>profile.t_login.login</code>. * The column <code>profile.t_login.login</code>.
*/ */
public final TableField<TLoginRecord, String> LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); public final TableField<TLoginRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB.nullable(false), this, "");
/** /**
* The column <code>profile.t_login.forename</code>. * The column <code>profile.t_login.forename</code>.
*/ */
public final TableField<TLoginRecord, String> FORENAME = createField(DSL.name("forename"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<TLoginRecord, String> FORENAME = createField(DSL.name("forename"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>profile.t_login.surname</code>. * The column <code>profile.t_login.surname</code>.
*/ */
public final TableField<TLoginRecord, String> SURNAME = createField(DSL.name("surname"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<TLoginRecord, String> SURNAME = createField(DSL.name("surname"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>profile.t_login.duedate</code>. * The column <code>profile.t_login.duedate</code>.
*/ */
public final TableField<TLoginRecord, Timestamp> DUEDATE = createField(DSL.name("duedate"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false), this, ""); public final TableField<TLoginRecord, LocalDateTime> DUEDATE = createField(DSL.name("duedate"), SQLDataType.LOCALDATETIME(6).nullable(false), this, "");
/** /**
* The column <code>profile.t_login.password</code>. * The column <code>profile.t_login.password</code>.
*/ */
public final TableField<TLoginRecord, String> PASSWORD = createField(DSL.name("password"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); public final TableField<TLoginRecord, String> PASSWORD = createField(DSL.name("password"), SQLDataType.CLOB.nullable(false), this, "");
/** private TLogin(Name alias, Table<TLoginRecord> aliased) {
* Create a <code>profile.t_login</code> table reference this(alias, aliased, null);
*/ }
public TLogin() {
this(DSL.name("t_login"), null); private TLogin(Name alias, Table<TLoginRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
} }
/** /**
@ -111,12 +106,11 @@ public class TLogin extends TableImpl<TLoginRecord> {
this(alias, T_LOGIN); this(alias, T_LOGIN);
} }
private TLogin(Name alias, Table<TLoginRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>profile.t_login</code> table reference
} */
public TLogin() {
private TLogin(Name alias, Table<TLoginRecord> aliased, Field<?>[] parameters) { this(DSL.name("t_login"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> TLogin(Table<O> child, ForeignKey<O, TLoginRecord> key) { public <O extends Record> TLogin(Table<O> child, ForeignKey<O, TLoginRecord> key) {
@ -129,8 +123,18 @@ public class TLogin extends TableImpl<TLoginRecord> {
} }
@Override @Override
public List<Index> getIndexes() { public Identity<TLoginRecord, Integer> getIdentity() {
return Arrays.<Index>asList(Indexes.T_LOGIN_LOGIN_KEY, Indexes.T_LOGIN_PKEY); return (Identity<TLoginRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<TLoginRecord> getPrimaryKey() {
return Keys.T_LOGIN_PKEY;
}
@Override
public List<UniqueKey<TLoginRecord>> getKeys() {
return Arrays.<UniqueKey<TLoginRecord>>asList(Keys.T_LOGIN_PKEY, Keys.T_LOGIN_LOGIN_KEY);
} }
@Override @Override
@ -164,7 +168,7 @@ public class TLogin extends TableImpl<TLoginRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row7<Timestamp, Integer, String, String, String, Timestamp, String> fieldsRow() { public Row7<LocalDateTime, Integer, String, String, String, LocalDateTime, String> fieldsRow() {
return (Row7) super.fieldsRow(); return (Row7) super.fieldsRow();
} }
} }

View File

@ -4,43 +4,37 @@
package de.jottyfan.timetrack.db.profile.tables; package de.jottyfan.timetrack.db.profile.tables;
import de.jottyfan.timetrack.db.profile.Indexes; import de.jottyfan.timetrack.db.profile.Keys;
import de.jottyfan.timetrack.db.profile.Profile; import de.jottyfan.timetrack.db.profile.Profile;
import de.jottyfan.timetrack.db.profile.tables.records.TLoginroleRecord; import de.jottyfan.timetrack.db.profile.tables.records.TLoginroleRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Identity;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row4; import org.jooq.Row4;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TLoginrole extends TableImpl<TLoginroleRecord> { public class TLoginrole extends TableImpl<TLoginroleRecord> {
private static final long serialVersionUID = 404673647; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>profile.t_loginrole</code> * The reference instance of <code>profile.t_loginrole</code>
@ -58,28 +52,29 @@ public class TLoginrole extends TableImpl<TLoginroleRecord> {
/** /**
* The column <code>profile.t_loginrole.lastchange</code>. * The column <code>profile.t_loginrole.lastchange</code>.
*/ */
public final TableField<TLoginroleRecord, Timestamp> LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); public final TableField<TLoginroleRecord, LocalDateTime> LASTCHANGE = createField(DSL.name("lastchange"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field("now()", SQLDataType.LOCALDATETIME)), this, "");
/** /**
* The column <code>profile.t_loginrole.pk</code>. * The column <code>profile.t_loginrole.pk</code>.
*/ */
public final TableField<TLoginroleRecord, Integer> PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TLoginroleRecord, Integer> PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/** /**
* The column <code>profile.t_loginrole.fk_login</code>. * The column <code>profile.t_loginrole.fk_login</code>.
*/ */
public final TableField<TLoginroleRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TLoginroleRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), SQLDataType.INTEGER.nullable(false), this, "");
/** /**
* The column <code>profile.t_loginrole.fk_role</code>. * The column <code>profile.t_loginrole.fk_role</code>.
*/ */
public final TableField<TLoginroleRecord, Integer> FK_ROLE = createField(DSL.name("fk_role"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TLoginroleRecord, Integer> FK_ROLE = createField(DSL.name("fk_role"), SQLDataType.INTEGER.nullable(false), this, "");
/** private TLoginrole(Name alias, Table<TLoginroleRecord> aliased) {
* Create a <code>profile.t_loginrole</code> table reference this(alias, aliased, null);
*/ }
public TLoginrole() {
this(DSL.name("t_loginrole"), null); private TLoginrole(Name alias, Table<TLoginroleRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
} }
/** /**
@ -96,12 +91,11 @@ public class TLoginrole extends TableImpl<TLoginroleRecord> {
this(alias, T_LOGINROLE); this(alias, T_LOGINROLE);
} }
private TLoginrole(Name alias, Table<TLoginroleRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>profile.t_loginrole</code> table reference
} */
public TLoginrole() {
private TLoginrole(Name alias, Table<TLoginroleRecord> aliased, Field<?>[] parameters) { this(DSL.name("t_loginrole"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> TLoginrole(Table<O> child, ForeignKey<O, TLoginroleRecord> key) { public <O extends Record> TLoginrole(Table<O> child, ForeignKey<O, TLoginroleRecord> key) {
@ -114,8 +108,31 @@ public class TLoginrole extends TableImpl<TLoginroleRecord> {
} }
@Override @Override
public List<Index> getIndexes() { public Identity<TLoginroleRecord, Integer> getIdentity() {
return Arrays.<Index>asList(Indexes.T_LOGINROLE_FK_LOGIN_FK_ROLE_KEY, Indexes.T_LOGINROLE_PKEY); return (Identity<TLoginroleRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<TLoginroleRecord> getPrimaryKey() {
return Keys.T_LOGINROLE_PKEY;
}
@Override
public List<UniqueKey<TLoginroleRecord>> getKeys() {
return Arrays.<UniqueKey<TLoginroleRecord>>asList(Keys.T_LOGINROLE_PKEY, Keys.T_LOGINROLE_FK_LOGIN_FK_ROLE_KEY);
}
@Override
public List<ForeignKey<TLoginroleRecord, ?>> getReferences() {
return Arrays.<ForeignKey<TLoginroleRecord, ?>>asList(Keys.T_LOGINROLE__T_LOGINROLE_FK_LOGIN_FKEY, Keys.T_LOGINROLE__T_LOGINROLE_FK_ROLE_FKEY);
}
public TLogin tLogin() {
return new TLogin(this, Keys.T_LOGINROLE__T_LOGINROLE_FK_LOGIN_FKEY);
}
public TRole tRole() {
return new TRole(this, Keys.T_LOGINROLE__T_LOGINROLE_FK_ROLE_FKEY);
} }
@Override @Override
@ -149,7 +166,7 @@ public class TLoginrole extends TableImpl<TLoginroleRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row4<Timestamp, Integer, Integer, Integer> fieldsRow() { public Row4<LocalDateTime, Integer, Integer, Integer> fieldsRow() {
return (Row4) super.fieldsRow(); return (Row4) super.fieldsRow();
} }
} }

View File

@ -4,43 +4,37 @@
package de.jottyfan.timetrack.db.profile.tables; package de.jottyfan.timetrack.db.profile.tables;
import de.jottyfan.timetrack.db.profile.Indexes; import de.jottyfan.timetrack.db.profile.Keys;
import de.jottyfan.timetrack.db.profile.Profile; import de.jottyfan.timetrack.db.profile.Profile;
import de.jottyfan.timetrack.db.profile.tables.records.TRoleRecord; import de.jottyfan.timetrack.db.profile.tables.records.TRoleRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Identity;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row3; import org.jooq.Row3;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TRole extends TableImpl<TRoleRecord> { public class TRole extends TableImpl<TRoleRecord> {
private static final long serialVersionUID = -1967676639; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>profile.t_role</code> * The reference instance of <code>profile.t_role</code>
@ -58,23 +52,24 @@ public class TRole extends TableImpl<TRoleRecord> {
/** /**
* The column <code>profile.t_role.lastchange</code>. * The column <code>profile.t_role.lastchange</code>.
*/ */
public final TableField<TRoleRecord, Timestamp> LASTCHANGE = createField(DSL.name("lastchange"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); public final TableField<TRoleRecord, LocalDateTime> LASTCHANGE = createField(DSL.name("lastchange"), SQLDataType.LOCALDATETIME(6).defaultValue(DSL.field("now()", SQLDataType.LOCALDATETIME)), this, "");
/** /**
* The column <code>profile.t_role.pk</code>. * The column <code>profile.t_role.pk</code>.
*/ */
public final TableField<TRoleRecord, Integer> PK = createField(DSL.name("pk"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TRoleRecord, Integer> PK = createField(DSL.name("pk"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/** /**
* The column <code>profile.t_role.name</code>. * The column <code>profile.t_role.name</code>.
*/ */
public final TableField<TRoleRecord, String> NAME = createField(DSL.name("name"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); public final TableField<TRoleRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
/** private TRole(Name alias, Table<TRoleRecord> aliased) {
* Create a <code>profile.t_role</code> table reference this(alias, aliased, null);
*/ }
public TRole() {
this(DSL.name("t_role"), null); private TRole(Name alias, Table<TRoleRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
} }
/** /**
@ -91,12 +86,11 @@ public class TRole extends TableImpl<TRoleRecord> {
this(alias, T_ROLE); this(alias, T_ROLE);
} }
private TRole(Name alias, Table<TRoleRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>profile.t_role</code> table reference
} */
public TRole() {
private TRole(Name alias, Table<TRoleRecord> aliased, Field<?>[] parameters) { this(DSL.name("t_role"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> TRole(Table<O> child, ForeignKey<O, TRoleRecord> key) { public <O extends Record> TRole(Table<O> child, ForeignKey<O, TRoleRecord> key) {
@ -109,8 +103,18 @@ public class TRole extends TableImpl<TRoleRecord> {
} }
@Override @Override
public List<Index> getIndexes() { public Identity<TRoleRecord, Integer> getIdentity() {
return Arrays.<Index>asList(Indexes.T_ROLE_NAME_KEY, Indexes.T_ROLE_PKEY); return (Identity<TRoleRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<TRoleRecord> getPrimaryKey() {
return Keys.T_ROLE_PKEY;
}
@Override
public List<UniqueKey<TRoleRecord>> getKeys() {
return Arrays.<UniqueKey<TRoleRecord>>asList(Keys.T_ROLE_PKEY, Keys.T_ROLE_NAME_KEY);
} }
@Override @Override
@ -144,7 +148,7 @@ public class TRole extends TableImpl<TRoleRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row3<Timestamp, Integer, String> fieldsRow() { public Row3<LocalDateTime, Integer, String> fieldsRow() {
return (Row3) super.fieldsRow(); return (Row3) super.fieldsRow();
} }
} }

View File

@ -7,9 +7,7 @@ package de.jottyfan.timetrack.db.profile.tables;
import de.jottyfan.timetrack.db.profile.Profile; import de.jottyfan.timetrack.db.profile.Profile;
import de.jottyfan.timetrack.db.profile.tables.records.VLoginroleRecord; import de.jottyfan.timetrack.db.profile.tables.records.VLoginroleRecord;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -19,24 +17,19 @@ import org.jooq.Row5;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl; import org.jooq.impl.TableImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VLoginrole extends TableImpl<VLoginroleRecord> { public class VLoginrole extends TableImpl<VLoginroleRecord> {
private static final long serialVersionUID = -1240355347; private static final long serialVersionUID = 1L;
/** /**
* The reference instance of <code>profile.v_loginrole</code> * The reference instance of <code>profile.v_loginrole</code>
@ -54,33 +47,34 @@ public class VLoginrole extends TableImpl<VLoginroleRecord> {
/** /**
* The column <code>profile.v_loginrole.login</code>. * The column <code>profile.v_loginrole.login</code>.
*/ */
public final TableField<VLoginroleRecord, String> LOGIN = createField(DSL.name("login"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VLoginroleRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>profile.v_loginrole.forename</code>. * The column <code>profile.v_loginrole.forename</code>.
*/ */
public final TableField<VLoginroleRecord, String> FORENAME = createField(DSL.name("forename"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VLoginroleRecord, String> FORENAME = createField(DSL.name("forename"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>profile.v_loginrole.surname</code>. * The column <code>profile.v_loginrole.surname</code>.
*/ */
public final TableField<VLoginroleRecord, String> SURNAME = createField(DSL.name("surname"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VLoginroleRecord, String> SURNAME = createField(DSL.name("surname"), SQLDataType.CLOB, this, "");
/** /**
* The column <code>profile.v_loginrole.duedate</code>. * The column <code>profile.v_loginrole.duedate</code>.
*/ */
public final TableField<VLoginroleRecord, Timestamp> DUEDATE = createField(DSL.name("duedate"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); public final TableField<VLoginroleRecord, LocalDateTime> DUEDATE = createField(DSL.name("duedate"), SQLDataType.LOCALDATETIME(6), this, "");
/** /**
* The column <code>profile.v_loginrole.role_name</code>. * The column <code>profile.v_loginrole.role_name</code>.
*/ */
public final TableField<VLoginroleRecord, String> ROLE_NAME = createField(DSL.name("role_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); public final TableField<VLoginroleRecord, String> ROLE_NAME = createField(DSL.name("role_name"), SQLDataType.CLOB, this, "");
/** private VLoginrole(Name alias, Table<VLoginroleRecord> aliased) {
* Create a <code>profile.v_loginrole</code> table reference this(alias, aliased, null);
*/ }
public VLoginrole() {
this(DSL.name("v_loginrole"), null); private VLoginrole(Name alias, Table<VLoginroleRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view());
} }
/** /**
@ -97,12 +91,11 @@ public class VLoginrole extends TableImpl<VLoginroleRecord> {
this(alias, V_LOGINROLE); this(alias, V_LOGINROLE);
} }
private VLoginrole(Name alias, Table<VLoginroleRecord> aliased) { /**
this(alias, aliased, null); * Create a <code>profile.v_loginrole</code> table reference
} */
public VLoginrole() {
private VLoginrole(Name alias, Table<VLoginroleRecord> aliased, Field<?>[] parameters) { this(DSL.name("v_loginrole"), null);
super(alias, null, aliased, parameters, DSL.comment(""));
} }
public <O extends Record> VLoginrole(Table<O> child, ForeignKey<O, VLoginroleRecord> key) { public <O extends Record> VLoginrole(Table<O> child, ForeignKey<O, VLoginroleRecord> key) {
@ -145,7 +138,7 @@ public class VLoginrole extends TableImpl<VLoginroleRecord> {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row5<String, String, String, Timestamp, String> fieldsRow() { public Row5<String, String, String, LocalDateTime, String> fieldsRow() {
return (Row5) super.fieldsRow(); return (Row5) super.fieldsRow();
} }
} }

View File

@ -6,43 +6,35 @@ package de.jottyfan.timetrack.db.profile.tables.records;
import de.jottyfan.timetrack.db.profile.tables.TLogin; import de.jottyfan.timetrack.db.profile.tables.TLogin;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record1;
import org.jooq.Record7; import org.jooq.Record7;
import org.jooq.Row7; import org.jooq.Row7;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Record7<Timestamp, Integer, String, String, String, Timestamp, String> { public class TLoginRecord extends UpdatableRecordImpl<TLoginRecord> implements Record7<LocalDateTime, Integer, String, String, String, LocalDateTime, String> {
private static final long serialVersionUID = 386473188; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>profile.t_login.lastchange</code>. * Setter for <code>profile.t_login.lastchange</code>.
*/ */
public void setLastchange(Timestamp value) { public void setLastchange(LocalDateTime value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>profile.t_login.lastchange</code>. * Getter for <code>profile.t_login.lastchange</code>.
*/ */
public Timestamp getLastchange() { public LocalDateTime getLastchange() {
return (Timestamp) get(0); return (LocalDateTime) get(0);
} }
/** /**
@ -104,15 +96,15 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
/** /**
* Setter for <code>profile.t_login.duedate</code>. * Setter for <code>profile.t_login.duedate</code>.
*/ */
public void setDuedate(Timestamp value) { public void setDuedate(LocalDateTime value) {
set(5, value); set(5, value);
} }
/** /**
* Getter for <code>profile.t_login.duedate</code>. * Getter for <code>profile.t_login.duedate</code>.
*/ */
public Timestamp getDuedate() { public LocalDateTime getDuedate() {
return (Timestamp) get(5); return (LocalDateTime) get(5);
} }
/** /**
@ -129,22 +121,31 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
return (String) get(6); return (String) get(6);
} }
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record7 type implementation // Record7 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row7<Timestamp, Integer, String, String, String, Timestamp, String> fieldsRow() { public Row7<LocalDateTime, Integer, String, String, String, LocalDateTime, String> fieldsRow() {
return (Row7) super.fieldsRow(); return (Row7) super.fieldsRow();
} }
@Override @Override
public Row7<Timestamp, Integer, String, String, String, Timestamp, String> valuesRow() { public Row7<LocalDateTime, Integer, String, String, String, LocalDateTime, String> valuesRow() {
return (Row7) super.valuesRow(); return (Row7) super.valuesRow();
} }
@Override @Override
public Field<Timestamp> field1() { public Field<LocalDateTime> field1() {
return TLogin.T_LOGIN.LASTCHANGE; return TLogin.T_LOGIN.LASTCHANGE;
} }
@ -169,7 +170,7 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
} }
@Override @Override
public Field<Timestamp> field6() { public Field<LocalDateTime> field6() {
return TLogin.T_LOGIN.DUEDATE; return TLogin.T_LOGIN.DUEDATE;
} }
@ -179,7 +180,7 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
} }
@Override @Override
public Timestamp component1() { public LocalDateTime component1() {
return getLastchange(); return getLastchange();
} }
@ -204,7 +205,7 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
} }
@Override @Override
public Timestamp component6() { public LocalDateTime component6() {
return getDuedate(); return getDuedate();
} }
@ -214,7 +215,7 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
} }
@Override @Override
public Timestamp value1() { public LocalDateTime value1() {
return getLastchange(); return getLastchange();
} }
@ -239,7 +240,7 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
} }
@Override @Override
public Timestamp value6() { public LocalDateTime value6() {
return getDuedate(); return getDuedate();
} }
@ -249,7 +250,7 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
} }
@Override @Override
public TLoginRecord value1(Timestamp value) { public TLoginRecord value1(LocalDateTime value) {
setLastchange(value); setLastchange(value);
return this; return this;
} }
@ -279,7 +280,7 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
} }
@Override @Override
public TLoginRecord value6(Timestamp value) { public TLoginRecord value6(LocalDateTime value) {
setDuedate(value); setDuedate(value);
return this; return this;
} }
@ -291,7 +292,7 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
} }
@Override @Override
public TLoginRecord values(Timestamp value1, Integer value2, String value3, String value4, String value5, Timestamp value6, String value7) { public TLoginRecord values(LocalDateTime value1, Integer value2, String value3, String value4, String value5, LocalDateTime value6, String value7) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -316,15 +317,15 @@ public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Recor
/** /**
* Create a detached, initialised TLoginRecord * Create a detached, initialised TLoginRecord
*/ */
public TLoginRecord(Timestamp lastchange, Integer pk, String login, String forename, String surname, Timestamp duedate, String password) { public TLoginRecord(LocalDateTime lastchange, Integer pk, String login, String forename, String surname, LocalDateTime duedate, String password) {
super(TLogin.T_LOGIN); super(TLogin.T_LOGIN);
set(0, lastchange); setLastchange(lastchange);
set(1, pk); setPk(pk);
set(2, login); setLogin(login);
set(3, forename); setForename(forename);
set(4, surname); setSurname(surname);
set(5, duedate); setDuedate(duedate);
set(6, password); setPassword(password);
} }
} }

View File

@ -6,43 +6,35 @@ package de.jottyfan.timetrack.db.profile.tables.records;
import de.jottyfan.timetrack.db.profile.tables.TLoginrole; import de.jottyfan.timetrack.db.profile.tables.TLoginrole;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record1;
import org.jooq.Record4; import org.jooq.Record4;
import org.jooq.Row4; import org.jooq.Row4;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TLoginroleRecord extends TableRecordImpl<TLoginroleRecord> implements Record4<Timestamp, Integer, Integer, Integer> { public class TLoginroleRecord extends UpdatableRecordImpl<TLoginroleRecord> implements Record4<LocalDateTime, Integer, Integer, Integer> {
private static final long serialVersionUID = -986073453; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>profile.t_loginrole.lastchange</code>. * Setter for <code>profile.t_loginrole.lastchange</code>.
*/ */
public void setLastchange(Timestamp value) { public void setLastchange(LocalDateTime value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>profile.t_loginrole.lastchange</code>. * Getter for <code>profile.t_loginrole.lastchange</code>.
*/ */
public Timestamp getLastchange() { public LocalDateTime getLastchange() {
return (Timestamp) get(0); return (LocalDateTime) get(0);
} }
/** /**
@ -87,22 +79,31 @@ public class TLoginroleRecord extends TableRecordImpl<TLoginroleRecord> implemen
return (Integer) get(3); return (Integer) get(3);
} }
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record4 type implementation // Record4 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row4<Timestamp, Integer, Integer, Integer> fieldsRow() { public Row4<LocalDateTime, Integer, Integer, Integer> fieldsRow() {
return (Row4) super.fieldsRow(); return (Row4) super.fieldsRow();
} }
@Override @Override
public Row4<Timestamp, Integer, Integer, Integer> valuesRow() { public Row4<LocalDateTime, Integer, Integer, Integer> valuesRow() {
return (Row4) super.valuesRow(); return (Row4) super.valuesRow();
} }
@Override @Override
public Field<Timestamp> field1() { public Field<LocalDateTime> field1() {
return TLoginrole.T_LOGINROLE.LASTCHANGE; return TLoginrole.T_LOGINROLE.LASTCHANGE;
} }
@ -122,7 +123,7 @@ public class TLoginroleRecord extends TableRecordImpl<TLoginroleRecord> implemen
} }
@Override @Override
public Timestamp component1() { public LocalDateTime component1() {
return getLastchange(); return getLastchange();
} }
@ -142,7 +143,7 @@ public class TLoginroleRecord extends TableRecordImpl<TLoginroleRecord> implemen
} }
@Override @Override
public Timestamp value1() { public LocalDateTime value1() {
return getLastchange(); return getLastchange();
} }
@ -162,7 +163,7 @@ public class TLoginroleRecord extends TableRecordImpl<TLoginroleRecord> implemen
} }
@Override @Override
public TLoginroleRecord value1(Timestamp value) { public TLoginroleRecord value1(LocalDateTime value) {
setLastchange(value); setLastchange(value);
return this; return this;
} }
@ -186,7 +187,7 @@ public class TLoginroleRecord extends TableRecordImpl<TLoginroleRecord> implemen
} }
@Override @Override
public TLoginroleRecord values(Timestamp value1, Integer value2, Integer value3, Integer value4) { public TLoginroleRecord values(LocalDateTime value1, Integer value2, Integer value3, Integer value4) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -208,12 +209,12 @@ public class TLoginroleRecord extends TableRecordImpl<TLoginroleRecord> implemen
/** /**
* Create a detached, initialised TLoginroleRecord * Create a detached, initialised TLoginroleRecord
*/ */
public TLoginroleRecord(Timestamp lastchange, Integer pk, Integer fkLogin, Integer fkRole) { public TLoginroleRecord(LocalDateTime lastchange, Integer pk, Integer fkLogin, Integer fkRole) {
super(TLoginrole.T_LOGINROLE); super(TLoginrole.T_LOGINROLE);
set(0, lastchange); setLastchange(lastchange);
set(1, pk); setPk(pk);
set(2, fkLogin); setFkLogin(fkLogin);
set(3, fkRole); setFkRole(fkRole);
} }
} }

View File

@ -6,43 +6,35 @@ package de.jottyfan.timetrack.db.profile.tables.records;
import de.jottyfan.timetrack.db.profile.tables.TRole; import de.jottyfan.timetrack.db.profile.tables.TRole;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record1;
import org.jooq.Record3; import org.jooq.Record3;
import org.jooq.Row3; import org.jooq.Row3;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TRoleRecord extends TableRecordImpl<TRoleRecord> implements Record3<Timestamp, Integer, String> { public class TRoleRecord extends UpdatableRecordImpl<TRoleRecord> implements Record3<LocalDateTime, Integer, String> {
private static final long serialVersionUID = -1034367197; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>profile.t_role.lastchange</code>. * Setter for <code>profile.t_role.lastchange</code>.
*/ */
public void setLastchange(Timestamp value) { public void setLastchange(LocalDateTime value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>profile.t_role.lastchange</code>. * Getter for <code>profile.t_role.lastchange</code>.
*/ */
public Timestamp getLastchange() { public LocalDateTime getLastchange() {
return (Timestamp) get(0); return (LocalDateTime) get(0);
} }
/** /**
@ -73,22 +65,31 @@ public class TRoleRecord extends TableRecordImpl<TRoleRecord> implements Record3
return (String) get(2); return (String) get(2);
} }
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record3 type implementation // Record3 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row3<Timestamp, Integer, String> fieldsRow() { public Row3<LocalDateTime, Integer, String> fieldsRow() {
return (Row3) super.fieldsRow(); return (Row3) super.fieldsRow();
} }
@Override @Override
public Row3<Timestamp, Integer, String> valuesRow() { public Row3<LocalDateTime, Integer, String> valuesRow() {
return (Row3) super.valuesRow(); return (Row3) super.valuesRow();
} }
@Override @Override
public Field<Timestamp> field1() { public Field<LocalDateTime> field1() {
return TRole.T_ROLE.LASTCHANGE; return TRole.T_ROLE.LASTCHANGE;
} }
@ -103,7 +104,7 @@ public class TRoleRecord extends TableRecordImpl<TRoleRecord> implements Record3
} }
@Override @Override
public Timestamp component1() { public LocalDateTime component1() {
return getLastchange(); return getLastchange();
} }
@ -118,7 +119,7 @@ public class TRoleRecord extends TableRecordImpl<TRoleRecord> implements Record3
} }
@Override @Override
public Timestamp value1() { public LocalDateTime value1() {
return getLastchange(); return getLastchange();
} }
@ -133,7 +134,7 @@ public class TRoleRecord extends TableRecordImpl<TRoleRecord> implements Record3
} }
@Override @Override
public TRoleRecord value1(Timestamp value) { public TRoleRecord value1(LocalDateTime value) {
setLastchange(value); setLastchange(value);
return this; return this;
} }
@ -151,7 +152,7 @@ public class TRoleRecord extends TableRecordImpl<TRoleRecord> implements Record3
} }
@Override @Override
public TRoleRecord values(Timestamp value1, Integer value2, String value3) { public TRoleRecord values(LocalDateTime value1, Integer value2, String value3) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -172,11 +173,11 @@ public class TRoleRecord extends TableRecordImpl<TRoleRecord> implements Record3
/** /**
* Create a detached, initialised TRoleRecord * Create a detached, initialised TRoleRecord
*/ */
public TRoleRecord(Timestamp lastchange, Integer pk, String name) { public TRoleRecord(LocalDateTime lastchange, Integer pk, String name) {
super(TRole.T_ROLE); super(TRole.T_ROLE);
set(0, lastchange); setLastchange(lastchange);
set(1, pk); setPk(pk);
set(2, name); setName(name);
} }
} }

View File

@ -6,9 +6,7 @@ package de.jottyfan.timetrack.db.profile.tables.records;
import de.jottyfan.timetrack.db.profile.tables.VLoginrole; import de.jottyfan.timetrack.db.profile.tables.VLoginrole;
import java.sql.Timestamp; import java.time.LocalDateTime;
import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record5; import org.jooq.Record5;
@ -19,17 +17,10 @@ import org.jooq.impl.TableRecordImpl;
/** /**
* This class is generated by jOOQ. * This class is generated by jOOQ.
*/ */
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.12.1"
},
comments = "This class is generated by jOOQ"
)
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implements Record5<String, String, String, Timestamp, String> { public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implements Record5<String, String, String, LocalDateTime, String> {
private static final long serialVersionUID = 332588237; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>profile.v_loginrole.login</code>. * Setter for <code>profile.v_loginrole.login</code>.
@ -76,15 +67,15 @@ public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implemen
/** /**
* Setter for <code>profile.v_loginrole.duedate</code>. * Setter for <code>profile.v_loginrole.duedate</code>.
*/ */
public void setDuedate(Timestamp value) { public void setDuedate(LocalDateTime value) {
set(3, value); set(3, value);
} }
/** /**
* Getter for <code>profile.v_loginrole.duedate</code>. * Getter for <code>profile.v_loginrole.duedate</code>.
*/ */
public Timestamp getDuedate() { public LocalDateTime getDuedate() {
return (Timestamp) get(3); return (LocalDateTime) get(3);
} }
/** /**
@ -106,12 +97,12 @@ public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implemen
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row5<String, String, String, Timestamp, String> fieldsRow() { public Row5<String, String, String, LocalDateTime, String> fieldsRow() {
return (Row5) super.fieldsRow(); return (Row5) super.fieldsRow();
} }
@Override @Override
public Row5<String, String, String, Timestamp, String> valuesRow() { public Row5<String, String, String, LocalDateTime, String> valuesRow() {
return (Row5) super.valuesRow(); return (Row5) super.valuesRow();
} }
@ -131,7 +122,7 @@ public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implemen
} }
@Override @Override
public Field<Timestamp> field4() { public Field<LocalDateTime> field4() {
return VLoginrole.V_LOGINROLE.DUEDATE; return VLoginrole.V_LOGINROLE.DUEDATE;
} }
@ -156,7 +147,7 @@ public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implemen
} }
@Override @Override
public Timestamp component4() { public LocalDateTime component4() {
return getDuedate(); return getDuedate();
} }
@ -181,7 +172,7 @@ public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implemen
} }
@Override @Override
public Timestamp value4() { public LocalDateTime value4() {
return getDuedate(); return getDuedate();
} }
@ -209,7 +200,7 @@ public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implemen
} }
@Override @Override
public VLoginroleRecord value4(Timestamp value) { public VLoginroleRecord value4(LocalDateTime value) {
setDuedate(value); setDuedate(value);
return this; return this;
} }
@ -221,7 +212,7 @@ public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implemen
} }
@Override @Override
public VLoginroleRecord values(String value1, String value2, String value3, Timestamp value4, String value5) { public VLoginroleRecord values(String value1, String value2, String value3, LocalDateTime value4, String value5) {
value1(value1); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -244,13 +235,13 @@ public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implemen
/** /**
* Create a detached, initialised VLoginroleRecord * Create a detached, initialised VLoginroleRecord
*/ */
public VLoginroleRecord(String login, String forename, String surname, Timestamp duedate, String roleName) { public VLoginroleRecord(String login, String forename, String surname, LocalDateTime duedate, String roleName) {
super(VLoginrole.V_LOGINROLE); super(VLoginrole.V_LOGINROLE);
set(0, login); setLogin(login);
set(1, forename); setForename(forename);
set(2, surname); setSurname(surname);
set(3, duedate); setDuedate(duedate);
set(4, roleName); setRoleName(roleName);
} }
} }

View File

@ -0,0 +1,50 @@
package de.jooqfaces;
/**
*
* @author henkej
*
*/
public enum EJooqFacesApplicationScope {
/**
* jooqFacesUrl
*/
JOOQ_FACES_URL("jooqFacesUrl"),
/**
* jooqFacesDriver
*/
JOOQ_FACES_DRIVER("jooqFacesDriver"),
/**
* jooqFacesSqldialect
*/
JOOQ_FACES_SQLDIALECT("jooqFacesSqldialect"),
/**
* jooqFacesProperties
*/
JOOQ_FACES_PROPERTIES("jooqFacesProperties"),
/**
* jooqFacesConnectionPool
*/
JOOQ_FACES_CONNECTIONPOOL("jooqFacesConnectionPool"),
/**
* jooqFacesMaxPoolSize
*/
JOOQ_FACES_MAXPOOLSIZE("jooqFacesMaxPoolSize"),
/**
* jooqFacesParamAutocommit
*/
JOOQ_FACES_PARAM_AUTOCOMMIT("jooqFacesParamAutocommit");
private final String s;
private EJooqFacesApplicationScope(String s) {
this.s = s;
}
/**
* @return the value
*/
public final String get() {
return s;
}
}

View File

@ -0,0 +1,24 @@
package de.jooqfaces;
/**
*
* @author jotty
*
*/
public enum EJooqFacesConnectionPool {
CP_HIKARI("hikari");
private final String value;
private EJooqFacesConnectionPool(String value) {
this.value = value;
}
public String get() {
return value;
}
public static final String getHikari() {
return CP_HIKARI.get();
}
}

View File

@ -0,0 +1,20 @@
package de.jooqfaces;
/**
*
* @author henkej
*
*/
public enum EJooqFacesSessionScope {
CONNECTION("connection");
private final String value;
private EJooqFacesSessionScope(String value) {
this.value = value;
}
public String get() {
return value;
}
}

View File

@ -0,0 +1,350 @@
package de.jooqfaces;
import java.sql.*;
import java.util.*;
import javax.faces.application.*;
import javax.faces.application.FacesMessage.*;
import javax.faces.component.*;
import javax.faces.context.*;
import javax.faces.render.*;
import javax.servlet.*;
import javax.sql.*;
import org.apache.logging.log4j.*;
import org.jooq.*;
import org.jooq.impl.*;
/**
*
* @author jotty
*
*/
public class JooqFacesContext extends FacesContext {
private static final Logger LOGGER = LogManager.getLogger(JooqFacesContext.class);
private FacesContext facesContext;
private Connection connection;
public JooqFacesContext(FacesContext facesContext) {
this.facesContext = facesContext;
setCurrentInstance(this);
}
/**
* get the jooq dsl context from the faces context session map<br />
* <br />
* <b>Always</b> call getJooq() within a <b>try-catch closure</b>, as the DSLContext is a closure; if not, your
* connections might run out
*
* @return the jooq context
* @throws ClassNotFoundException
* on driver errors; check if you have attached the correct jdbc driver class
* @throws SQLException
* on sql errors
*/
public CloseableDSLContext getJooq() throws ClassNotFoundException, SQLException {
ExternalContext externalContext = facesContext.getExternalContext();
if (externalContext == null) {
throw new JooqFacesException("external context of current faces context is null");
}
ServletContext servletContext = (ServletContext) externalContext.getContext();
if (servletContext == null) {
throw new JooqFacesException("servlet context of current faces context is null");
}
SQLDialect dialect = getSqlDialect(servletContext);
createConnectionIfNull(externalContext, servletContext);
return new DefaultCloseableDSLContext(new DefaultConnectionProvider(connection), dialect);
}
/**
* get the database connection from the session map; if not found, create a new one and add it to the session map
*
* @param sessionMap
* the session map
* @param externalContext
* the external context
* @param servletContext
* the servlet context
* @return the connection
* @throws ClassNotFoundException
* on driver errors (e.g. missing jdbc lib)
* @throws SQLException
* on sql errors
*/
private void createConnectionIfNull(ExternalContext externalContext, ServletContext servletContext)
throws ClassNotFoundException, SQLException {
if (connection == null) { // caching the connection within the faces context makes it faster on the jsf life cycle
Map<String, Object> sessionMap = externalContext.getSessionMap();
if (sessionMap == null) {
throw new JooqFacesException("session map of current faces context is null");
}
DataSource dataSource = (DataSource) sessionMap.get(EJooqFacesSessionScope.CONNECTION.get());
if (dataSource == null || dataSource.getConnection() == null || dataSource.getConnection().isClosed()) {
LOGGER.debug("creating new connection pool");
dataSource = getDataSourceFromServletContext(servletContext);
externalContext.getSessionMap().put(EJooqFacesSessionScope.CONNECTION.get(), dataSource);
}
connection = dataSource.getConnection();
String autoCommit = servletContext.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_PARAM_AUTOCOMMIT.get());
connection.setAutoCommit("true".equals(autoCommit)); // default false for postgreSQL, the database of my choice
}
}
/**
* get data source from connection pool if defined in servlet context (see
* EJooqFacesApplicationScope.CONNECTION_POOL); if not defined, return a plain data source
*
* @param servletContext
* @return
*/
private static final DataSource getDataSourceFromServletContext(ServletContext servletContext)
throws ClassNotFoundException {
String driver = getDriver(servletContext);
if (driver == null) {
throw new JooqFacesException(
"undefined driver in application scope, define it in your web.xml's context-param on name "
+ EJooqFacesApplicationScope.JOOQ_FACES_DRIVER.get());
}
String url = getUrl(servletContext);
if (url == null) {
throw new JooqFacesException(
"undefined connection data url in application scope, define it in your web.xml's context-param on name "
+ EJooqFacesApplicationScope.JOOQ_FACES_URL.get());
}
Integer maxPoolSize = getMaxPoolSize(servletContext);
if (maxPoolSize == null) {
LOGGER.debug("maxPoolSize not set, setting it to 20");
maxPoolSize = 20;
}
String connectionPool = getConnectionPool(servletContext);
if (connectionPool == null) {
LOGGER.warn(
"no connection pool set in servlet context (see EJooqFacesApplicationScope.JOOQ_FACES_CONNECTIONPOOL), using plain connection");
}
return new PoollessDataSource(driver, url);
}
/**
* get the connection from the servlet context
*
* @param servletContext
* the servlet context
* @return the connection
* @throws ClassNotFoundException
* on driver errors (e.g. missing jdbc lib)
* @throws SQLException
* on sql errors
*/
private static final Connection getConnectionFromServletContext(ServletContext servletContext)
throws ClassNotFoundException, SQLException {
DataSource dataSource = getDataSourceFromServletContext(servletContext);
return dataSource.getConnection();
}
/**
* get a jooq connection from servlet context (for such cases as the deployment phase where the faces context is still
* not available)
*
* @param servletContext
* the servlet context
* @return a jooq connection
* @throws ClassNotFoundException
* on driver errors (e.g. missing jdbc lib)
* @throws SQLException
* on sql errors
*/
public static final DSLContext getJooqFromServletContext(ServletContext servletContext)
throws ClassNotFoundException, SQLException {
SQLDialect dialect = getSqlDialect(servletContext);
Connection con = getConnectionFromServletContext(servletContext);
return DSL.using(con, dialect);
}
@Override
public void addMessage(String clientId, FacesMessage message) {
facesContext.addMessage(clientId, message);
}
@Override
public Application getApplication() {
return facesContext.getApplication();
}
@Override
public Iterator<String> getClientIdsWithMessages() {
return facesContext.getClientIdsWithMessages();
}
@Override
public ExternalContext getExternalContext() {
return facesContext.getExternalContext();
}
@Override
public Severity getMaximumSeverity() {
return facesContext.getMaximumSeverity();
}
@Override
public Iterator<FacesMessage> getMessages() {
return facesContext.getMessages();
}
@Override
public Iterator<FacesMessage> getMessages(String clientId) {
return facesContext.getMessages(clientId);
}
@Override
public RenderKit getRenderKit() {
return facesContext.getRenderKit();
}
@Override
public boolean getRenderResponse() {
return facesContext.getRenderResponse();
}
@Override
public boolean getResponseComplete() {
return facesContext.getResponseComplete();
}
@Override
public ResponseStream getResponseStream() {
return facesContext.getResponseStream();
}
@Override
public ResponseWriter getResponseWriter() {
return facesContext.getResponseWriter();
}
@Override
public UIViewRoot getViewRoot() {
return facesContext.getViewRoot();
}
@Override
public void release() {
facesContext.release();
}
@Override
public void renderResponse() {
facesContext.renderResponse();
}
@Override
public void responseComplete() {
facesContext.responseComplete();
}
@Override
public void setResponseStream(ResponseStream responseStream) {
facesContext.setResponseStream(responseStream);
}
@Override
public void setResponseWriter(ResponseWriter responseWriter) {
facesContext.setResponseWriter(responseWriter);
}
@Override
public void setViewRoot(UIViewRoot root) {
facesContext.setViewRoot(root);
}
/**
* get the connection pool from initial context
*
* @param servletContext
* the context
* @return the connection pool string or null
*/
private static final String getConnectionPool(ServletContext servletContext) {
return servletContext.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_CONNECTIONPOOL.get());
}
/**
* get the max pool size from initial context if any
*
* @param servletContext
* the context of this function call
* @return the max pool size or null
*/
private static final Integer getMaxPoolSize(ServletContext servletContext) {
String maxPoolSize = servletContext.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_MAXPOOLSIZE.get());
return maxPoolSize == null ? null : Integer.valueOf(maxPoolSize);
}
/**
* get driver from initial context
*
* @param servletContext
* the context of this function call
* @return the parameter value of the jooq faces driver
*/
private static final String getDriver(ServletContext servletContext) {
return servletContext.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_DRIVER.get());
}
/**
* get driver connection url from initial context
*
* @param servletContext
* the context of this function call
* @return the parameter value of the jooq faces url
*/
private static final String getUrl(ServletContext servletContext) {
return servletContext.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_URL.get());
}
/**
* find jooq sql dialect class for dialectName
*
* @param dialectName
* name of dialect
* @return SQLDialect if found, null otherwise
*/
private static final SQLDialect findDialect(String dialectName) {
if (dialectName == null) {
LOGGER.error("Sql dialect name is null");
return null;
} else {
for (SQLDialect dialect : SQLDialect.values()) {
LOGGER.trace("Sql dialect comparing: dialectName={}, loopDialect={}", dialectName, dialect);
if (dialectName.equalsIgnoreCase(dialect.name())) {
LOGGER.debug("Sql dialect found: dialectName={}, foundDialect={}", dialectName, dialect);
return dialect;
}
}
LOGGER.error("Sql dialect not found: dialectName={}", dialectName);
return null;
}
}
/**
* get jooq sql dialect from initial context
*
* @param servletContext
* the context of this function call
* @return the dialect or null
*/
private static final SQLDialect getSqlDialect(ServletContext servletContext) {
String dialectName = servletContext.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_SQLDIALECT.get());
return getSqlDialect(dialectName);
}
/**
* get sql dialect from name
*
* @param name
* the dialect name
* @return the dialect or null
*/
public static final SQLDialect getSqlDialect(String name) {
return findDialect(name);
}
}

View File

@ -0,0 +1,26 @@
package de.jooqfaces;
import javax.faces.*;
import javax.faces.context.*;
import javax.faces.lifecycle.*;
/**
*
* @author jotty
*
*/
public class JooqFacesContextFactory extends FacesContextFactory {
private FacesContextFactory facesContextFactory;
public JooqFacesContextFactory(FacesContextFactory facesContextFactory) {
this.facesContextFactory = facesContextFactory;
}
@Override
public FacesContext getFacesContext(Object context, Object request, Object response, Lifecycle lifecycle)
throws FacesException {
FacesContext facesContext = facesContextFactory.getFacesContext(context, request, response, lifecycle);
return new JooqFacesContext(facesContext);
}
}

View File

@ -0,0 +1,18 @@
package de.jooqfaces;
/**
*
* @author jotty
*
*/
public class JooqFacesException extends RuntimeException {
private static final long serialVersionUID = 1L;
public JooqFacesException(String message) {
super(message);
}
public JooqFacesException(Exception e) {
super(e);
}
}

View File

@ -0,0 +1,72 @@
package de.jooqfaces;
import java.io.*;
import java.sql.*;
import java.util.logging.*;
import javax.sql.*;
/**
*
* @author jotty
*
*/
public class PoollessDataSource implements DataSource {
private final String driver;
private final String url;
public PoollessDataSource(String driver, String url) {
this.driver = driver;
this.url = url;
}
@Override
public PrintWriter getLogWriter() throws SQLException {
return null;
}
@Override
public int getLoginTimeout() throws SQLException {
return 0;
}
@Override
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
return null;
}
@Override
public void setLogWriter(PrintWriter out) throws SQLException {
}
@Override
public void setLoginTimeout(int seconds) throws SQLException {
}
@Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
}
@Override
public <T> T unwrap(Class<T> iface) throws SQLException {
return null;
}
@Override
public Connection getConnection() throws SQLException {
try {
Class.forName(driver);
} catch (ClassNotFoundException e) {
throw new SQLException(e);
}
return DriverManager.getConnection(url);
}
@Override
public Connection getConnection(String username, String password) throws SQLException {
return null;
}
}

View File

@ -0,0 +1,90 @@
package de.jooqfaces;
import java.io.*;
import java.sql.*;
import java.util.*;import javax.servlet.*;
import org.apache.logging.log4j.*;
/**
*
* @author henkej
*
*/
public class PropertiesDeploymentListener implements ServletContextListener {
private static final Logger LOGGER = LogManager.getLogger(PropertiesDeploymentListener.class);
@Override
public void contextDestroyed(ServletContextEvent event) {
try {
Enumeration<Driver> drivers = DriverManager.getDrivers();
while (drivers.hasMoreElements()) {
DriverManager.deregisterDriver(drivers.nextElement());
}
} catch (SQLException | SecurityException e) {
LOGGER.error("Error deregistering drivers", e);
}
}
@Override
public void contextInitialized(ServletContextEvent event) {
try {
ServletContext ctx = event.getServletContext();
beforeInitialization(ctx);
String propertiesFileName = (String) ctx.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_PROPERTIES.get());
if (propertiesFileName == null) {
throw new IOException(
"undefined properties file name in application scope, define it in your web.xml's context-param on name "
+ EJooqFacesApplicationScope.JOOQ_FACES_PROPERTIES.get());
}
Properties properties = new Properties();
properties.load(new FileInputStream(propertiesFileName));
for (Map.Entry<Object, Object> entry : properties.entrySet()) {
String key = (String) entry.getKey();
String value = (String) entry.getValue();
ctx.setInitParameter(key, value);
}
// ensure to have all needed parameters loaded
if (ctx.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_SQLDIALECT.get()) == null) {
throw new IOException("no " + EJooqFacesApplicationScope.JOOQ_FACES_SQLDIALECT.get()
+ " defined in your properties file " + propertiesFileName);
}
if (ctx.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_URL.get()) == null) {
throw new IOException("no " + EJooqFacesApplicationScope.JOOQ_FACES_URL.get() + " defined in your properties file "
+ propertiesFileName);
}
if (ctx.getInitParameter(EJooqFacesApplicationScope.JOOQ_FACES_DRIVER.get()) == null) {
throw new IOException("no " + EJooqFacesApplicationScope.JOOQ_FACES_DRIVER.get()
+ " defined in your properties file " + propertiesFileName);
}
afterInitialization(ctx);
} catch (IOException e) {
LOGGER.error("Error loading needed parameters from properties file", e);
}
}
/**
* executed directly after initialization if no exception is thrown
*
* @param ctx
* the context to use
* @throws IOException
* for input output exceptions
*/
public void afterInitialization(ServletContext ctx) throws IOException {
// to be implemented in extending classes
}
/**
* executed directly before initialization after getting the context from the servlet
*
* @param ctx
* the context to use
* @throws IOException
* for input output exceptions
*/
public void beforeInitialization(ServletContext ctx) throws IOException {
// to be implemented in extending classes
}
}

View File

@ -4,10 +4,10 @@ import java.sql.SQLException;
import javax.faces.application.FacesMessage; import javax.faces.application.FacesMessage;
import org.jooq.DSLContext; import org.jooq.CloseableDSLContext;
import org.jooq.TableLike; import org.jooq.TableLike;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
/** /**
* *
@ -21,8 +21,8 @@ public class JooqGateway {
this.facesContext = facesContext; this.facesContext = facesContext;
} }
public DSLContext getJooq() throws ClassNotFoundException, SQLException { public CloseableDSLContext getJooq() throws ClassNotFoundException, SQLException {
return (DSLContext) facesContext.getJooq(); return facesContext.getJooq();
} }
public void addToSessionMap(String key, Object value) { public void addToSessionMap(String key, Object value) {

View File

@ -9,7 +9,7 @@ import javax.faces.context.FacesContext;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.help.Pages; import de.jottyfan.timetrack.help.Pages;
/** /**

View File

@ -7,14 +7,14 @@ import java.sql.SQLException;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.jooq.DSLContext; import org.jooq.CloseableDSLContext;
import org.jooq.Record1; import org.jooq.Record1;
import org.jooq.Record4; import org.jooq.Record4;
import org.jooq.SelectConditionStep; import org.jooq.SelectConditionStep;
import org.jooq.UpdateConditionStep; import org.jooq.UpdateConditionStep;
import org.jooq.exception.DataAccessException; import org.jooq.exception.DataAccessException;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord; import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord;
/** /**
@ -40,7 +40,7 @@ public class SessionGateway extends JooqGateway {
* @throws DataAccessException * @throws DataAccessException
*/ */
public boolean seekAndSetLogin(SessionBean bean) throws DataAccessException, ClassNotFoundException, SQLException { public boolean seekAndSetLogin(SessionBean bean) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectConditionStep<Record4<Integer, String, String, String>> sql = jooq SelectConditionStep<Record4<Integer, String, String, String>> sql = jooq
// @formatter:off // @formatter:off
.select(T_LOGIN.PK, .select(T_LOGIN.PK,
@ -94,7 +94,7 @@ public class SessionGateway extends JooqGateway {
throws DataAccessException, ClassNotFoundException, SQLException { throws DataAccessException, ClassNotFoundException, SQLException {
bean.setSecret(newPassword); bean.setSecret(newPassword);
String encryptedPassword = bean.getSecret(); String encryptedPassword = bean.getSecret();
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
UpdateConditionStep<TLoginRecord> sql = jooq UpdateConditionStep<TLoginRecord> sql = jooq
// @formatter:off // @formatter:off
.update(T_LOGIN) .update(T_LOGIN)

View File

@ -6,7 +6,7 @@ import javax.faces.application.FacesMessage;
import org.jooq.exception.DataAccessException; import org.jooq.exception.DataAccessException;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
/** /**
* *

View File

@ -7,7 +7,7 @@ import javax.faces.context.FacesContext;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.help.Navigation; import de.jottyfan.timetrack.help.Navigation;
import de.jottyfan.timetrack.help.Pages; import de.jottyfan.timetrack.help.Pages;
import de.jottyfan.timetrack.modules.ControlInterface; import de.jottyfan.timetrack.modules.ControlInterface;

View File

@ -9,7 +9,7 @@ import java.util.List;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.jooq.DSLContext; import org.jooq.CloseableDSLContext;
import org.jooq.DeleteConditionStep; import org.jooq.DeleteConditionStep;
import org.jooq.InsertValuesStep4; import org.jooq.InsertValuesStep4;
import org.jooq.Record1; import org.jooq.Record1;
@ -19,7 +19,7 @@ import org.jooq.UpdateConditionStep;
import org.jooq.exception.DataAccessException; import org.jooq.exception.DataAccessException;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; import de.jottyfan.timetrack.db.contact.enums.EnumContacttype;
import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord; import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord;
import de.jottyfan.timetrack.modules.JooqGateway; import de.jottyfan.timetrack.modules.JooqGateway;
@ -45,7 +45,7 @@ public class ContactGateway extends JooqGateway {
* @throws DataAccessException * @throws DataAccessException
*/ */
public List<ContactBean> getAll() throws DataAccessException, ClassNotFoundException, SQLException { public List<ContactBean> getAll() throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectJoinStep<Record5<Integer, String, String, String, EnumContacttype>> sql = jooq SelectJoinStep<Record5<Integer, String, String, String, EnumContacttype>> sql = jooq
// @formatter:off // @formatter:off
.select(T_CONTACT.PK, .select(T_CONTACT.PK,
@ -81,7 +81,7 @@ public class ContactGateway extends JooqGateway {
* @throws DataAccessException * @throws DataAccessException
*/ */
public Integer delete(Integer pk) throws DataAccessException, ClassNotFoundException, SQLException { public Integer delete(Integer pk) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
DeleteConditionStep<TContactRecord> sql = jooq DeleteConditionStep<TContactRecord> sql = jooq
// @formatter:off // @formatter:off
.deleteFrom(T_CONTACT) .deleteFrom(T_CONTACT)
@ -104,7 +104,7 @@ public class ContactGateway extends JooqGateway {
* @throws DataAccessException * @throws DataAccessException
*/ */
public Integer add(ContactBean bean) throws DataAccessException, ClassNotFoundException, SQLException { public Integer add(ContactBean bean) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
InsertValuesStep4<TContactRecord, String, String, String, EnumContacttype> sql = jooq InsertValuesStep4<TContactRecord, String, String, String, EnumContacttype> sql = jooq
// @formatter:off // @formatter:off
.insertInto(T_CONTACT, .insertInto(T_CONTACT,
@ -130,7 +130,7 @@ public class ContactGateway extends JooqGateway {
* @throws DataAccessException * @throws DataAccessException
*/ */
public Integer update(ContactBean bean) throws DataAccessException, ClassNotFoundException, SQLException { public Integer update(ContactBean bean) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
UpdateConditionStep<TContactRecord> sql = jooq UpdateConditionStep<TContactRecord> sql = jooq
// @formatter:off // @formatter:off
.update(T_CONTACT) .update(T_CONTACT)
@ -154,7 +154,7 @@ public class ContactGateway extends JooqGateway {
* @throws DataAccessException * @throws DataAccessException
*/ */
public Integer getAmount() throws DataAccessException, ClassNotFoundException, SQLException { public Integer getAmount() throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectJoinStep<Record1<Integer>> sql = jooq SelectJoinStep<Record1<Integer>> sql = jooq
// @formatter:off // @formatter:off
.selectCount() .selectCount()

View File

@ -11,7 +11,7 @@ import javax.inject.Named;
import org.jooq.exception.DataAccessException; import org.jooq.exception.DataAccessException;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; import de.jottyfan.timetrack.db.contact.enums.EnumContacttype;
import de.jottyfan.timetrack.modules.Model; import de.jottyfan.timetrack.modules.Model;

View File

@ -1,13 +1,11 @@
package de.jottyfan.timetrack.modules.done; package de.jottyfan.timetrack.modules.done;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.time.Duration; import java.time.Duration;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
@ -25,9 +23,11 @@ import de.jottyfan.timetrack.modules.Bean;
public class DoneBean implements Bean, Serializable, Comparable<DoneBean> { public class DoneBean implements Bean, Serializable, Comparable<DoneBean> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final DateTimeFormatter hhmm = DateTimeFormatter.ofPattern("HH:mm");
private Integer pk; private Integer pk;
private Timestamp timeFrom; private LocalDateTime timeFrom;
private Timestamp timeUntil; private LocalDateTime timeUntil;
private TProjectRecord project; private TProjectRecord project;
private TModuleRecord module; private TModuleRecord module;
private TJobRecord activity; private TJobRecord activity;
@ -55,27 +55,27 @@ public class DoneBean implements Bean, Serializable, Comparable<DoneBean> {
*/ */
public void setDay(Date day) { public void setDay(Date day) {
if (timeFrom != null) { if (timeFrom != null) {
LocalDateTime ldt = timeFrom.toLocalDateTime(); LocalDateTime ldt = timeFrom;
LocalDate date = day.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate date = day.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
ldt = ldt.withYear(date.getYear()).withMonth(date.getMonthValue()).withDayOfMonth(date.getDayOfMonth()); ldt = ldt.withYear(date.getYear()).withMonth(date.getMonthValue()).withDayOfMonth(date.getDayOfMonth());
timeFrom = Timestamp.from(ldt.toInstant(OffsetDateTime.now().getOffset())); timeFrom = ldt;
} }
if (timeUntil != null) { if (timeUntil != null) {
LocalDateTime ldt = timeUntil.toLocalDateTime(); LocalDateTime ldt = timeUntil;
LocalDate date = day.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate date = day.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
ldt = ldt.withYear(date.getYear()).withMonth(date.getMonthValue()).withDayOfMonth(date.getDayOfMonth()); ldt = ldt.withYear(date.getYear()).withMonth(date.getMonthValue()).withDayOfMonth(date.getDayOfMonth());
timeUntil = Timestamp.from(ldt.toInstant(OffsetDateTime.now().getOffset())); timeUntil = ldt;
} }
} }
public String getTimeSummary() { public String getTimeSummary() {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
if (timeFrom != null) { if (timeFrom != null) {
buf.append(new SimpleDateFormat("HH:mm").format(timeFrom)); buf.append(timeFrom.format(hhmm));
} }
if (timeUntil != null) { if (timeUntil != null) {
buf.append(" - "); buf.append(" - ");
buf.append(new SimpleDateFormat("HH:mm").format(timeUntil)); buf.append(timeUntil.format(hhmm));
} }
return buf.toString(); return buf.toString();
} }
@ -86,8 +86,8 @@ public class DoneBean implements Bean, Serializable, Comparable<DoneBean> {
} }
public String getTimeDiff() { public String getTimeDiff() {
LocalDateTime earlier = timeFrom != null ? timeFrom.toLocalDateTime() : LocalDateTime.now(); LocalDateTime earlier = timeFrom != null ? timeFrom : LocalDateTime.now();
LocalDateTime later = timeUntil != null ? timeUntil.toLocalDateTime() : LocalDateTime.now(); LocalDateTime later = timeUntil != null ? timeUntil : LocalDateTime.now();
Duration diff = Duration.between(earlier, later); Duration diff = Duration.between(earlier, later);
return String.format("%02d:%02d", diff.toHours(), diff.toMinutes() % 60); return String.format("%02d:%02d", diff.toHours(), diff.toMinutes() % 60);
} }
@ -143,21 +143,19 @@ public class DoneBean implements Bean, Serializable, Comparable<DoneBean> {
} }
public String getTimeFromString() { public String getTimeFromString() {
return timeFrom == null ? "" : new SimpleDateFormat("HH:mm").format(timeFrom); return timeFrom == null ? "" : timeFrom.format(hhmm);
} }
public void setTimeFromString(String s) { public void setTimeFromString(String s) {
LocalDateTime ldt = getLocalDateTimeFromHHmm(s, null); // use setDay instead this.timeFrom = getLocalDateTimeFromHHmm(s, null); // use setDay instead
this.timeFrom = ldt == null ? null : Timestamp.valueOf(ldt);
} }
public String getTimeUntilString() { public String getTimeUntilString() {
return timeUntil == null ? "" : new SimpleDateFormat("HH:mm").format(timeUntil); return timeUntil == null ? "" : timeUntil.format(hhmm);
} }
public void setTimeUntilString(String s) { public void setTimeUntilString(String s) {
LocalDateTime ldt = getLocalDateTimeFromHHmm(s, null); // use setDay instead this.timeUntil = getLocalDateTimeFromHHmm(s, null); // use setDay instead
this.timeUntil = ldt == null ? null : Timestamp.valueOf(ldt);
} }
public Integer getPk() { public Integer getPk() {
@ -168,19 +166,19 @@ public class DoneBean implements Bean, Serializable, Comparable<DoneBean> {
this.pk = pk; this.pk = pk;
} }
public Timestamp getTimeFrom() { public LocalDateTime getTimeFrom() {
return timeFrom; return timeFrom;
} }
public void setTimeFrom(Timestamp timeFrom) { public void setTimeFrom(LocalDateTime timeFrom) {
this.timeFrom = timeFrom; this.timeFrom = timeFrom;
} }
public Timestamp getTimeUntil() { public LocalDateTime getTimeUntil() {
return timeUntil; return timeUntil;
} }
public void setTimeUntil(Timestamp timeUntil) { public void setTimeUntil(LocalDateTime timeUntil) {
this.timeUntil = timeUntil; this.timeUntil = timeUntil;
} }

View File

@ -1,16 +1,15 @@
package de.jottyfan.timetrack.modules.done; package de.jottyfan.timetrack.modules.done;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.help.Navigation; import de.jottyfan.timetrack.help.Navigation;
import de.jottyfan.timetrack.help.Pages; import de.jottyfan.timetrack.help.Pages;
import de.jottyfan.timetrack.modules.ControlInterface; import de.jottyfan.timetrack.modules.ControlInterface;
@ -40,7 +39,7 @@ public class DoneControl extends Navigation implements ControlInterface, Seriali
public String toAdd() { public String toAdd() {
DoneBean bean = new DoneBean(); DoneBean bean = new DoneBean();
bean.setTimeFrom(getCurrentDate()); bean.setTimeFrom(LocalDateTime.now());
model.setBean(bean); model.setBean(bean);
boolean ready = model.loadDefaults((JooqFacesContext) FacesContext.getCurrentInstance()); boolean ready = model.loadDefaults((JooqFacesContext) FacesContext.getCurrentInstance());
return ready ? navigateTo(Pages.DONE_ADD) : toList(); return ready ? navigateTo(Pages.DONE_ADD) : toList();
@ -83,10 +82,7 @@ public class DoneControl extends Navigation implements ControlInterface, Seriali
} }
public String getCurrentTimeAsString() { public String getCurrentTimeAsString() {
return new SimpleDateFormat("HH:mm:ss").format(getCurrentDate()); DateTimeFormatter hhmmss = DateTimeFormatter.ofPattern("HH:mm:ss");
} return LocalDateTime.now().format(hhmmss);
public Timestamp getCurrentDate() {
return Timestamp.valueOf(LocalDateTime.now());
} }
} }

View File

@ -9,19 +9,21 @@ import static de.jottyfan.timetrack.db.done.Tables.V_TOTALOFDAY;
import static de.jottyfan.timetrack.db.done.Tables.V_WORKTIME; import static de.jottyfan.timetrack.db.done.Tables.V_WORKTIME;
import static de.jottyfan.timetrack.db.profile.Tables.T_LOGIN; import static de.jottyfan.timetrack.db.profile.Tables.T_LOGIN;
import java.sql.Date;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.jooq.DSLContext; import org.jooq.CloseableDSLContext;
import org.jooq.DeleteConditionStep; import org.jooq.DeleteConditionStep;
import org.jooq.InsertValuesStep7; import org.jooq.InsertValuesStep7;
import org.jooq.Record; import org.jooq.Record;
@ -35,7 +37,7 @@ import org.jooq.SelectWhereStep;
import org.jooq.UpdateConditionStep; import org.jooq.UpdateConditionStep;
import org.jooq.exception.DataAccessException; import org.jooq.exception.DataAccessException;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord; import de.jottyfan.timetrack.db.done.tables.records.TDoneRecord;
import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; import de.jottyfan.timetrack.db.done.tables.records.TJobRecord;
import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord;
@ -67,7 +69,7 @@ public class DoneGateway extends JooqGateway {
* @throws ClassNotFoundException * @throws ClassNotFoundException
*/ */
public List<TModuleRecord> getAllModules() throws DataAccessException, ClassNotFoundException, SQLException { public List<TModuleRecord> getAllModules() throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
List<TModuleRecord> list = new ArrayList<>(); List<TModuleRecord> list = new ArrayList<>();
SelectWhereStep<TModuleRecord> sql = jooq.selectFrom(T_MODULE); SelectWhereStep<TModuleRecord> sql = jooq.selectFrom(T_MODULE);
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
@ -88,7 +90,7 @@ public class DoneGateway extends JooqGateway {
* @throws ClassNotFoundException * @throws ClassNotFoundException
*/ */
public List<TJobRecord> getAllActivities() throws DataAccessException, ClassNotFoundException, SQLException { public List<TJobRecord> getAllActivities() throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
List<TJobRecord> list = new ArrayList<>(); List<TJobRecord> list = new ArrayList<>();
SelectWhereStep<TJobRecord> sql = jooq.selectFrom(T_JOB); SelectWhereStep<TJobRecord> sql = jooq.selectFrom(T_JOB);
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
@ -109,7 +111,7 @@ public class DoneGateway extends JooqGateway {
* @throws ClassNotFoundException * @throws ClassNotFoundException
*/ */
public List<TProjectRecord> getAllProjects() throws DataAccessException, ClassNotFoundException, SQLException { public List<TProjectRecord> getAllProjects() throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
List<TProjectRecord> list = new ArrayList<>(); List<TProjectRecord> list = new ArrayList<>();
SelectWhereStep<TProjectRecord> sql = jooq.selectFrom(T_PROJECT); SelectWhereStep<TProjectRecord> sql = jooq.selectFrom(T_PROJECT);
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
@ -168,17 +170,17 @@ public class DoneGateway extends JooqGateway {
LocalDateTime tomorrow = day.plusDays(1).withHour(0).withMinute(0).withSecond(0).withNano(0); LocalDateTime tomorrow = day.plusDays(1).withHour(0).withMinute(0).withSecond(0).withNano(0);
List<DoneBean> list = new ArrayList<>(); List<DoneBean> list = new ArrayList<>();
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectConditionStep<TDoneRecord> sql = getJooq() SelectConditionStep<TDoneRecord> sql = getJooq()
// @formatter:off // @formatter:off
.selectFrom(T_DONE) .selectFrom(T_DONE)
.where(T_DONE.FK_LOGIN.eq(getFkLogin())) .where(T_DONE.FK_LOGIN.eq(getFkLogin()))
.and(T_DONE.TIME_FROM.isNull() .and(T_DONE.TIME_FROM.isNull()
.or(T_DONE.TIME_FROM.greaterThan(Timestamp.valueOf(yesterday)) .or(T_DONE.TIME_FROM.greaterThan(yesterday)
.and(T_DONE.TIME_FROM.lessThan(Timestamp.valueOf(tomorrow))))) .and(T_DONE.TIME_FROM.lessThan(tomorrow))))
.and(T_DONE.TIME_UNTIL.isNull() .and(T_DONE.TIME_UNTIL.isNull()
.or(T_DONE.TIME_UNTIL.lessThan(Timestamp.valueOf(tomorrow)) .or(T_DONE.TIME_UNTIL.lessThan(tomorrow)
.and(T_DONE.TIME_UNTIL.greaterThan(Timestamp.valueOf(yesterday))))); .and(T_DONE.TIME_UNTIL.greaterThan(yesterday))));
// @formatter:on // @formatter:on
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
for (TDoneRecord r : sql.fetch()) { for (TDoneRecord r : sql.fetch()) {
@ -202,8 +204,8 @@ public class DoneGateway extends JooqGateway {
Integer fkJob = bean.getActivity() == null ? null : bean.getActivity().getPk(); Integer fkJob = bean.getActivity() == null ? null : bean.getActivity().getPk();
Integer fkLogin = getFkLogin(); Integer fkLogin = getFkLogin();
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
InsertValuesStep7<TDoneRecord, Timestamp, Timestamp, Integer, Integer, Integer, String, Integer> sql = jooq InsertValuesStep7<TDoneRecord, LocalDateTime, LocalDateTime, Integer, Integer, Integer, String, Integer> sql = jooq
// @formatter:off // @formatter:off
.insertInto(T_DONE, .insertInto(T_DONE,
T_DONE.TIME_FROM, T_DONE.TIME_FROM,
@ -228,7 +230,7 @@ public class DoneGateway extends JooqGateway {
* @throws ClassNotFoundException * @throws ClassNotFoundException
*/ */
public void update(DoneBean bean) throws DataAccessException, ClassNotFoundException, SQLException { public void update(DoneBean bean) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
UpdateConditionStep<TDoneRecord> sql = jooq UpdateConditionStep<TDoneRecord> sql = jooq
// @formatter:off // @formatter:off
.update(T_DONE) .update(T_DONE)
@ -253,7 +255,7 @@ public class DoneGateway extends JooqGateway {
* @throws ClassNotFoundException * @throws ClassNotFoundException
*/ */
public void delete(DoneBean bean) throws DataAccessException, ClassNotFoundException, SQLException { public void delete(DoneBean bean) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
DeleteConditionStep<TDoneRecord> sql = jooq.deleteFrom(T_DONE).where(T_DONE.PK.eq(bean.getPk())); DeleteConditionStep<TDoneRecord> sql = jooq.deleteFrom(T_DONE).where(T_DONE.PK.eq(bean.getPk()));
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
sql.execute(); sql.execute();
@ -271,7 +273,7 @@ public class DoneGateway extends JooqGateway {
* @throws DataAccessException * @throws DataAccessException
*/ */
public WholeDaySummaryBean getDaySummary(java.util.Date day) throws DataAccessException, ClassNotFoundException, SQLException { public WholeDaySummaryBean getDaySummary(java.util.Date day) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectConditionStep<Record4<String, String, String, String>> sql = jooq SelectConditionStep<Record4<String, String, String, String>> sql = jooq
// @formatter:off // @formatter:off
.select(V_TOTALOFDAY.STARTTIME, .select(V_TOTALOFDAY.STARTTIME,
@ -306,7 +308,7 @@ public class DoneGateway extends JooqGateway {
* @throws DataAccessException * @throws DataAccessException
*/ */
public List<DailySummaryBean> getAllJobs(java.util.Date day) throws DataAccessException, ClassNotFoundException, SQLException { public List<DailySummaryBean> getAllJobs(java.util.Date day) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectConditionStep<Record6<String, Double, String, String, String, String>> sql = jooq SelectConditionStep<Record6<String, Double, String, String, String, String>> sql = jooq
// @formatter:off // @formatter:off
.select(V_WORKTIME.DURATION, .select(V_WORKTIME.DURATION,
@ -343,8 +345,8 @@ public class DoneGateway extends JooqGateway {
* @throws DataAccessException * @throws DataAccessException
*/ */
public String getAllCalendarEvents() throws DataAccessException, ClassNotFoundException, SQLException { public String getAllCalendarEvents() throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectConditionStep<Record6<Timestamp, Timestamp, String, String, String, String>> sql = jooq SelectConditionStep<Record6<LocalDateTime, LocalDateTime, String, String, String, String>> sql = jooq
// @formatter:off // @formatter:off
.select(T_DONE.TIME_FROM, .select(T_DONE.TIME_FROM,
T_DONE.TIME_UNTIL, T_DONE.TIME_UNTIL,
@ -365,8 +367,8 @@ public class DoneGateway extends JooqGateway {
String moduleName = r.get(T_MODULE.NAME); String moduleName = r.get(T_MODULE.NAME);
String jobName = r.get(T_JOB.NAME); String jobName = r.get(T_JOB.NAME);
String wp = r.get(T_DONE.WP); String wp = r.get(T_DONE.WP);
java.util.Date timeFrom = r.get(T_DONE.TIME_FROM); LocalDateTime timeFrom = r.get(T_DONE.TIME_FROM);
java.util.Date timeUntil = r.get(T_DONE.TIME_UNTIL); LocalDateTime timeUntil = r.get(T_DONE.TIME_UNTIL);
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
buf.append(projectName); buf.append(projectName);
@ -378,14 +380,15 @@ public class DoneGateway extends JooqGateway {
buf.append(": "); buf.append(": ");
buf.append(jobName); buf.append(jobName);
FullCalendarEventBean bean = new FullCalendarEventBean(buf.toString(), timeFrom) { FullCalendarEventBean bean = new FullCalendarEventBean(buf.toString(), java.util.Date.from(timeFrom.atZone(ZoneId.systemDefault()).toInstant())) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public void addExtendedFields(StringBuilder buf) { public void addExtendedFields(StringBuilder buf) {
} }
}; };
bean.setEnd(timeUntil); Date endDate = timeUntil == null ? null : Date.from(timeUntil.atZone(ZoneId.systemDefault()).toInstant());
bean.setEnd(endDate);
bean.setColor(new RgbColor().determineRgbColor(projectName, moduleName, jobName)); bean.setColor(new RgbColor().determineRgbColor(projectName, moduleName, jobName));
list.getList().add(bean); list.getList().add(bean);
} }
@ -395,7 +398,7 @@ public class DoneGateway extends JooqGateway {
public List<UserBean> getAllUsers() throws DataAccessException, ClassNotFoundException, SQLException { public List<UserBean> getAllUsers() throws DataAccessException, ClassNotFoundException, SQLException {
List<UserBean> list = new ArrayList<>(); List<UserBean> list = new ArrayList<>();
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectJoinStep<Record3<String, String, String>> sql = jooq SelectJoinStep<Record3<String, String, String>> sql = jooq
// @formatter:off // @formatter:off
.select(T_LOGIN.LOGIN, .select(T_LOGIN.LOGIN,
@ -416,8 +419,8 @@ public class DoneGateway extends JooqGateway {
public String download(DownloadBean bean) throws DataAccessException, ClassNotFoundException, SQLException { public String download(DownloadBean bean) throws DataAccessException, ClassNotFoundException, SQLException {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectConditionStep<Record5<Date, String, String, String, String>> sql = jooq SelectConditionStep<Record5<LocalDate, String, String, String, String>> sql = jooq
// @formatter:off // @formatter:off
.select(V_HAMSTERSUMMARY.WORKDAY, .select(V_HAMSTERSUMMARY.WORKDAY,
V_HAMSTERSUMMARY.DURATION, V_HAMSTERSUMMARY.DURATION,
@ -426,14 +429,15 @@ public class DoneGateway extends JooqGateway {
V_HAMSTERSUMMARY.JOB_NAME) V_HAMSTERSUMMARY.JOB_NAME)
.from(V_HAMSTERSUMMARY) .from(V_HAMSTERSUMMARY)
.where(V_HAMSTERSUMMARY.LOGIN.eq(bean.getUsername())) .where(V_HAMSTERSUMMARY.LOGIN.eq(bean.getUsername()))
.and(V_HAMSTERSUMMARY.WORKDAY.le(Date.valueOf(bean.getUntilDate())) .and(V_HAMSTERSUMMARY.WORKDAY.le(bean.getUntilDate())
.and(V_HAMSTERSUMMARY.WORKDAY.ge(Date.valueOf(bean.getFromDate())))); .and(V_HAMSTERSUMMARY.WORKDAY.ge(bean.getFromDate())));
// @formatter:on // @formatter:on
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
String sep = ";"; String sep = ";";
buf.append("day").append(sep).append("duration").append(sep).append("project").append(sep).append("module").append(sep).append("activity\n"); buf.append("day").append(sep).append("duration").append(sep).append("project").append(sep).append("module").append(sep).append("activity\n");
for (Record r : sql.fetch()) { for (Record r : sql.fetch()) {
String date = new SimpleDateFormat("dd.MM.yyyy").format(r.get(V_HAMSTERSUMMARY.WORKDAY)); LocalDate workday = r.get(V_HAMSTERSUMMARY.WORKDAY);
String date = workday.format(DateTimeFormatter.ofPattern("dd.MM.yyyy"));
buf.append(date).append(sep); buf.append(date).append(sep);
buf.append(r.get(V_HAMSTERSUMMARY.DURATION)).append(sep); buf.append(r.get(V_HAMSTERSUMMARY.DURATION)).append(sep);
buf.append(r.get(V_HAMSTERSUMMARY.PROJECT_NAME)).append(sep); buf.append(r.get(V_HAMSTERSUMMARY.PROJECT_NAME)).append(sep);

View File

@ -20,7 +20,7 @@ import javax.inject.Named;
import org.jooq.exception.DataAccessException; import org.jooq.exception.DataAccessException;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; import de.jottyfan.timetrack.db.done.tables.records.TJobRecord;
import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord;
import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord;

View File

@ -1,7 +1,7 @@
package de.jottyfan.timetrack.modules.note; package de.jottyfan.timetrack.modules.note;
import java.io.*; import java.io.Serializable;
import java.util.*; import java.time.LocalDateTime;
import de.jottyfan.timetrack.db.note.enums.EnumCategory; import de.jottyfan.timetrack.db.note.enums.EnumCategory;
import de.jottyfan.timetrack.db.note.enums.EnumNotetype; import de.jottyfan.timetrack.db.note.enums.EnumNotetype;
@ -21,7 +21,7 @@ public class NoteBean implements Bean, Serializable
private EnumCategory category; private EnumCategory category;
private EnumNotetype type; private EnumNotetype type;
private String content; private String content;
private Date lastchange; private LocalDateTime lastchange;
public NoteBean(Integer pk) public NoteBean(Integer pk)
{ {
@ -69,12 +69,12 @@ public class NoteBean implements Bean, Serializable
this.content = content; this.content = content;
} }
public Date getLastchange() public LocalDateTime getLastchange()
{ {
return lastchange; return lastchange;
} }
public void setLastchange(Date lastchange) public void setLastchange(LocalDateTime lastchange)
{ {
this.lastchange = lastchange; this.lastchange = lastchange;
} }

View File

@ -7,7 +7,7 @@ import javax.faces.context.FacesContext;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.help.Navigation; import de.jottyfan.timetrack.help.Navigation;
import de.jottyfan.timetrack.help.Pages; import de.jottyfan.timetrack.help.Pages;
import de.jottyfan.timetrack.modules.ControlInterface; import de.jottyfan.timetrack.modules.ControlInterface;

View File

@ -8,7 +8,7 @@ import java.util.List;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.jooq.DSLContext; import org.jooq.CloseableDSLContext;
import org.jooq.DeleteConditionStep; import org.jooq.DeleteConditionStep;
import org.jooq.InsertValuesStep4; import org.jooq.InsertValuesStep4;
import org.jooq.Record; import org.jooq.Record;
@ -16,7 +16,7 @@ import org.jooq.SelectJoinStep;
import org.jooq.UpdateConditionStep; import org.jooq.UpdateConditionStep;
import org.jooq.exception.DataAccessException; import org.jooq.exception.DataAccessException;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.db.note.enums.EnumCategory; import de.jottyfan.timetrack.db.note.enums.EnumCategory;
import de.jottyfan.timetrack.db.note.enums.EnumNotetype; import de.jottyfan.timetrack.db.note.enums.EnumNotetype;
import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord; import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord;
@ -44,7 +44,7 @@ public class NoteGateway extends JooqGateway {
* @returns amount of affected rows in db * @returns amount of affected rows in db
*/ */
public void insert(NoteBean bean) throws DataAccessException, ClassNotFoundException, SQLException { public void insert(NoteBean bean) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
InsertValuesStep4<TNoteRecord, String, EnumCategory, EnumNotetype, String> sql = jooq InsertValuesStep4<TNoteRecord, String, EnumCategory, EnumNotetype, String> sql = jooq
// @formatter:off // @formatter:off
.insertInto(T_NOTE, .insertInto(T_NOTE,
@ -68,7 +68,7 @@ public class NoteGateway extends JooqGateway {
* @throws ClassNotFoundException * @throws ClassNotFoundException
*/ */
public void update(NoteBean bean) throws DataAccessException, ClassNotFoundException, SQLException { public void update(NoteBean bean) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
UpdateConditionStep<TNoteRecord> sql = jooq UpdateConditionStep<TNoteRecord> sql = jooq
// @formatter:off // @formatter:off
.update(T_NOTE) .update(T_NOTE)
@ -90,7 +90,7 @@ public class NoteGateway extends JooqGateway {
* @throws ClassNotFoundException * @throws ClassNotFoundException
*/ */
public void delete(Integer pk) throws DataAccessException, ClassNotFoundException, SQLException { public void delete(Integer pk) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
DeleteConditionStep<TNoteRecord> sql = jooq.deleteFrom(T_NOTE).where(T_NOTE.PK.eq(pk)); DeleteConditionStep<TNoteRecord> sql = jooq.deleteFrom(T_NOTE).where(T_NOTE.PK.eq(pk));
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
sql.execute(); sql.execute();
@ -106,7 +106,7 @@ public class NoteGateway extends JooqGateway {
* @throws ClassNotFoundException * @throws ClassNotFoundException
*/ */
public List<NoteBean> getAll() throws DataAccessException, ClassNotFoundException, SQLException { public List<NoteBean> getAll() throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (CloseableDSLContext jooq = getJooq()) {
SelectJoinStep<Record> sql = jooq.select().from(T_NOTE); SelectJoinStep<Record> sql = jooq.select().from(T_NOTE);
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
List<NoteBean> list = new ArrayList<>(); List<NoteBean> list = new ArrayList<>();

View File

@ -10,7 +10,7 @@ import javax.inject.Named;
import org.jooq.exception.DataAccessException; import org.jooq.exception.DataAccessException;
import de.jooqFaces.JooqFacesContext; import de.jooqfaces.JooqFacesContext;
import de.jottyfan.timetrack.db.note.Tables; import de.jottyfan.timetrack.db.note.Tables;
import de.jottyfan.timetrack.modules.Model; import de.jottyfan.timetrack.modules.Model;

View File

@ -5,6 +5,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0"> version="2.0">
<factory> <factory>
<faces-context-factory>de.jooqFaces.JooqFacesContextFactory</faces-context-factory> <faces-context-factory>de.jooqfaces.JooqFacesContextFactory</faces-context-factory>
</factory> </factory>
</faces-config> </faces-config>

View File

@ -64,6 +64,6 @@
<param-value>/etc/timetrack.properties</param-value> <param-value>/etc/timetrack.properties</param-value>
</context-param> </context-param>
<listener> <listener>
<listener-class>de.jooqFaces.PropertiesDeploymentListener</listener-class> <listener-class>de.jooqfaces.PropertiesDeploymentListener</listener-class>
</listener> </listener>
</web-app> </web-app>

View File

@ -9,6 +9,11 @@
<b:messages /> <b:messages />
</ui:define> </ui:define>
<ui:define name="main"> <ui:define name="main">
<script type="text/javascript">
$(document).ready(function(){
$("div.page").css("overflow", "hidden");
})
</script>
<b:panel title="Einstellungen" collapsed="true" rendered="#{sessionBean.hasLogin}"> <b:panel title="Einstellungen" collapsed="true" rendered="#{sessionBean.hasLogin}">
<b:accordion expandedPanels="layout"> <b:accordion expandedPanels="layout">
<b:panel id="layout" title="Layout"> <b:panel id="layout" title="Layout">

View File

@ -3,10 +3,10 @@ package de.jottyfan.timetrack.moduls.done;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
import java.sql.Timestamp;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date; import java.util.Date;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -42,8 +42,8 @@ public class TestDoneBean {
@Test @Test
public void testSetDay() throws ParseException { public void testSetDay() throws ParseException {
String today = new SimpleDateFormat("dd.MM.yyyy").format(new Date()); String today = new SimpleDateFormat("dd.MM.yyyy").format(new Date());
SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy HH:mm"); DateTimeFormatter sdf = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm");
SimpleDateFormat sd = new SimpleDateFormat("dd.MM.yyyy"); DateTimeFormatter sd = DateTimeFormatter.ofPattern("dd.MM.yyyy");
DoneBean bean = new DoneBean(); DoneBean bean = new DoneBean();
bean.setDay(new Date()); bean.setDay(new Date());
@ -51,16 +51,16 @@ public class TestDoneBean {
assertNull(bean.getTimeUntil()); assertNull(bean.getTimeUntil());
bean.setTimeFromString("08:00"); bean.setTimeFromString("08:00");
Timestamp ts1 = bean.getTimeFrom(); LocalDateTime ts1 = bean.getTimeFrom();
assertEquals(today.concat(" 08:00"), sdf.format(ts1)); assertEquals(today.concat(" 08:00"), ts1.format(sdf));
bean.setDay(sd.parse("01.01.2001")); bean.setDay(new SimpleDateFormat("dd.MM.yyyy").parse("01.01.2001"));
assertEquals("01.01.2001", sd.format(bean.getTimeFrom())); assertEquals("01.01.2001", bean.getTimeFrom().format(sd));
assertNull(bean.getTimeUntil()); assertNull(bean.getTimeUntil());
bean.setTimeUntilString("10:00"); bean.setTimeUntilString("10:00");
Timestamp ts2 = bean.getTimeUntil(); LocalDateTime ts2 = bean.getTimeUntil();
assertEquals(today.concat(" 10:00"), sdf.format(ts2)); assertEquals(today.concat(" 10:00"), ts2.format(sdf));
bean.setDay(sd.parse("01.01.2001")); bean.setDay(new SimpleDateFormat("dd.MM.yyyy").parse("01.01.2001"));
assertEquals("01.01.2001", sd.format(bean.getTimeFrom())); assertEquals("01.01.2001", sd.format(bean.getTimeFrom()));
assertEquals("01.01.2001", sd.format(bean.getTimeUntil())); assertEquals("01.01.2001", sd.format(bean.getTimeUntil()));
} }