transform migrations to work with mysql, postgres and sqlite

sqlite currently fails syntax of views

.env.example

@@ -1,10 +1,22 @@
-DB_TYPE = (mysql|sqlite|...)
-DB_PORT = number
+DB_TYPE = (mysql|sqlite|postgres)
+
+## BSP für mysql
+DB_PORT = 3306
 DB_HOST = database_host
 DB_NAME = database_name
 DB_USERNAME = database_username
 DB_PASSWORD = database_password
 
+## BSP für postgres
+DB_PORT = 5432
+DB_HOST = database_host
+DB_NAME = database_name
+DB_USERNAME = database_username
+DB_PASSWORD = database_password
+
+## BSP für sqlite
+DB_HOST = filename.db
+
 SERVER_PORT = portnumber
 
 JWT_SECRET = ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890

.gitignore

@@ -132,4 +132,5 @@ dist
 
 files
 
-.idea
+.idea
+*.db

README.md

@@ -25,7 +25,7 @@ services:
     container_name: ff_member_administration_server
     restart: unless-stopped
     environment:
-      - DB_TYPE=<mysql|sqlite> # default ist auf mysql gesetzt
+      - DB_TYPE=<mysql|sqlite|postgres> # default ist auf mysql gesetzt
       - DB_HOST=ff-db
       - DB_PORT=<number> # default ist auf 3306 gesetzt
       - DB_NAME=ffadmin
@@ -44,7 +44,7 @@ services:
       - CLUB_WEBSITE=<tobemodified>
       - BACKUP_INTERVAL=<number of days (min. 1)> # alle x Tage, sonst keine
       - BACKUP_COPIES=<number of parallel copies> # Anzahl parallel bestehender Backups
-      - BACKUP_AUTO_RESTORE=<boolean> # default ist auf false gesetzt
+      - BACKUP_AUTO_RESTORE=<boolean> # default ist auf true gesetzt
     volumes:
       - <volume|local path>:/app/files
     networks:
@@ -65,11 +65,27 @@ services:
       - <volume|local path>:/var/lib/mysql
     networks:
       - ff_internal
+  # OR
+    image: postgres:16
+    container_name: ff_db
+    restart: unless-stopped
+    environment:   
+      - POSTGRES_DB=ffadmin
+      - POSTGRES_USER=administration_backend
+      - POSTGRES_PASSWORD=<dbuserpasswd>
+    volumes:
+      - <volume|local path>:/var/lib/postgresql/data
+    networks:
+      - ff_internal
 
 networks:
   ff_internal:
 ```
 
+Die Verwendung von postgres wird aufgrund des Verhaltens bei Struktur-Update-Fehlern und genauerer Datum-Berechnungen empfohlen.
+
+Die Verwendung von SQLite wird nur für die Entwicklung oder lokale Tests empfohlen.
+
 Führen Sie dann den folgenden Befehl im Verzeichnis der compose-Datei aus, um den Container zu starten:
 
 ```sh

package.json

@@ -43,6 +43,7 @@
     "rss-parser": "^3.13.0",
     "socket.io": "^4.7.5",
     "speakeasy": "^2.0.0",
+    "sqlite3": "^5.1.7",
     "typeorm": "^0.3.20",
     "uuid": "^10.0.0"
   },

src/data-source.ts

@@ -50,7 +50,7 @@ import { CreateSchema1738166167472 } from "./migrations/1738166167472-CreateSche
 
 const dataSource = new DataSource({
   type: DB_TYPE as any,
-  host: process.env.NODE_ENV || process.env.DBMODE ? "localhost" : DB_HOST,
+  host: DB_HOST,
   port: DB_PORT,
   username: DB_USERNAME,
   password: DB_PASSWORD,

src/entity/club/calendar.ts

@@ -8,18 +8,20 @@ import {
   UpdateDateColumn,
   AfterUpdate,
   BeforeUpdate,
+  ColumnType,
 } from "typeorm";
 import { calendarType } from "../settings/calendarType";
+import { getTypeByORM } from "../../migrations/ormHelper";
 
 @Entity()
 export class calendar {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
-  @Column({ type: "datetime", nullable: false })
+  @Column({ type: getTypeByORM("datetime").type as ColumnType })
   starttime: Date;
 
-  @Column({ type: "datetime", nullable: false })
+  @Column({ type: getTypeByORM("datetime").type as ColumnType })
   endtime: Date;
 
   @Column({ type: "varchar", length: 255, nullable: false })

src/entity/club/member/member.ts

@@ -1,10 +1,11 @@
-import { Column, Entity, JoinColumn, ManyToOne, OneToMany, OneToOne, PrimaryColumn } from "typeorm";
+import { Column, ColumnType, Entity, JoinColumn, ManyToOne, OneToMany, OneToOne, PrimaryColumn } from "typeorm";
 import { membership } from "./membership";
 import { memberAwards } from "./memberAwards";
 import { memberQualifications } from "./memberQualifications";
 import { memberExecutivePositions } from "./memberExecutivePositions";
 import { communication } from "./communication";
 import { salutation } from "../../settings/salutation";
+import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
 export class member {
@@ -20,7 +21,7 @@ export class member {
   @Column({ type: "varchar", length: 255 })
   nameaffix: string;
 
-  @Column({ type: "date" })
+  @Column({ type: getTypeByORM("date").type as ColumnType })
   birthdate: Date;
 
   @Column({ type: "varchar", length: 255, unique: true, nullable: true })

src/entity/club/member/memberAwards.ts

@@ -1,6 +1,7 @@
-import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
+import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
 import { award } from "../../settings/award";
+import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
 export class memberAwards {
@@ -13,7 +14,7 @@ export class memberAwards {
   @Column({ type: "varchar", length: 255, nullable: true })
   note?: string;
 
-  @Column({ type: "date" })
+  @Column({ type: getTypeByORM("date").type as ColumnType })
   date: Date;
 
   @Column()

src/entity/club/member/memberExecutivePositions.ts

@@ -1,6 +1,7 @@
-import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
+import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
 import { executivePosition } from "../../settings/executivePosition";
+import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
 export class memberExecutivePositions {
@@ -10,10 +11,10 @@ export class memberExecutivePositions {
   @Column({ type: "varchar", length: 255, nullable: true })
   note?: string;
 
-  @Column({ type: "date" })
+  @Column({ type: getTypeByORM("date").type as ColumnType })
   start: Date;
 
-  @Column({ type: "date", nullable: true })
+  @Column({ type: getTypeByORM("date").type as ColumnType, nullable: true })
   end?: Date;
 
   @Column()

src/entity/club/member/memberQualifications.ts

@@ -1,6 +1,7 @@
-import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
+import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
 import { qualification } from "../../settings/qualification";
+import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
 export class memberQualifications {
@@ -10,10 +11,10 @@ export class memberQualifications {
   @Column({ type: "varchar", length: 255, nullable: true })
   note?: string;
 
-  @Column({ type: "date" })
+  @Column({ type: getTypeByORM("date").type as ColumnType })
   start: Date;
 
-  @Column({ type: "date", nullable: true })
+  @Column({ type: getTypeByORM("date").type as ColumnType, nullable: true })
   end?: Date;
 
   @Column({ type: "varchar", length: 255, nullable: true })

src/entity/club/member/membership.ts

@@ -1,16 +1,17 @@
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm";
+import { Column, ColumnType, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
 import { membershipStatus } from "../../settings/membershipStatus";
+import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
 export class membership {
   @PrimaryColumn({ generated: "increment", type: "int" })
   id: number;
 
-  @Column({ type: "date" })
+  @Column({ type: getTypeByORM("date").type as ColumnType })
   start: Date;
 
-  @Column({ type: "date", nullable: true })
+  @Column({ type: getTypeByORM("date").type as ColumnType, nullable: true })
   end?: Date;
 
   @Column({ type: "varchar", length: 255, nullable: true })

src/entity/club/protocol/protocol.ts

@@ -1,9 +1,10 @@
-import { Column, Entity, OneToMany, PrimaryColumn } from "typeorm";
+import { Column, ColumnType, Entity, OneToMany, PrimaryColumn } from "typeorm";
 import { protocolAgenda } from "./protocolAgenda";
 import { protocolDecision } from "./protocolDecision";
 import { protocolPresence } from "./protocolPresence";
 import { protocolPrintout } from "./protocolPrintout";
 import { protocolVoting } from "./protocolVoting";
+import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
 export class protocol {
@@ -13,13 +14,13 @@ export class protocol {
   @Column({ type: "varchar", length: 255, unique: true })
   title: string;
 
-  @Column({ type: "date" })
+  @Column({ type: getTypeByORM("date").type as ColumnType })
   date: Date;
 
-  @Column({ type: "time", nullable: true })
+  @Column({ type: getTypeByORM("time").type as ColumnType, nullable: true })
   starttime: Date;
 
-  @Column({ type: "time", nullable: true })
+  @Column({ type: getTypeByORM("time").type as ColumnType, nullable: true })
   endtime: Date;
 
   @Column({ type: "text", nullable: true })

src/entity/refresh.ts

@@ -1,5 +1,6 @@
-import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
+import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { user } from "./user/user";
+import { getTypeByORM } from "../migrations/ormHelper";
 
 @Entity()
 export class refresh {
@@ -9,7 +10,7 @@ export class refresh {
   @PrimaryColumn()
   userId: string;
 
-  @Column({ type: "datetime" })
+  @Column({ type: getTypeByORM("datetime").type as ColumnType })
   expiry: Date;
 
   @ManyToOne(() => user, {

src/entity/user/webapi.ts

@@ -1,5 +1,6 @@
-import { Column, CreateDateColumn, Entity, OneToMany, PrimaryColumn } from "typeorm";
+import { Column, ColumnType, CreateDateColumn, Entity, OneToMany, PrimaryColumn } from "typeorm";
 import { webapiPermission } from "./webapi_permission";
+import { getTypeByORM } from "../../migrations/ormHelper";
 
 @Entity()
 export class webapi {
@@ -15,10 +16,10 @@ export class webapi {
   @CreateDateColumn()
   createdAt: Date;
 
-  @Column({ type: "datetime", nullable: true })
+  @Column({ type: getTypeByORM("datetime").type as ColumnType, nullable: true })
   lastUsage?: Date;
 
-  @Column({ type: "date", nullable: true })
+  @Column({ type: getTypeByORM("date").type as ColumnType, nullable: true })
   expiry?: Date;
 
   @OneToMany(() => webapiPermission, (apiPermission) => apiPermission.webapi, { cascade: ["insert"] })

src/env.defaults.ts

@@ -26,14 +26,18 @@ export const CLUB_WEBSITE = process.env.CLUB_WEBSITE ?? "";
 
 export const BACKUP_INTERVAL = Number(process.env.BACKUP_INTERVAL ?? "0");
 export const BACKUP_COPIES = Number(process.env.BACKUP_COPIES ?? "0");
-export const BACKUP_AUTO_RESTORE = process.env.BACKUP_AUTO_RESTORE ?? "false";
+export const BACKUP_AUTO_RESTORE = process.env.BACKUP_AUTO_RESTORE ?? "true";
 
 export function configCheck() {
-  if (DB_TYPE != "mysql" && DB_TYPE != "sqlite") throw new Error("set valid value to DB_TYPE (mysql|sqlite)");
-  if (DB_HOST == "" || typeof DB_HOST != "string") throw new Error("set valid value to DB_HOST");
+  if (DB_TYPE != "mysql" && DB_TYPE != "sqlite" && DB_TYPE != "postgres")
+    throw new Error("set valid value to DB_TYPE (mysql|sqlite|postgres)");
+  if ((DB_HOST == "" || typeof DB_HOST != "string") && DB_TYPE != "sqlite")
+    throw new Error("set valid value to DB_HOST");
   if (DB_NAME == "" || typeof DB_NAME != "string") throw new Error("set valid value to DB_NAME");
-  if (DB_USERNAME == "" || typeof DB_USERNAME != "string") throw new Error("set valid value to DB_USERNAME");
-  if (DB_PASSWORD == "" || typeof DB_PASSWORD != "string") throw new Error("set valid value to DB_PASSWORD");
+  if ((DB_USERNAME == "" || typeof DB_USERNAME != "string") && DB_TYPE != "sqlite")
+    throw new Error("set valid value to DB_USERNAME");
+  if ((DB_PASSWORD == "" || typeof DB_PASSWORD != "string") && DB_TYPE != "sqlite")
+    throw new Error("set valid value to DB_PASSWORD");
 
   if (typeof SERVER_PORT != "number") throw new Error("set valid numeric value to SERVER_PORT");
 

src/migrations/1738166124200-BackupAndResetDatabase.ts

@@ -1,13 +1,15 @@
 import { MigrationInterface, QueryRunner, Table } from "typeorm";
 import BackupHelper from "../helpers/backupHelper";
-import { getTypeByORM } from "./ormHelper";
+import { getDefaultByORM, getTypeByORM, isIncrementPrimary } from "./ormHelper";
 import InternalException from "../exceptions/internalException";
+import { DB_TYPE } from "../env.defaults";
 
 export class BackupAndResetDatabase1738166124200 implements MigrationInterface {
   name = "BackupAndResetDatabase1738166124200";
 
   public async up(queryRunner: QueryRunner): Promise<void> {
-    let migrations = await queryRunner.query("SELECT `name` FROM `migrations`");
+    let query = DB_TYPE == "postgres" ? "SELECT name FROM migrations" : "SELECT `name` FROM `migrations`";
+    let migrations = await queryRunner.query(query);
     if (
       (await queryRunner.hasTable("user")) &&
       migrations.findIndex((m: any) => m.name == "MoveSendNewsletterFlag1737816852011") == -1
@@ -26,15 +28,9 @@ export class BackupAndResetDatabase1738166124200 implements MigrationInterface {
       new Table({
         name: "migrations",
         columns: [
-          {
-            name: "id",
-            type: getTypeByORM("int"),
-            isPrimary: true,
-            isGenerated: true,
-            generationStrategy: "increment",
-          },
-          { name: "timestamp", type: getTypeByORM("bigint"), isNullable: false },
-          { name: "name", type: getTypeByORM("varchar"), length: "255", isNullable: false },
+          { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+          { name: "timestamp", ...getTypeByORM("bigint") },
+          { name: "name", ...getTypeByORM("varchar") },
         ],
       }),
       true
@@ -44,12 +40,12 @@ export class BackupAndResetDatabase1738166124200 implements MigrationInterface {
       new Table({
         name: "typeorm_metadata",
         columns: [
-          { name: "type", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-          { name: "database", type: getTypeByORM("varchar"), length: "255", isNullable: true, default: null },
-          { name: "schema", type: getTypeByORM("varchar"), length: "255", isNullable: true, default: null },
-          { name: "table", type: getTypeByORM("varchar"), length: "255", isNullable: true, default: null },
-          { name: "name", type: getTypeByORM("varchar"), length: "255", isNullable: true, default: null },
-          { name: "value", type: getTypeByORM("text"), length: "255", isNullable: true, default: null },
+          { name: "type", ...getTypeByORM("varchar") },
+          { name: "database", ...getTypeByORM("varchar", true), default: getDefaultByORM("null") },
+          { name: "schema", ...getTypeByORM("varchar", true), default: getDefaultByORM("null") },
+          { name: "table", ...getTypeByORM("varchar", true), default: getDefaultByORM("null") },
+          { name: "name", ...getTypeByORM("varchar", true), default: getDefaultByORM("null") },
+          { name: "value", ...getTypeByORM("text", true), default: getDefaultByORM("null") },
         ],
       }),
       true

src/migrations/1738166167472-CreateSchema.ts

@@ -20,13 +20,17 @@ import {
   member_communication_table,
   member_executive_positions_table,
   member_executive_positions_view,
+  member_executive_positions_view_postgres,
   member_qualifications_table,
   member_qualifications_view,
+  member_qualifications_view_postgres,
   member_table,
   member_view,
+  member_view_postgres,
   membership_status_table,
   membership_table,
   membership_view,
+  membership_view_postgres,
   qualification_table,
   salutation_table,
 } from "./baseSchemaTables/member";
@@ -46,6 +50,7 @@ import {
   newsletter_recipients_table,
   newsletter_table,
 } from "./baseSchemaTables/newsletter";
+import { DB_TYPE } from "../env.defaults";
 
 export class CreateSchema1738166167472 implements MigrationInterface {
   name = "CreateSchema1738166167472";
@@ -75,10 +80,14 @@ export class CreateSchema1738166167472 implements MigrationInterface {
     await queryRunner.createTable(member_executive_positions_table, true, true, true);
     await queryRunner.createTable(member_qualifications_table, true, true, true);
 
-    await queryRunner.createView(member_view, true);
-    await queryRunner.createView(membership_view, true);
-    await queryRunner.createView(member_qualifications_view, true);
-    await queryRunner.createView(member_executive_positions_view, true);
+    if (DB_TYPE == "postgres") await queryRunner.createView(member_view_postgres, true);
+    else await queryRunner.createView(member_view, true);
+    if (DB_TYPE == "postgres") await queryRunner.createView(membership_view_postgres, true);
+    else await queryRunner.createView(membership_view, true);
+    if (DB_TYPE == "postgres") await queryRunner.createView(member_qualifications_view_postgres, true);
+    else await queryRunner.createView(member_qualifications_view, true);
+    if (DB_TYPE == "postgres") await queryRunner.createView(member_executive_positions_view_postgres, true);
+    else await queryRunner.createView(member_executive_positions_view, true);
 
     await queryRunner.createTable(query_table, true, true, true);
     await queryRunner.createTable(template_table, true, true, true);

src/migrations/baseSchemaTables/admin.ts

@@ -1,36 +1,30 @@
 import { Table, TableForeignKey } from "typeorm";
-import { getTypeByORM } from "../ormHelper";
+import { getDefaultByORM, getTypeByORM, isIncrementPrimary, isUUIDPrimary } from "../ormHelper";
 
 export const invite_table = new Table({
   name: "invite",
   columns: [
-    { name: "mail", type: getTypeByORM("varchar"), length: "255", isPrimary: true },
-    { name: "token", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "username", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "firstname", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "lastname", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "secret", type: getTypeByORM("varchar"), length: "255", isNullable: false },
+    { name: "mail", ...getTypeByORM("varchar"), isPrimary: true },
+    { name: "token", ...getTypeByORM("varchar") },
+    { name: "username", ...getTypeByORM("varchar") },
+    { name: "firstname", ...getTypeByORM("varchar") },
+    { name: "lastname", ...getTypeByORM("varchar") },
+    { name: "secret", ...getTypeByORM("varchar") },
   ],
 });
 export const role_table = new Table({
   name: "role",
   columns: [
-    {
-      name: "id",
-      type: getTypeByORM("int"),
-      isPrimary: true,
-      isGenerated: true,
-      generationStrategy: "increment",
-    },
-    { name: "role", type: getTypeByORM("varchar"), length: "255", isNullable: false, isUnique: true },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "role", ...getTypeByORM("varchar"), isUnique: true },
   ],
 });
 
 export const role_permission_table = new Table({
   name: "role_permission",
   columns: [
-    { name: "roleId", type: getTypeByORM("int"), isPrimary: true },
-    { name: "permission", type: getTypeByORM("varchar"), length: "255", isPrimary: true },
+    { name: "roleId", ...getTypeByORM("int"), isPrimary: true },
+    { name: "permission", ...getTypeByORM("varchar"), isPrimary: true },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -46,29 +40,22 @@ export const role_permission_table = new Table({
 export const user_table = new Table({
   name: "user",
   columns: [
-    {
-      name: "id",
-      type: getTypeByORM("varchar"),
-      length: "36",
-      isPrimary: true,
-      isGenerated: true,
-      generationStrategy: "uuid",
-    },
-    { name: "mail", type: getTypeByORM("varchar"), length: "255", isNullable: false, isUnique: true },
-    { name: "username", type: getTypeByORM("varchar"), length: "255", isNullable: false, isUnique: true },
-    { name: "firstname", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "lastname", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "secret", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "static", type: getTypeByORM("boolean"), isNullable: false, default: false },
-    { name: "isOwner", type: getTypeByORM("boolean"), isNullable: false, default: false },
+    { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary },
+    { name: "mail", ...getTypeByORM("varchar"), isUnique: true },
+    { name: "username", ...getTypeByORM("varchar"), isUnique: true },
+    { name: "firstname", ...getTypeByORM("varchar") },
+    { name: "lastname", ...getTypeByORM("varchar") },
+    { name: "secret", ...getTypeByORM("varchar") },
+    { name: "static", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
+    { name: "isOwner", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
   ],
 });
 
 export const user_roles_table = new Table({
   name: "user_roles",
   columns: [
-    { name: "userId", type: getTypeByORM("varchar"), isPrimary: true },
-    { name: "roleId", type: getTypeByORM("int"), isPrimary: true },
+    { name: "userId", ...getTypeByORM("uuid"), isPrimary: true },
+    { name: "roleId", ...getTypeByORM("int"), isPrimary: true },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -91,8 +78,8 @@ export const user_roles_table = new Table({
 export const user_permission_table = new Table({
   name: "user_permission",
   columns: [
-    { name: "userId", type: getTypeByORM("varchar"), isPrimary: true },
-    { name: "permission", type: getTypeByORM("varchar"), length: "255", isPrimary: true },
+    { name: "userId", ...getTypeByORM("uuid"), isPrimary: true },
+    { name: "permission", ...getTypeByORM("varchar"), isPrimary: true },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -108,9 +95,9 @@ export const user_permission_table = new Table({
 export const refresh_table = new Table({
   name: "refresh",
   columns: [
-    { name: "token", type: getTypeByORM("varchar"), length: "255", isPrimary: true, isNullable: false },
-    { name: "expiry", type: getTypeByORM("datetime"), isNullable: false },
-    { name: "userId", type: getTypeByORM("varchar"), isPrimary: true, isNullable: false },
+    { name: "token", ...getTypeByORM("varchar"), isPrimary: true },
+    { name: "expiry", ...getTypeByORM("datetime", false, 6) },
+    { name: "userId", ...getTypeByORM("uuid"), isPrimary: true },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -126,26 +113,20 @@ export const refresh_table = new Table({
 export const webapi_table = new Table({
   name: "webapi",
   columns: [
-    {
-      name: "id",
-      type: getTypeByORM("int"),
-      isPrimary: true,
-      isGenerated: true,
-      generationStrategy: "increment",
-    },
-    { name: "token", type: getTypeByORM("varchar"), length: "255", isNullable: false, isUnique: true },
-    { name: "title", type: getTypeByORM("varchar"), length: "255", isNullable: false, isUnique: true },
-    { name: "createdAt", type: getTypeByORM("datetime"), isNullable: false, default: "CURRENT_TIMESTAMP(6)" },
-    { name: "lastUsage", type: getTypeByORM("datetime"), isNullable: true, default: null },
-    { name: "expiry", type: getTypeByORM("date"), isNullable: true, default: null },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "token", ...getTypeByORM("varchar"), isUnique: true },
+    { name: "title", ...getTypeByORM("varchar"), isUnique: true },
+    { name: "createdAt", ...getTypeByORM("datetime", false, 6), default: getDefaultByORM("currentTimestamp", 6) },
+    { name: "lastUsage", ...getTypeByORM("datetime", true, 6), default: getDefaultByORM("null") },
+    { name: "expiry", ...getTypeByORM("date", true), default: getDefaultByORM("null") },
   ],
 });
 
 export const webapi_permission_table = new Table({
   name: "webapi_permission",
   columns: [
-    { name: "webapiId", type: getTypeByORM("int"), isPrimary: true },
-    { name: "permission", type: getTypeByORM("varchar"), length: "255", isPrimary: true },
+    { name: "webapiId", ...getTypeByORM("int"), isPrimary: true },
+    { name: "permission", ...getTypeByORM("varchar"), isPrimary: true },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -161,9 +142,9 @@ export const webapi_permission_table = new Table({
 export const reset_table = new Table({
   name: "reset",
   columns: [
-    { name: "mail", type: getTypeByORM("varchar"), length: "255", isPrimary: true },
-    { name: "token", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "username", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "secret", type: getTypeByORM("varchar"), length: "255", isNullable: false },
+    { name: "mail", ...getTypeByORM("varchar"), isPrimary: true },
+    { name: "token", ...getTypeByORM("varchar") },
+    { name: "username", ...getTypeByORM("varchar") },
+    { name: "secret", ...getTypeByORM("varchar") },
   ],
 });

src/migrations/baseSchemaTables/calendar.ts

@@ -1,61 +1,39 @@
 import { Table, TableForeignKey } from "typeorm";
-import { getTypeByORM } from "../ormHelper";
+import { getDefaultByORM, getTypeByORM, isIncrementPrimary, isUUIDPrimary } from "../ormHelper";
 
 export const calendar_type_table = new Table({
   name: "calendar_type",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "type", type: getTypeByORM("varchar"), length: "255", isUnique: true, isNullable: false },
-    { name: "nscdr", type: getTypeByORM("boolean"), isNullable: false, default: false },
-    { name: "color", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "passphrase", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "externalPrefix", type: getTypeByORM("varchar"), length: "255", isNullable: false, default: "''" },
-    { name: "sendToWebpage", type: getTypeByORM("boolean"), isNullable: false, default: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "type", ...getTypeByORM("varchar"), isUnique: true },
+    { name: "nscdr", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
+    { name: "color", ...getTypeByORM("varchar") },
+    { name: "passphrase", ...getTypeByORM("varchar", true) },
+    { name: "externalPrefix", ...getTypeByORM("varchar"), default: getDefaultByORM("string") },
+    { name: "sendToWebpage", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
   ],
 });
 
 export const calendar_table = new Table({
   name: "calendar",
   columns: [
-    {
-      name: "id",
-      type: getTypeByORM("varchar"),
-      length: "36",
-      isPrimary: true,
-      isGenerated: true,
-      generationStrategy: "uuid",
-    },
-    { name: "starttime", type: getTypeByORM("datetime"), isNullable: false },
-    { name: "endtime", type: getTypeByORM("datetime"), isNullable: false },
-    { name: "title", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "content", type: getTypeByORM("text"), isNullable: true },
-    { name: "allDay", type: getTypeByORM("boolean"), isNullable: false, default: false },
-    { name: "location", type: getTypeByORM("text"), isNullable: true },
-    { name: "sequence", type: getTypeByORM("int"), default: 1 },
-    {
-      name: "createdAt",
-      type: getTypeByORM("datetime"),
-      precision: 6,
-      isNullable: false,
-      default: "CURRENT_TIMESTAMP(6)",
-    },
+    { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary },
+    { name: "starttime", ...getTypeByORM("datetime", false, 6) },
+    { name: "endtime", ...getTypeByORM("datetime", false, 6) },
+    { name: "title", ...getTypeByORM("varchar") },
+    { name: "content", ...getTypeByORM("text", true) },
+    { name: "allDay", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
+    { name: "location", ...getTypeByORM("text", true) },
+    { name: "sequence", ...getTypeByORM("int"), default: getDefaultByORM("number", 1) },
+    { name: "createdAt", ...getTypeByORM("datetime", false, 6), default: getDefaultByORM("currentTimestamp", 6) },
     {
       name: "updatedAt",
-      type: getTypeByORM("datetime"),
-      precision: 6,
-      isNullable: false,
-      default: "CURRENT_TIMESTAMP(6)",
-      onUpdate: "CURRENT_TIMESTAMP(6)",
+      ...getTypeByORM("datetime", false, 6),
+      default: getDefaultByORM("currentTimestamp", 6),
+      onUpdate: getDefaultByORM<string>("currentTimestamp", 6),
     },
-    {
-      name: "webpageId",
-      type: getTypeByORM("varchar"),
-      length: "255",
-      isNullable: true,
-      default: null,
-      isUnique: true,
-    },
-    { name: "typeId", type: getTypeByORM("int"), isNullable: false },
+    { name: "webpageId", ...getTypeByORM("varchar", true), default: getDefaultByORM("null"), isUnique: true },
+    { name: "typeId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({

src/migrations/baseSchemaTables/member.ts

@@ -1,53 +1,53 @@
 import { Table, TableForeignKey, View } from "typeorm";
-import { getTypeByORM } from "../ormHelper";
+import { getDefaultByORM, getTypeByORM, isIncrementPrimary, isUUIDPrimary } from "../ormHelper";
 
 export const salutation_table = new Table({
   name: "salutation",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "salutation", type: getTypeByORM("varchar"), length: "255", isUnique: true, isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "salutation", ...getTypeByORM("varchar"), isUnique: true },
   ],
 });
 
 export const award_table = new Table({
   name: "award",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "award", type: getTypeByORM("varchar"), length: "255", isUnique: true, isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "award", ...getTypeByORM("varchar"), isUnique: true },
   ],
 });
 
 export const communication_type_table = new Table({
   name: "communication_type",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "type", type: getTypeByORM("varchar"), length: "255", isUnique: true, isNullable: false },
-    { name: "useColumns", type: getTypeByORM("varchar"), length: "255", isNullable: false, default: "''" },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "type", ...getTypeByORM("varchar"), isUnique: true },
+    { name: "useColumns", ...getTypeByORM("varchar"), default: getDefaultByORM("string") },
   ],
 });
 
 export const executive_position_table = new Table({
   name: "executive_position",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "position", type: getTypeByORM("varchar"), length: "255", isUnique: true, isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "position", ...getTypeByORM("varchar"), isUnique: true },
   ],
 });
 
 export const membership_status_table = new Table({
   name: "membership_status",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "status", type: getTypeByORM("varchar"), length: "255", isUnique: true, isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "status", ...getTypeByORM("varchar"), isUnique: true },
   ],
 });
 
 export const qualification_table = new Table({
   name: "qualification",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "qualification", type: getTypeByORM("varchar"), length: "255", isUnique: true, isNullable: false },
-    { name: "description", type: getTypeByORM("varchar"), length: "255", isNullable: true },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "qualification", ...getTypeByORM("varchar"), isUnique: true },
+    { name: "description", ...getTypeByORM("varchar"), isNullable: true },
   ],
 });
 
@@ -55,27 +55,13 @@ export const qualification_table = new Table({
 export const member_table = new Table({
   name: "member",
   columns: [
-    {
-      name: "id",
-      type: getTypeByORM("varchar"),
-      length: "36",
-      isPrimary: true,
-      isGenerated: true,
-      generationStrategy: "uuid",
-    },
-    { name: "salutationId", type: getTypeByORM("int"), isNullable: false },
-    {
-      name: "internalId",
-      type: getTypeByORM("varchar"),
-      length: "255",
-      default: null,
-      isNullable: true,
-      isUnique: true,
-    },
-    { name: "firstname", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "lastname", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "nameaffix", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "birthdate", type: getTypeByORM("date"), isNullable: false },
+    { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary },
+    { name: "salutationId", ...getTypeByORM("int") },
+    { name: "internalId", ...getTypeByORM("varchar", true), default: getDefaultByORM("null"), isUnique: true },
+    { name: "firstname", ...getTypeByORM("varchar") },
+    { name: "lastname", ...getTypeByORM("varchar") },
+    { name: "nameaffix", ...getTypeByORM("varchar") },
+    { name: "birthdate", ...getTypeByORM("date") },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -91,12 +77,12 @@ export const member_table = new Table({
 export const membership_table = new Table({
   name: "membership",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "start", type: getTypeByORM("date"), isNullable: false },
-    { name: "end", type: getTypeByORM("date"), isNullable: true },
-    { name: "terminationReason", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "memberId", type: getTypeByORM("varchar"), isNullable: false },
-    { name: "statusId", type: getTypeByORM("int"), isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "start", ...getTypeByORM("date") },
+    { name: "end", ...getTypeByORM("date", true) },
+    { name: "terminationReason", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "memberId", ...getTypeByORM("uuid") },
+    { name: "statusId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -119,13 +105,13 @@ export const membership_table = new Table({
 export const member_qualifications_table = new Table({
   name: "member_qualifications",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "note", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "start", type: getTypeByORM("date"), isNullable: false },
-    { name: "end", type: getTypeByORM("date"), isNullable: true },
-    { name: "terminationReason", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "memberId", type: getTypeByORM("varchar"), isNullable: false },
-    { name: "qualificationId", type: getTypeByORM("int"), isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "note", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "start", ...getTypeByORM("date") },
+    { name: "end", ...getTypeByORM("date", true) },
+    { name: "terminationReason", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "memberId", ...getTypeByORM("uuid") },
+    { name: "qualificationId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -148,12 +134,12 @@ export const member_qualifications_table = new Table({
 export const member_executive_positions_table = new Table({
   name: "member_executive_positions",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "note", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "start", type: getTypeByORM("date"), isNullable: false },
-    { name: "end", type: getTypeByORM("date"), isNullable: true },
-    { name: "memberId", type: getTypeByORM("varchar"), isNullable: false },
-    { name: "executivePositionId", type: getTypeByORM("int"), isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "note", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "start", ...getTypeByORM("date") },
+    { name: "end", ...getTypeByORM("date", true) },
+    { name: "memberId", ...getTypeByORM("uuid") },
+    { name: "executivePositionId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -176,12 +162,12 @@ export const member_executive_positions_table = new Table({
 export const member_awards_table = new Table({
   name: "member_awards",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "given", type: getTypeByORM("boolean"), default: false, isNullable: false },
-    { name: "note", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "date", type: getTypeByORM("date"), isNullable: false },
-    { name: "memberId", type: getTypeByORM("varchar"), isNullable: false },
-    { name: "awardId", type: getTypeByORM("int"), isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "given", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
+    { name: "note", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "date", ...getTypeByORM("date") },
+    { name: "memberId", ...getTypeByORM("uuid") },
+    { name: "awardId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -204,19 +190,19 @@ export const member_awards_table = new Table({
 export const member_communication_table = new Table({
   name: "communication",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "preferred", type: getTypeByORM("boolean"), isNullable: false, default: false },
-    { name: "isSendNewsletter", type: getTypeByORM("boolean"), isNullable: false, default: false },
-    { name: "isSMSAlarming", type: getTypeByORM("boolean"), isNullable: false, default: false },
-    { name: "mobile", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "email", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "postalCode", type: getTypeByORM("varchar"), length: "255", default: null, isNullable: true },
-    { name: "city", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "street", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "streetNumber", type: getTypeByORM("int"), isNullable: true },
-    { name: "streetNumberAddition", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "memberId", type: getTypeByORM("varchar"), isNullable: false },
-    { name: "typeId", type: getTypeByORM("int"), isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "preferred", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
+    { name: "isSendNewsletter", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
+    { name: "isSMSAlarming", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
+    { name: "mobile", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "email", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "postalCode", ...getTypeByORM("varchar"), default: getDefaultByORM("null"), isNullable: true },
+    { name: "city", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "street", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "streetNumber", ...getTypeByORM("int", true) },
+    { name: "streetNumberAddition", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "memberId", ...getTypeByORM("uuid") },
+    { name: "typeId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -247,13 +233,32 @@ export const member_view = new View({
       \`member\`.\`nameaffix\` AS \`nameaffix\`, 
       \`member\`.\`birthdate\` AS \`birthdate\`, 
       \`salutation\`.\`salutation\` AS \`salutation\`, 
-      TIMESTAMPDIFF(YEAR, \`member\`.\`birthdate\`, CURDATE()) AS \`todayAge\`, YEAR(CURDATE()) - YEAR(\`member\`.\`birthdate\`) AS \`ageThisYear\`, 
+      TIMESTAMPDIFF(YEAR, \`member\`.\`birthdate\`, CURDATE()) AS \`todayAge\`, 
+      YEAR(CURDATE()) - YEAR(\`member\`.\`birthdate\`) AS \`ageThisYear\`, 
       CONCAT('_', FROM_DAYS(TIMESTAMPDIFF(DAY, \`member\`.\`birthdate\`, CURDATE()))) AS \`exactAge\` 
     FROM \`member\` \`member\` 
     LEFT JOIN \`salutation\` \`salutation\` ON \`salutation\`.\`id\`=\`member\`.\`salutationId\`
   `,
 });
 
+export const member_view_postgres = new View({
+  name: "member_view",
+  expression: `
+    SELECT 
+      "member"."id" AS "id", 
+      "member"."firstname" AS "firstname", 
+      "member"."lastname" AS "lastname", 
+      "member"."nameaffix" AS "nameaffix", 
+      "member"."birthdate" AS "birthdate", 
+      "salutation"."salutation" AS "salutation", 
+      DATE_PART('year', AGE(CURRENT_DATE, member.birthdate)) AS "todayAge", 
+      EXTRACT(YEAR FROM CURRENT_DATE) - EXTRACT(YEAR FROM member.birthdate) AS "ageThisYear", 
+      AGE(CURRENT_DATE, member.birthdate) AS "exactAge" 
+    FROM "member" "member" 
+    LEFT JOIN "salutation" "salutation" ON "salutation"."id"="member"."salutationId"
+  `,
+});
+
 export const member_executive_positions_view = new View({
   name: "member_executive_positions_view",
   expression: `
@@ -266,13 +271,35 @@ export const member_executive_positions_view = new View({
       \`member\`.\`nameaffix\` AS \`memberNameaffix\`, 
       \`member\`.\`birthdate\` AS \`memberBirthdate\`, 
       \`salutation\`.\`salutation\` AS \`memberSalutation\`, 
-      SUM(TIMESTAMPDIFF(DAY, \`memberExecutivePositions\`.\`start\`, 
-      COALESCE(\`memberExecutivePositions\`.\`end\`, CURRENT_DATE))) AS \`durationInDays\` 
+      SUM(TIMESTAMPDIFF(DAY, \`memberExecutivePositions\`.\`start\`, COALESCE(\`memberExecutivePositions\`.\`end\`, CURRENT_DATE))) AS \`durationInDays\`, 
+      CONCAT('_', FROM_DAYS(SUM(TIMESTAMPDIFF(DAY, \`memberExecutivePositions\`.\`start\`, COALESCE(\`memberExecutivePositions\`.\`end\`, CURRENT_DATE))))) AS \`durationInYears\`  
     FROM \`member_executive_positions\` \`memberExecutivePositions\` 
     LEFT JOIN \`executive_position\` \`executivePosition\` ON \`executivePosition\`.\`id\`=\`memberExecutivePositions\`.\`executivePositionId\` 
     LEFT JOIN \`member\` \`member\` ON \`member\`.\`id\`=\`memberExecutivePositions\`.\`memberId\`  
     LEFT JOIN \`salutation\` \`salutation\` ON \`salutation\`.\`id\`=\`member\`.\`salutationId\` 
-    GROUP BY \`executivePosition\`.\`id\`, \`member\`.\`id\`
+    GROUP BY \`executivePosition\`.\`id\`, \`member\`.\`id\`, \`salutation\`.\`id\`
+  `,
+});
+
+export const member_executive_positions_view_postgres = new View({
+  name: "member_executive_positions_view",
+  expression: `
+    SELECT 
+      "executivePosition"."id" AS "positionId", 
+      "executivePosition"."position" AS "position", 
+      "member"."id" AS "memberId", 
+      "member"."firstname" AS "memberFirstname", 
+      "member"."lastname" AS "memberLastname", 
+      "member"."nameaffix" AS "memberNameaffix", 
+      "member"."birthdate" AS "memberBirthdate", 
+      "salutation"."salutation" AS "memberSalutation", 
+      SUM(COALESCE("memberExecutivePositions"."end", CURRENT_DATE) - "memberExecutivePositions"."start") AS "durationInDays",
+      SUM(AGE(COALESCE("memberExecutivePositions"."end", CURRENT_DATE), "memberExecutivePositions"."start")) AS "durationInYears"
+    FROM "member_executive_positions" "memberExecutivePositions" 
+    LEFT JOIN "executive_position" "executivePosition" ON "executivePosition"."id"="memberExecutivePositions"."executivePositionId" 
+    LEFT JOIN "member" "member" ON "member"."id"="memberExecutivePositions"."memberId"  
+    LEFT JOIN "salutation" "salutation" ON "salutation"."id"="member"."salutationId" 
+    GROUP BY "executivePosition"."id", "member"."id", "salutation"."id"
   `,
 });
 
@@ -288,13 +315,35 @@ export const member_qualifications_view = new View({
       \`member\`.\`nameaffix\` AS \`memberNameaffix\`, 
       \`member\`.\`birthdate\` AS \`memberBirthdate\`, 
       \`salutation\`.\`salutation\` AS \`memberSalutation\`, 
-      SUM(TIMESTAMPDIFF(DAY, \`memberQualifications\`.\`start\`, 
-      COALESCE(\`memberQualifications\`.\`end\`, CURRENT_DATE))) AS \`durationInDays\` 
+      SUM(TIMESTAMPDIFF(DAY, \`memberQualifications\`.\`start\`, COALESCE(\`memberQualifications\`.\`end\`, CURRENT_DATE))) AS \`durationInDays\`, 
+      CONCAT('_', FROM_DAYS(SUM(TIMESTAMPDIFF(DAY, \`memberQualifications\`.\`start\`, COALESCE(\`memberQualifications\`.\`end\`, CURRENT_DATE))))) AS \`durationInYears\`  
     FROM \`member_qualifications\` \`memberQualifications\` 
     LEFT JOIN \`qualification\` \`qualification\` ON \`qualification\`.\`id\`=\`memberQualifications\`.\`qualificationId\`  
     LEFT JOIN \`member\` \`member\` ON \`member\`.\`id\`=\`memberQualifications\`.\`memberId\`  
     LEFT JOIN \`salutation\` \`salutation\` ON \`salutation\`.\`id\`=\`member\`.\`salutationId\` 
-    GROUP BY \`qualification\`.\`id\`, \`member\`.\`id\`
+    GROUP BY \`qualification\`.\`id\`, \`member\`.\`id\`, \`salutation\`.\`id\`
+  `,
+});
+
+export const member_qualifications_view_postgres = new View({
+  name: "member_qualifications_view",
+  expression: `
+    SELECT 
+      "qualification"."id" AS "qualificationId", 
+      "qualification"."qualification" AS "qualification", 
+      "member"."id" AS "memberId", 
+      "member"."firstname" AS "memberFirstname", 
+      "member"."lastname" AS "memberLastname", 
+      "member"."nameaffix" AS "memberNameaffix", 
+      "member"."birthdate" AS "memberBirthdate", 
+      "salutation"."salutation" AS "memberSalutation", 
+      SUM(COALESCE("memberQualifications"."end", CURRENT_DATE) - "memberQualifications"."start") AS "durationInDays",
+      SUM(AGE(COALESCE("memberQualifications"."end", CURRENT_DATE), "memberQualifications"."start")) AS "durationInYears" 
+    FROM "member_qualifications" "memberQualifications" 
+    LEFT JOIN "qualification" "qualification" ON "qualification"."id"="memberQualifications"."qualificationId"  
+    LEFT JOIN "member" "member" ON "member"."id"="memberQualifications"."memberId"  
+    LEFT JOIN "salutation" "salutation" ON "salutation"."id"="member"."salutationId" 
+    GROUP BY "qualification"."id", "member"."id", "salutation"."id"
   `,
 });
 
@@ -310,13 +359,34 @@ export const membership_view = new View({
       \`member\`.\`nameaffix\` AS \`memberNameaffix\`, 
       \`member\`.\`birthdate\` AS \`memberBirthdate\`, 
       \`salutation\`.\`salutation\` AS \`memberSalutation\`, 
-      SUM(TIMESTAMPDIFF(DAY, \`membership\`.\`start\`, 
-      COALESCE(\`membership\`.\`end\`, CURRENT_DATE))) AS \`durationInDays\`, 
+      SUM(TIMESTAMPDIFF(DAY, \`membership\`.\`start\`, COALESCE(\`membership\`.\`end\`, CURRENT_DATE))) AS \`durationInDays\`, 
       CONCAT('_', FROM_DAYS(SUM(TIMESTAMPDIFF(DAY, \`membership\`.\`start\`, COALESCE(\`membership\`.\`end\`, CURRENT_DATE))))) AS \`durationInYears\` 
     FROM \`membership\` \`membership\` 
     LEFT JOIN \`membership_status\` \`status\` ON \`status\`.\`id\`=\`membership\`.\`statusId\`  
     LEFT JOIN \`member\` \`member\` ON \`member\`.\`id\`=\`membership\`.\`memberId\`  
     LEFT JOIN \`salutation\` \`salutation\` ON \`salutation\`.\`id\`=\`member\`.\`salutationId\` 
-    GROUP BY \`status\`.\`id\`, \`member\`.\`id\`
+    GROUP BY \`status\`.\`id\`, \`member\`.\`id\`, \`salutation\`.\`id\`
+  `,
+});
+
+export const membership_view_postgres = new View({
+  name: "membership_view",
+  expression: `
+    SELECT
+      "status"."id" AS "statusId",
+      "status"."status" AS "status",
+      "member"."id" AS "memberId",
+      "member"."firstname" AS "memberFirstname",
+      "member"."lastname" AS "memberLastname",
+      "member"."nameaffix" AS "memberNameaffix",
+      "member"."birthdate" AS "memberBirthdate",
+      "salutation"."salutation" AS "memberSalutation",
+      SUM(COALESCE("membership"."end", CURRENT_DATE) - "membership"."start") AS "durationInDays",
+      SUM(AGE(COALESCE("membership"."end", CURRENT_DATE), "membership"."start")) AS "durationInYears"
+    FROM "membership" "membership"
+    LEFT JOIN "membership_status" "status" ON "status"."id"="membership"."statusId"
+    LEFT JOIN "member" "member" ON "member"."id"="membership"."memberId"
+    LEFT JOIN "salutation" "salutation" ON "salutation"."id"="member"."salutationId"
+    GROUP BY "status"."id","member"."id", "salutation"."id"
   `,
 });

src/migrations/baseSchemaTables/newsletter.ts

@@ -1,17 +1,17 @@
 import { Table, TableForeignKey } from "typeorm";
-import { getTypeByORM } from "../ormHelper";
+import { getDefaultByORM, getTypeByORM, isIncrementPrimary } from "../ormHelper";
 
 export const newsletter_table = new Table({
   name: "newsletter",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "title", type: getTypeByORM("varchar"), length: "255" },
-    { name: "description", type: getTypeByORM("varchar"), length: "255", default: "''" },
-    { name: "newsletterTitle", type: getTypeByORM("varchar"), length: "255", default: "''" },
-    { name: "newsletterText", type: getTypeByORM("text"), default: "''" },
-    { name: "newsletterSignatur", type: getTypeByORM("varchar"), length: "255", default: "''" },
-    { name: "isSent", type: getTypeByORM("boolean"), default: false },
-    { name: "recipientsByQueryId", type: getTypeByORM("int"), isNullable: true },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "title", ...getTypeByORM("varchar") },
+    { name: "description", ...getTypeByORM("varchar"), default: getDefaultByORM("string") },
+    { name: "newsletterTitle", ...getTypeByORM("varchar"), default: getDefaultByORM("string") },
+    { name: "newsletterText", ...getTypeByORM("text"), default: getDefaultByORM("string") },
+    { name: "newsletterSignatur", ...getTypeByORM("varchar"), default: getDefaultByORM("string") },
+    { name: "isSent", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
+    { name: "recipientsByQueryId", ...getTypeByORM("int", true) },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -27,10 +27,10 @@ export const newsletter_table = new Table({
 export const newsletter_dates_table = new Table({
   name: "newsletter_dates",
   columns: [
-    { name: "newsletterId", type: getTypeByORM("int"), isPrimary: true },
-    { name: "calendarId", type: getTypeByORM("varchar"), length: "255", isPrimary: true },
-    { name: "diffTitle", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "diffDescription", type: getTypeByORM("text"), isNullable: true },
+    { name: "newsletterId", ...getTypeByORM("int"), isPrimary: true },
+    { name: "calendarId", ...getTypeByORM("uuid"), isPrimary: true },
+    { name: "diffTitle", ...getTypeByORM("varchar"), isNullable: true },
+    { name: "diffDescription", ...getTypeByORM("text", true) },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -53,8 +53,8 @@ export const newsletter_dates_table = new Table({
 export const newsletter_recipients_table = new Table({
   name: "newsletter_recipients",
   columns: [
-    { name: "newsletterId", type: getTypeByORM("int"), isPrimary: true },
-    { name: "memberId", type: getTypeByORM("varchar"), isPrimary: true },
+    { name: "newsletterId", ...getTypeByORM("int"), isPrimary: true },
+    { name: "memberId", ...getTypeByORM("uuid"), isPrimary: true },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -77,8 +77,8 @@ export const newsletter_recipients_table = new Table({
 export const newsletter_config_table = new Table({
   name: "newsletter_config",
   columns: [
-    { name: "comTypeId", type: getTypeByORM("int"), isPrimary: true, isNullable: false },
-    { name: "config", type: getTypeByORM("varchar"), length: "255", isNullable: false },
+    { name: "comTypeId", ...getTypeByORM("int"), isPrimary: true },
+    { name: "config", ...getTypeByORM("varchar") },
   ],
   foreignKeys: [
     new TableForeignKey({

src/migrations/baseSchemaTables/protocol.ts

@@ -1,25 +1,25 @@
 import { Table, TableForeignKey } from "typeorm";
-import { getTypeByORM } from "../ormHelper";
+import { getDefaultByORM, getTypeByORM, isIncrementPrimary } from "../ormHelper";
 
 export const protocol_table = new Table({
   name: "protocol",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "title", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "date", type: getTypeByORM("date"), isNullable: false },
-    { name: "starttime", type: getTypeByORM("time"), isNullable: true },
-    { name: "endtime", type: getTypeByORM("time"), isNullable: true },
-    { name: "summary", type: getTypeByORM("text"), isNullable: true },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "title", ...getTypeByORM("varchar") },
+    { name: "date", ...getTypeByORM("date") },
+    { name: "starttime", ...getTypeByORM("time", true) },
+    { name: "endtime", ...getTypeByORM("time", true) },
+    { name: "summary", ...getTypeByORM("text", true) },
   ],
 });
 
 export const protocol_agenda_table = new Table({
   name: "protocol_agenda",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "topic", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "context", type: getTypeByORM("text"), default: "''", isNullable: false },
-    { name: "protocolId", type: getTypeByORM("int"), isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "topic", ...getTypeByORM("varchar") },
+    { name: "context", ...getTypeByORM("text"), default: getDefaultByORM("string") },
+    { name: "protocolId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -35,10 +35,10 @@ export const protocol_agenda_table = new Table({
 export const protocol_decision_table = new Table({
   name: "protocol_decision",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "topic", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "context", type: getTypeByORM("text"), default: "''", isNullable: false },
-    { name: "protocolId", type: getTypeByORM("int"), isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "topic", ...getTypeByORM("varchar") },
+    { name: "context", ...getTypeByORM("text"), default: getDefaultByORM("string") },
+    { name: "protocolId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -54,10 +54,10 @@ export const protocol_decision_table = new Table({
 export const protocol_presence_table = new Table({
   name: "protocol_presence",
   columns: [
-    { name: "memberId", type: getTypeByORM("varchar"), isPrimary: true },
-    { name: "protocolId", type: getTypeByORM("int"), isPrimary: true },
-    { name: "absent", type: getTypeByORM("boolean"), default: false, isNullable: false },
-    { name: "excused", type: getTypeByORM("boolean"), default: false, isNullable: false },
+    { name: "memberId", ...getTypeByORM("uuid"), isPrimary: true },
+    { name: "protocolId", ...getTypeByORM("int"), isPrimary: true },
+    { name: "absent", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) },
+    { name: "excused", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", true) },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -80,13 +80,13 @@ export const protocol_presence_table = new Table({
 export const protocol_voting_table = new Table({
   name: "protocol_voting",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "topic", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "context", type: getTypeByORM("text"), default: "''", isNullable: false },
-    { name: "favour", type: getTypeByORM("int"), default: 0, isNullable: false },
-    { name: "abstain", type: getTypeByORM("int"), default: 0, isNullable: false },
-    { name: "against", type: getTypeByORM("int"), default: 0, isNullable: false },
-    { name: "protocolId", type: getTypeByORM("int"), isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "topic", ...getTypeByORM("varchar") },
+    { name: "context", ...getTypeByORM("text"), default: getDefaultByORM("string") },
+    { name: "favour", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) },
+    { name: "abstain", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) },
+    { name: "against", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) },
+    { name: "protocolId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -102,12 +102,12 @@ export const protocol_voting_table = new Table({
 export const protocol_printout_table = new Table({
   name: "protocol_printout",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "title", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "iteration", type: getTypeByORM("int"), default: 1, isNullable: false },
-    { name: "filename", type: getTypeByORM("varchar"), length: "255", isNullable: false },
-    { name: "createdAt", type: getTypeByORM("datetime"), isNullable: false, default: "CURRENT_TIMESTAMP(6)" },
-    { name: "protocolId", type: getTypeByORM("int"), isNullable: false },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "title", ...getTypeByORM("varchar") },
+    { name: "iteration", ...getTypeByORM("int"), default: getDefaultByORM("number", 1) },
+    { name: "filename", ...getTypeByORM("varchar") },
+    { name: "createdAt", ...getTypeByORM("datetime", false, 6), default: getDefaultByORM("currentTimestamp", 6) },
+    { name: "protocolId", ...getTypeByORM("int") },
   ],
   foreignKeys: [
     new TableForeignKey({

src/migrations/baseSchemaTables/query_template.ts

@@ -1,35 +1,35 @@
 import { Table, TableForeignKey } from "typeorm";
-import { getTypeByORM } from "../ormHelper";
+import { getDefaultByORM, getTypeByORM, isIncrementPrimary } from "../ormHelper";
 
 export const query_table = new Table({
   name: "query",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "title", type: getTypeByORM("varchar"), length: "255", isNullable: false, isUnique: true },
-    { name: "query", type: getTypeByORM("text"), isNullable: false, default: "''" },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "title", ...getTypeByORM("varchar"), isUnique: true },
+    { name: "query", ...getTypeByORM("text"), default: getDefaultByORM("string") },
   ],
 });
 
 export const template_table = new Table({
   name: "template",
   columns: [
-    { name: "id", type: getTypeByORM("int"), isPrimary: true, isGenerated: true, generationStrategy: "increment" },
-    { name: "template", type: getTypeByORM("varchar"), length: "255", isNullable: false, isUnique: true },
-    { name: "description", type: getTypeByORM("varchar"), length: "255", isNullable: true },
-    { name: "design", type: getTypeByORM("text"), isNullable: false, default: "'{}'" },
-    { name: "html", type: getTypeByORM("text"), isNullable: false, default: "''" },
+    { name: "id", ...getTypeByORM("int"), ...isIncrementPrimary },
+    { name: "template", ...getTypeByORM("varchar"), isUnique: true },
+    { name: "description", ...getTypeByORM("varchar", true) },
+    { name: "design", ...getTypeByORM("text"), default: getDefaultByORM("string", "{}") },
+    { name: "html", ...getTypeByORM("text"), default: getDefaultByORM("string") },
   ],
 });
 
 export const template_usage_table = new Table({
   name: "template_usage",
   columns: [
-    { name: "scope", type: getTypeByORM("varchar"), length: "255", isPrimary: true },
-    { name: "headerId", type: getTypeByORM("int"), isNullable: true },
-    { name: "bodyId", type: getTypeByORM("int"), isNullable: true },
-    { name: "footerId", type: getTypeByORM("int"), isNullable: true },
-    { name: "headerHeight", type: getTypeByORM("int"), default: null, isNullable: true },
-    { name: "footerHeight", type: getTypeByORM("int"), default: null, isNullable: true },
+    { name: "scope", ...getTypeByORM("varchar"), isPrimary: true },
+    { name: "headerId", ...getTypeByORM("int", true), default: getDefaultByORM("null") },
+    { name: "bodyId", ...getTypeByORM("int", true), default: getDefaultByORM("null") },
+    { name: "footerId", ...getTypeByORM("int", true), default: getDefaultByORM("null") },
+    { name: "headerHeight", ...getTypeByORM("int", true), default: getDefaultByORM("null") },
+    { name: "footerHeight", ...getTypeByORM("int", true), default: getDefaultByORM("null") },
   ],
   foreignKeys: [
     new TableForeignKey({

src/migrations/ormHelper.ts

@@ -1,6 +1,18 @@
-export type ORMType = "int" | "bigint" | "boolean" | "date" | "datetime" | "time" | "text" | "varchar";
+export type ORMType = "int" | "bigint" | "boolean" | "date" | "datetime" | "time" | "text" | "varchar" | "uuid";
+export type ORMDefault = "currentTimestamp" | "string" | "boolean" | "number" | "null";
+export type ColumnConfig = {
+  type: string;
+  length?: string;
+  precision?: number;
+  isNullable: boolean;
+};
+export type Primary = {
+  isPrimary: boolean;
+  isGenerated: boolean;
+  generationStrategy: "increment" | "uuid" | "rowid" | "identity";
+};
 
-export function getTypeByORM(type: ORMType): string {
+export function getTypeByORM(type: ORMType, nullable: boolean = false, length: number = 255): ColumnConfig {
   const dbType = process.env.DB_TYPE;
 
   const typeMap: Record<string, Record<ORMType, string>> = {
@@ -13,6 +25,7 @@ export function getTypeByORM(type: ORMType): string {
       time: "time",
       text: "text",
       varchar: "varchar",
+      uuid: "varchar",
     },
     postgres: {
       int: "integer",
@@ -22,19 +35,71 @@ export function getTypeByORM(type: ORMType): string {
       datetime: "timestamp",
       time: "time",
       text: "text",
-      varchar: "varchar",
+      varchar: "character varying",
+      uuid: "uuid",
     },
     sqlite: {
       int: "integer",
       bigint: "integer",
       boolean: "integer",
-      date: "text",
-      datetime: "text",
+      date: "date",
+      datetime: "datetime",
       time: "text",
       text: "text",
-      varchar: "text",
+      varchar: "varchar",
+      uuid: "varchar",
     },
   };
 
-  return typeMap[dbType]?.[type] || type;
+  let obj: ColumnConfig = {
+    type: typeMap[dbType]?.[type] || type,
+    isNullable: nullable,
+  };
+  if (type == "datetime") obj.precision = length;
+  else if (dbType != "sqlite" && (obj.type == "varchar" || type == "varchar")) obj.length = `${length}`;
+  else if (dbType != "postgres" && type == "uuid") obj.length = "36";
+
+  return obj;
 }
+
+export function getDefaultByORM<T = string | null>(type: ORMDefault, data?: string | number | boolean): T {
+  const dbType = process.env.DB_TYPE;
+
+  const typeMap: Record<string, Record<ORMDefault, string | null>> = {
+    mysql: {
+      currentTimestamp: `CURRENT_TIMESTAMP(${data ?? 6})`,
+      string: `'${data ?? ""}'`,
+      boolean: Boolean(data).toString(),
+      number: Number(data).toString(),
+      null: null,
+    },
+    postgres: {
+      currentTimestamp: `now()`,
+      string: `'${data ?? ""}'`,
+      boolean: Boolean(data) == true ? "true" : "false",
+      number: Number(data).toString(),
+      null: null,
+    },
+    sqlite: {
+      currentTimestamp: `datetime('now')`,
+      string: `'${data ?? ""}'`,
+      boolean: Boolean(data) == true ? "1" : "0",
+      number: Number(data).toString(),
+      null: null,
+    },
+  };
+
+  return (typeMap[dbType]?.[type] || type) as T;
+}
+
+export const isIncrementPrimary: Primary = {
+  isPrimary: true,
+  isGenerated: true,
+  generationStrategy: "increment",
+};
+
+export const isUUIDPrimary: Primary = {
+  isPrimary: true,
+  isGenerated: true,
+  generationStrategy: "uuid",
+};

src/views/memberExecutivePositionView.ts

@@ -1,5 +1,6 @@
 import { DataSource, ViewColumn, ViewEntity } from "typeorm";
 import { memberExecutivePositions } from "../entity/club/member/memberExecutivePositions";
+import { DB_TYPE } from "../env.defaults";
 
 @ViewEntity({
   expression: (datasource: DataSource) =>
@@ -15,19 +16,31 @@ import { memberExecutivePositions } from "../entity/club/member/memberExecutiveP
       .addSelect("member.birthdate", "memberBirthdate")
       .addSelect("salutation.salutation", "memberSalutation")
       .addSelect(
-        "SUM(TIMESTAMPDIFF(DAY, memberExecutivePositions.start, COALESCE(memberExecutivePositions.end, CURRENT_DATE)))",
+        DB_TYPE == "postgres"
+          ? `SUM(COALESCE("memberExecutivePositions"."end", CURRENT_DATE) - "memberExecutivePositions"."start")`
+          : "SUM(TIMESTAMPDIFF(DAY, memberExecutivePositions.start, COALESCE(memberExecutivePositions.end, CURRENT_DATE)))",
         "durationInDays"
       )
+      .addSelect(
+        DB_TYPE == "postgres"
+          ? `SUM(AGE(COALESCE("memberExecutivePositions"."end", CURRENT_DATE), "memberExecutivePositions"."start"))`
+          : "CONCAT('_', FROM_DAYS(SUM(TIMESTAMPDIFF(DAY, memberExecutivePositions.start, COALESCE(memberExecutivePositions.end, CURRENT_DATE)))))",
+        "durationInYears"
+      )
       .leftJoin("memberExecutivePositions.executivePosition", "executivePosition")
       .leftJoin("memberExecutivePositions.member", "member")
       .leftJoin("member.salutation", "salutation")
       .groupBy("executivePosition.id")
-      .addGroupBy("member.id"),
+      .addGroupBy("member.id")
+      .addGroupBy("salutation.id"),
 })
 export class memberExecutivePositionsView {
   @ViewColumn()
   durationInDays: number;
 
+  @ViewColumn()
+  durationInYears: string;
+
   @ViewColumn()
   position: string;
 

src/views/memberQualificationsView.ts

@@ -1,5 +1,6 @@
 import { DataSource, ViewColumn, ViewEntity } from "typeorm";
 import { memberQualifications } from "../entity/club/member/memberQualifications";
+import { DB_TYPE } from "../env.defaults";
 
 @ViewEntity({
   expression: (datasource: DataSource) =>
@@ -15,19 +16,31 @@ import { memberQualifications } from "../entity/club/member/memberQualifications
       .addSelect("member.birthdate", "memberBirthdate")
       .addSelect("salutation.salutation", "memberSalutation")
       .addSelect(
-        "SUM(TIMESTAMPDIFF(DAY, memberQualifications.start, COALESCE(memberQualifications.end, CURRENT_DATE)))",
+        DB_TYPE == "postgres"
+          ? `SUM(COALESCE("memberQualifications"."end", CURRENT_DATE) - "memberQualifications"."start")`
+          : "SUM(TIMESTAMPDIFF(DAY, memberQualifications.start, COALESCE(memberQualifications.end, CURRENT_DATE)))",
         "durationInDays"
       )
+      .addSelect(
+        DB_TYPE == "postgres"
+          ? `SUM(AGE(COALESCE("memberQualifications"."end", CURRENT_DATE), "memberQualifications"."start"))`
+          : "CONCAT('_', FROM_DAYS(SUM(TIMESTAMPDIFF(DAY, memberQualifications.start, COALESCE(memberQualifications.end, CURRENT_DATE)))))",
+        "durationInYears"
+      )
       .leftJoin("memberQualifications.qualification", "qualification")
       .leftJoin("memberQualifications.member", "member")
       .leftJoin("member.salutation", "salutation")
       .groupBy("qualification.id")
-      .addGroupBy("member.id"),
+      .addGroupBy("member.id")
+      .addGroupBy("salutation.id"),
 })
 export class memberQualificationsView {
   @ViewColumn()
   durationInDays: number;
 
+  @ViewColumn()
+  durationInYears: string;
+
   @ViewColumn()
   qualification: string;
 

src/views/memberView.ts

@@ -1,5 +1,6 @@
 import { DataSource, ViewColumn, ViewEntity } from "typeorm";
 import { member } from "../entity/club/member/member";
+import { DB_TYPE } from "../env.defaults";
 
 @ViewEntity({
   expression: (datasource: DataSource) =>
@@ -12,9 +13,24 @@ import { member } from "../entity/club/member/member";
       .addSelect("member.nameaffix", "nameaffix")
       .addSelect("member.birthdate", "birthdate")
       .addSelect("salutation.salutation", "salutation")
-      .addSelect("TIMESTAMPDIFF(YEAR, member.birthdate, CURDATE())", "todayAge")
-      .addSelect("YEAR(CURDATE()) - YEAR(member.birthdate)", "ageThisYear")
-      .addSelect("CONCAT('_', FROM_DAYS(TIMESTAMPDIFF(DAY, member.birthdate, CURDATE())))", "exactAge")
+      .addSelect(
+        DB_TYPE == "postgres"
+          ? `DATE_PART('year', AGE(CURRENT_DATE, member.birthdate))`
+          : "TIMESTAMPDIFF(YEAR, member.birthdate, CURDATE())",
+        "todayAge"
+      )
+      .addSelect(
+        DB_TYPE == "postgres"
+          ? `EXTRACT(YEAR FROM CURRENT_DATE) - EXTRACT(YEAR FROM member.birthdate)`
+          : "YEAR(CURDATE()) - YEAR(member.birthdate)",
+        "ageThisYear"
+      )
+      .addSelect(
+        DB_TYPE == "postgres"
+          ? `AGE(CURRENT_DATE, member.birthdate)`
+          : "CONCAT('_', FROM_DAYS(TIMESTAMPDIFF(DAY, member.birthdate, CURDATE())))",
+        "exactAge"
+      )
       .leftJoin("member.salutation", "salutation"),
 })
 export class memberView {

src/views/membershipsView.ts

@@ -1,5 +1,6 @@
 import { DataSource, ViewColumn, ViewEntity } from "typeorm";
 import { membership } from "../entity/club/member/membership";
+import { DB_TYPE } from "../env.defaults";
 
 @ViewEntity({
   expression: (datasource: DataSource) =>
@@ -14,16 +15,24 @@ import { membership } from "../entity/club/member/membership";
       .addSelect("member.nameaffix", "memberNameaffix")
       .addSelect("member.birthdate", "memberBirthdate")
       .addSelect("salutation.salutation", "memberSalutation")
-      .addSelect("SUM(TIMESTAMPDIFF(DAY, membership.start, COALESCE(membership.end, CURRENT_DATE)))", "durationInDays")
       .addSelect(
-        "CONCAT('_', FROM_DAYS(SUM(TIMESTAMPDIFF(DAY, membership.start, COALESCE(membership.end, CURRENT_DATE)))))",
+        DB_TYPE == "postgres"
+          ? `SUM(COALESCE("membership"."end", CURRENT_DATE) - "membership"."start") `
+          : "SUM(TIMESTAMPDIFF(DAY, membership.start, COALESCE(membership.end, CURRENT_DATE)))",
+        "durationInDays"
+      )
+      .addSelect(
+        DB_TYPE == "postgres"
+          ? `SUM(AGE(COALESCE("membership"."end", CURRENT_DATE), "membership"."start"))`
+          : "CONCAT('_', FROM_DAYS(SUM(TIMESTAMPDIFF(DAY, membership.start, COALESCE(membership.end, CURRENT_DATE)))))",
         "durationInYears"
       )
       .leftJoin("membership.status", "status")
       .leftJoin("membership.member", "member")
       .leftJoin("member.salutation", "salutation")
       .groupBy("status.id")
-      .addGroupBy("member.id"),
+      .addGroupBy("member.id")
+      .addGroupBy("salutation.id"),
 })
 export class membershipView {
   @ViewColumn()