Adjust for postgresql

src/database/migration/migrations/20200525-add-new-limit-options.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2021 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -58,12 +58,24 @@ export async function up (queryInterface: QueryInterface, sequelize: Sequelize)
       ...usedTimeAttributesVersion3
     }, { transaction })
 
+    const dialect = sequelize.getDialect()
+    const isMysql = dialect === 'mysql' || dialect === 'mariadb'
+
+    if (isMysql) {
       await sequelize.query(`
         INSERT INTO UsedTimes (familyId, categoryId, dayOfEpoch, usedTime, lastUpdate, startMinuteOfDay, endMinuteOfDay)
           SELECT familyId, categoryId, dayOfEpoch, usedTime, lastUpdate,
           ${MinuteOfDay.MIN} AS startMinuteOfDay, ${MinuteOfDay.MAX} AS endMinuteOfDay
           FROM UsedTimesOld
       `, { transaction })
+    } else {
+      await sequelize.query(`
+        INSERT INTO "UsedTimes" ("familyId", "categoryId", "dayOfEpoch", "usedTime", "lastUpdate", "startMinuteOfDay", "endMinuteOfDay")
+          SELECT "familyId", "categoryId", "dayOfEpoch", "usedTime", "lastUpdate",
+          ${MinuteOfDay.MIN} AS "startMinuteOfDay", ${MinuteOfDay.MAX} AS "endMinuteOfDay"
+          FROM "UsedTimesOld"
+      `, { transaction })
+    }
 
     await queryInterface.dropTable('UsedTimesOld', { transaction })
   })

src/database/migration/migrations/20200601-fix-purchase-table.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2021 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -25,11 +25,22 @@ export async function up (queryInterface: QueryInterface, sequelize: Sequelize)
     await queryInterface.renameTable('Purchases', 'PurchasesOld', { transaction })
     await queryInterface.createTable('Purchases', purchaseAttributes, { transaction })
 
+    const dialect = sequelize.getDialect()
+    const isMysql = dialect === 'mysql' || dialect === 'mariadb'
+
+    if (isMysql) {
       await sequelize.query(`
         INSERT INTO Purchases (familyId, service, transactionId, type, loggedAt, previousFullVersionEndTime, newFullVersionEndTime)
           SELECT familyId, service, transactionId, type, 0 AS loggedAt, 0 AS previousFullVersionEndTime, loggedAt AS newFullVersionEndTime
           FROM PurchasesOld
       `, { transaction })
+    } else {
+      await sequelize.query(`
+        INSERT INTO "Purchases" ("familyId", service, "transactionId", type, "loggedAt", "previousFullVersionEndTime", "newFullVersionEndTime")
+          SELECT "familyId", service, "transactionId", type, 0 AS "loggedAt", 0 AS "previousFullVersionEndTime", "loggedAt" AS "newFullVersionEndTime"
+          FROM "PurchasesOld"
+      `, { transaction })
+    }
 
     await queryInterface.dropTable('PurchasesOld', { transaction })
   })

src/database/migration/migrations/20200706-create-user-limit-login-category-table.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2021 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,6 +21,10 @@ export async function up (queryInterface: QueryInterface, sequelize: Sequelize)
   await sequelize.transaction({
     type: Transaction.TYPES.EXCLUSIVE
   }, async (transaction) => {
+    const dialect = sequelize.getDialect()
+    const isMysql = dialect === 'mysql' || dialect === 'mariadb'
+
+    if (isMysql) {
       await sequelize.query(
         'CREATE TABLE `UserLimitLoginCategories`' +
         '(`familyId` VARCHAR(10) NOT NULL, `userId` VARCHAR(6) NOT NULL, `categoryId` VARCHAR(6) NOT NULL,' +
@@ -29,6 +33,16 @@ export async function up (queryInterface: QueryInterface, sequelize: Sequelize)
       )
 
       await sequelize.query('CREATE INDEX `UserLimitLoginCategoriesIndexCategoryId` ON `UserLimitLoginCategories` (`familyId`, `categoryId`)', { transaction })
+    } else {
+      await sequelize.query(
+        'CREATE TABLE "UserLimitLoginCategories"' +
+        '("familyId" VARCHAR(10) NOT NULL, "userId" VARCHAR(6) NOT NULL, "categoryId" VARCHAR(6) NOT NULL,' +
+        'PRIMARY KEY("familyId", "userId"), FOREIGN KEY("familyId", "userId") REFERENCES "Users" ("familyId", "userId") ON UPDATE CASCADE ON DELETE CASCADE , FOREIGN KEY("familyId", "categoryId") REFERENCES "Categories" ("familyId", "categoryId") ON UPDATE CASCADE ON DELETE CASCADE )',
+        { transaction }
+      )
+
+      await sequelize.query('CREATE INDEX "UserLimitLoginCategoriesIndexCategoryId" ON "UserLimitLoginCategories" ("familyId", "categoryId")', { transaction })
+    }
   })
 }
 

src/database/migration/migrations/20200824-create-category-network-id-table.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2021 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,6 +21,10 @@ export async function up (_: QueryInterface, sequelize: Sequelize) {
   await sequelize.transaction({
     type: Transaction.TYPES.EXCLUSIVE
   }, async (transaction) => {
+    const dialect = sequelize.getDialect()
+    const isMysql = dialect === 'mysql' || dialect === 'mariadb'
+
+    if (isMysql) {
       await sequelize.query(
         'CREATE TABLE `CategoryNetworkIds` ' +
         '(`familyId` VARCHAR(10) NOT NULL, `categoryId` VARCHAR(6) NOT NULL,' +
@@ -29,6 +33,16 @@ export async function up (_: QueryInterface, sequelize: Sequelize) {
         'REFERENCES `Categories`(`familyId`, `categoryId`) ON UPDATE CASCADE ON DELETE CASCADE )',
         { transaction }
       )
+    } else {
+      await sequelize.query(
+        'CREATE TABLE "CategoryNetworkIds" ' +
+        '("familyId" VARCHAR(10) NOT NULL, "categoryId" VARCHAR(6) NOT NULL,' +
+        '"networkItemId" VARCHAR(6) NOT NULL, "hashedNetworkId" VARCHAR(8) NOT NULL,' +
+        'PRIMARY KEY("familyId", "categoryId", "networkItemId"), FOREIGN KEY("familyId", "categoryId")' +
+        'REFERENCES "Categories"("familyId", "categoryId") ON UPDATE CASCADE ON DELETE CASCADE )',
+        { transaction }
+      )
+    }
   })
 }
 

src/database/migration/migrations/20201116-add-child-tasks.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2021 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -22,6 +22,10 @@ export async function up (queryInterface: QueryInterface, sequelize: Sequelize)
   await sequelize.transaction({
     type: Transaction.TYPES.EXCLUSIVE
   }, async (transaction) => {
+    const dialect = sequelize.getDialect()
+    const isMysql = dialect === 'mysql' || dialect === 'mariadb'
+
+    if (isMysql) {
       await sequelize.query(
         'CREATE TABLE `ChildTasks` (' +
         '`familyId` VARCHAR(10) NOT NULL, `taskId` VARCHAR(6) NOT NULL,' +
@@ -34,6 +38,20 @@ export async function up (queryInterface: QueryInterface, sequelize: Sequelize)
         ')',
         { transaction }
       )
+    } else {
+      await sequelize.query(
+        'CREATE TABLE "ChildTasks" (' +
+        '"familyId" VARCHAR(10) NOT NULL, "taskId" VARCHAR(6) NOT NULL,' +
+        '"categoryId" VARCHAR(6) NOT NULL, "taskTitle" VARCHAR(50) NOT NULL,' +
+        '"extraTimeDuration" INTEGER NOT NULL, "pendingRequest" INTEGER NOT NULL,' +
+        '"lastGrantTimestamp" BIGINT NOT NULL,' +
+        'PRIMARY KEY("familyId", "taskId"),' +
+        'FOREIGN KEY("familyId", "categoryId") REFERENCES "Categories"("familyId", "categoryId") ' +
+        'ON UPDATE CASCADE ON DELETE CASCADE' +
+        ')',
+        { transaction }
+      )
+    }
 
     await queryInterface.addColumn('Categories', 'taskListVersion', {
       ...categoryAttributes.taskListVersion

src/database/timelimitrule.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2021 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -61,7 +61,7 @@ export const attributesVersion1: SequelizeAttributes<TimelimitRuleAttributesVers
   categoryId: { ...idWithinFamilyColumn },
   applyToExtraTimeUsage: { ...booleanColumn },
   dayMaskAsBitmask: {
-    type: Sequelize.TINYINT,
+    type: Sequelize.SMALLINT,
     allowNull: false,
     validate: {
       min: 0,