From 1bc145f60c3f8432a9717e6ca33a68ed85502bb1 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Mon, 31 Oct 2022 17:21:28 +1300 Subject: [PATCH] Allow failure of migrations Since we are swapping from the old system to this system sometimes the columns will be already existing. These errors failing are OK since we haven't changed any column types before. --- migrations/1667185586014-sets.ts | 6 +++--- migrations/1667186124792-plans.ts | 6 +++--- migrations/1667186130041-settings.ts | 6 +++--- migrations/1667186139844-add-sound.ts | 8 +++++--- migrations/1667186159379-add-hidden.ts | 10 +++++----- migrations/1667186166140-add-notify.ts | 10 +++++----- migrations/1667186171548-add-image.ts | 8 +++++--- migrations/1667186179488-add-images.ts | 10 +++++----- migrations/1667186203827-insert-settings.ts | 6 +++--- migrations/1667186211251-add-steps.ts | 10 +++++----- migrations/1667186250618-add-sets.ts | 10 +++++----- migrations/1667186255650-add-minutes.ts | 10 +++++----- migrations/1667186259174-add-seconds.ts | 10 +++++----- migrations/1667186265588-add-show-unit.ts | 10 +++++----- migrations/1667186320954-add-color.ts | 10 +++++----- migrations/1667186348425-add-steps.ts | 10 +++++----- migrations/1667186431804-add-date.ts | 10 +++++----- migrations/1667186435051-add-show-date.ts | 10 +++++----- migrations/1667186439366-add-theme.ts | 10 +++++----- migrations/1667186443614-add-show-sets.ts | 10 +++++----- migrations/1667186451005-add-sets-created.ts | 10 +++++----- migrations/1667186456118-add-no-sound.ts | 10 +++++----- 22 files changed, 102 insertions(+), 98 deletions(-) diff --git a/migrations/1667185586014-sets.ts b/migrations/1667185586014-sets.ts index c99d92e..cf6b765 100644 --- a/migrations/1667185586014-sets.ts +++ b/migrations/1667185586014-sets.ts @@ -1,4 +1,4 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class Sets1667185586014 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { @@ -11,10 +11,10 @@ export class Sets1667185586014 implements MigrationInterface { created TEXT NOT NULL, unit TEXT DEFAULT 'kg' ) - `); + `) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DROP TABLE sets`); + await queryRunner.query(`DROP TABLE sets`) } } diff --git a/migrations/1667186124792-plans.ts b/migrations/1667186124792-plans.ts index 4bc7315..81fa4cc 100644 --- a/migrations/1667186124792-plans.ts +++ b/migrations/1667186124792-plans.ts @@ -1,4 +1,4 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class plans1667186124792 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { @@ -8,10 +8,10 @@ export class plans1667186124792 implements MigrationInterface { days TEXT NOT NULL, workouts TEXT NOT NULL ) -`); +`) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropTable('plans'); + await queryRunner.dropTable('plans') } } diff --git a/migrations/1667186130041-settings.ts b/migrations/1667186130041-settings.ts index 6919f5a..0c25756 100644 --- a/migrations/1667186130041-settings.ts +++ b/migrations/1667186130041-settings.ts @@ -1,4 +1,4 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class settings1667186130041 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { @@ -10,10 +10,10 @@ export class settings1667186130041 implements MigrationInterface { vibrate BOOLEAN NOT NULL DEFAULT 1, sets INTEGER NOT NULL DEFAULT 3 ) - `); + `) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropTable('settings'); + await queryRunner.dropTable('settings') } } diff --git a/migrations/1667186139844-add-sound.ts b/migrations/1667186139844-add-sound.ts index 05d2e01..551d530 100644 --- a/migrations/1667186139844-add-sound.ts +++ b/migrations/1667186139844-add-sound.ts @@ -1,11 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addSound1667186139844 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE settings ADD COLUMN sound TEXT NULL`); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN sound TEXT NULL`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'sound'); + await queryRunner.dropColumn('settings', 'sound') } } diff --git a/migrations/1667186159379-add-hidden.ts b/migrations/1667186159379-add-hidden.ts index bffc426..9955f80 100644 --- a/migrations/1667186159379-add-hidden.ts +++ b/migrations/1667186159379-add-hidden.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addHidden1667186159379 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE sets ADD COLUMN hidden DEFAULT false - `); + await queryRunner + .query(`ALTER TABLE sets ADD COLUMN hidden DEFAULT false`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('sets', 'hidden'); + await queryRunner.dropColumn('sets', 'hidden') } } diff --git a/migrations/1667186166140-add-notify.ts b/migrations/1667186166140-add-notify.ts index ee7f860..a315f41 100644 --- a/migrations/1667186166140-add-notify.ts +++ b/migrations/1667186166140-add-notify.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addNotify1667186166140 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN notify DEFAULT false - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN notify DEFAULT false`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'notify'); + await queryRunner.dropColumn('settings', 'notify') } } diff --git a/migrations/1667186171548-add-image.ts b/migrations/1667186171548-add-image.ts index 9562fb7..29965ce 100644 --- a/migrations/1667186171548-add-image.ts +++ b/migrations/1667186171548-add-image.ts @@ -1,11 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addImage1667186171548 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query('ALTER TABLE sets ADD COLUMN image TEXT NULL'); + await queryRunner + .query('ALTER TABLE sets ADD COLUMN image TEXT NULL') + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('sets', 'image'); + await queryRunner.dropColumn('sets', 'image') } } diff --git a/migrations/1667186179488-add-images.ts b/migrations/1667186179488-add-images.ts index 33830ac..fd0d911 100644 --- a/migrations/1667186179488-add-images.ts +++ b/migrations/1667186179488-add-images.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addImages1667186179488 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN images BOOLEAN DEFAULT true - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN images BOOLEAN DEFAULT true`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'images'); + await queryRunner.dropColumn('settings', 'images') } } diff --git a/migrations/1667186203827-insert-settings.ts b/migrations/1667186203827-insert-settings.ts index 5b0b858..b303228 100644 --- a/migrations/1667186203827-insert-settings.ts +++ b/migrations/1667186203827-insert-settings.ts @@ -1,11 +1,11 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class insertSettings1667186203827 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query('INSERT INTO settings(minutes) VALUES(3)'); + await queryRunner.query('INSERT INTO settings(minutes) VALUES(3)') } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query('DELETE FROM settings'); + await queryRunner.query('DELETE FROM settings') } } diff --git a/migrations/1667186211251-add-steps.ts b/migrations/1667186211251-add-steps.ts index d3a00d3..17c8305 100644 --- a/migrations/1667186211251-add-steps.ts +++ b/migrations/1667186211251-add-steps.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addSteps1667186211251 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN steps BOOLEAN DEFAULT true - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN steps BOOLEAN DEFAULT true`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'steps'); + await queryRunner.dropColumn('settings', 'steps') } } diff --git a/migrations/1667186250618-add-sets.ts b/migrations/1667186250618-add-sets.ts index 2a973c2..84f037c 100644 --- a/migrations/1667186250618-add-sets.ts +++ b/migrations/1667186250618-add-sets.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addSets1667186250618 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE sets ADD COLUMN sets INTEGER NOT NULL DEFAULT 3 - `); + await queryRunner + .query(`ALTER TABLE sets ADD COLUMN sets INTEGER NOT NULL DEFAULT 3`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('sets', 'sets'); + await queryRunner.dropColumn('sets', 'sets') } } diff --git a/migrations/1667186255650-add-minutes.ts b/migrations/1667186255650-add-minutes.ts index ba6ada2..502aeb1 100644 --- a/migrations/1667186255650-add-minutes.ts +++ b/migrations/1667186255650-add-minutes.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addMinutes1667186255650 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE sets ADD COLUMN minutes INTEGER NOT NULL DEFAULT 3 - `); + await queryRunner + .query(`ALTER TABLE sets ADD COLUMN minutes INTEGER NOT NULL DEFAULT 3`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('sets', 'minutes'); + await queryRunner.dropColumn('sets', 'minutes') } } diff --git a/migrations/1667186259174-add-seconds.ts b/migrations/1667186259174-add-seconds.ts index 9470d17..0fedc42 100644 --- a/migrations/1667186259174-add-seconds.ts +++ b/migrations/1667186259174-add-seconds.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addSeconds1667186259174 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE sets ADD COLUMN seconds INTEGER NOT NULL DEFAULT 30 - `); + await queryRunner + .query(`ALTER TABLE sets ADD COLUMN seconds INTEGER NOT NULL DEFAULT 30`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('sets', 'seconds'); + await queryRunner.dropColumn('sets', 'seconds') } } diff --git a/migrations/1667186265588-add-show-unit.ts b/migrations/1667186265588-add-show-unit.ts index 665df9c..2bded47 100644 --- a/migrations/1667186265588-add-show-unit.ts +++ b/migrations/1667186265588-add-show-unit.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addShowUnit1667186265588 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN showUnit BOOLEAN DEFAULT true - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN showUnit BOOLEAN DEFAULT true`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'showUnit'); + await queryRunner.dropColumn('settings', 'showUnit') } } diff --git a/migrations/1667186320954-add-color.ts b/migrations/1667186320954-add-color.ts index d973647..373ebab 100644 --- a/migrations/1667186320954-add-color.ts +++ b/migrations/1667186320954-add-color.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addColor1667186320954 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN color TEXT NULL - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN color TEXT NULL`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'color'); + await queryRunner.dropColumn('settings', 'color') } } diff --git a/migrations/1667186348425-add-steps.ts b/migrations/1667186348425-add-steps.ts index 8c7c78d..d51f6f6 100644 --- a/migrations/1667186348425-add-steps.ts +++ b/migrations/1667186348425-add-steps.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addSteps1667186348425 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE sets ADD COLUMN steps TEXT NULL - `); + await queryRunner + .query(`ALTER TABLE sets ADD COLUMN steps TEXT NULL`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('sets', 'steps'); + await queryRunner.dropColumn('sets', 'steps') } } diff --git a/migrations/1667186431804-add-date.ts b/migrations/1667186431804-add-date.ts index c3ba740..f7b95b5 100644 --- a/migrations/1667186431804-add-date.ts +++ b/migrations/1667186431804-add-date.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addDate1667186431804 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN date TEXT NULL - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN date TEXT NULL`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'date'); + await queryRunner.dropColumn('settings', 'date') } } diff --git a/migrations/1667186435051-add-show-date.ts b/migrations/1667186435051-add-show-date.ts index c3d0a2e..8b1bf2a 100644 --- a/migrations/1667186435051-add-show-date.ts +++ b/migrations/1667186435051-add-show-date.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addShowDate1667186435051 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN showDate BOOLEAN DEFAULT false - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN showDate BOOLEAN DEFAULT false`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'showDate'); + await queryRunner.dropColumn('settings', 'showDate') } } diff --git a/migrations/1667186439366-add-theme.ts b/migrations/1667186439366-add-theme.ts index 3141e48..5be7385 100644 --- a/migrations/1667186439366-add-theme.ts +++ b/migrations/1667186439366-add-theme.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addTheme1667186439366 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN theme TEXT - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN theme TEXT`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'theme'); + await queryRunner.dropColumn('settings', 'theme') } } diff --git a/migrations/1667186443614-add-show-sets.ts b/migrations/1667186443614-add-show-sets.ts index 770af2f..3c7f324 100644 --- a/migrations/1667186443614-add-show-sets.ts +++ b/migrations/1667186443614-add-show-sets.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addShowSets1667186443614 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN showSets BOOLEAN DEFAULT true - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN showSets BOOLEAN DEFAULT true`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'showSets'); + await queryRunner.dropColumn('settings', 'showSets') } } diff --git a/migrations/1667186451005-add-sets-created.ts b/migrations/1667186451005-add-sets-created.ts index a5d59d5..d9cdb9d 100644 --- a/migrations/1667186451005-add-sets-created.ts +++ b/migrations/1667186451005-add-sets-created.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addSetsCreated1667186451005 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - CREATE INDEX sets_created ON sets(created) - `); + await queryRunner + .query(`CREATE INDEX sets_created ON sets(created)`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropIndex('sets', 'sets_created'); + await queryRunner.dropIndex('sets', 'sets_created') } } diff --git a/migrations/1667186456118-add-no-sound.ts b/migrations/1667186456118-add-no-sound.ts index 185c7d4..88593cd 100644 --- a/migrations/1667186456118-add-no-sound.ts +++ b/migrations/1667186456118-add-no-sound.ts @@ -1,13 +1,13 @@ -import {MigrationInterface, QueryRunner} from 'typeorm'; +import {MigrationInterface, QueryRunner} from 'typeorm' export class addNoSound1667186456118 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE settings ADD COLUMN noSound BOOLEAN DEFAULT false - `); + await queryRunner + .query(`ALTER TABLE settings ADD COLUMN noSound BOOLEAN DEFAULT false`) + .catch(() => null) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('settings', 'noSound'); + await queryRunner.dropColumn('settings', 'noSound') } }