From 3dce03180fbc7178c27566edf4b7521aec97e938 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Thu, 29 Feb 2024 15:35:54 -0500 Subject: [PATCH 1/5] patch super user migration --- backend/src/db/migrations/20240226094411_instance-id.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/src/db/migrations/20240226094411_instance-id.ts b/backend/src/db/migrations/20240226094411_instance-id.ts index ae88bb3fd..0b87ffe57 100644 --- a/backend/src/db/migrations/20240226094411_instance-id.ts +++ b/backend/src/db/migrations/20240226094411_instance-id.ts @@ -11,7 +11,11 @@ export async function up(knex: Knex): Promise { // this is updated to avoid race condition on replication // eslint-disable-next-line // @ts-ignore - await knex(TableName.SuperAdmin).update({ id: ADMIN_CONFIG_UUID }).whereNotNull("id").limit(1); + await knex(TableName.SuperAdmin) + .update({ id: ADMIN_CONFIG_UUID }) + .whereNotNull("id") + .andWhere("id", "<>", ADMIN_CONFIG_UUID) + .limit(1); } export async function down(knex: Knex): Promise { From 155e3153471474327df876583acefbb0a7fe4121 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Thu, 29 Feb 2024 16:00:28 -0500 Subject: [PATCH 2/5] skip verify --- backend/src/db/migrations/20240226094411_instance-id.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/db/migrations/20240226094411_instance-id.ts b/backend/src/db/migrations/20240226094411_instance-id.ts index 0b87ffe57..5b0b377af 100644 --- a/backend/src/db/migrations/20240226094411_instance-id.ts +++ b/backend/src/db/migrations/20240226094411_instance-id.ts @@ -8,11 +8,11 @@ export async function up(knex: Knex): Promise { await knex.schema.alterTable(TableName.SuperAdmin, (t) => { t.uuid("instanceId").notNullable().defaultTo(knex.fn.uuid()); }); + // this is updated to avoid race condition on replication // eslint-disable-next-line // @ts-ignore - await knex(TableName.SuperAdmin) - .update({ id: ADMIN_CONFIG_UUID }) + await knex(TableName.SuperAdmin).update({ id: ADMIN_CONFIG_UUID }) .whereNotNull("id") .andWhere("id", "<>", ADMIN_CONFIG_UUID) .limit(1); From 1fcac4cadf51c492023494e42597479b5b98cea8 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Thu, 29 Feb 2024 16:15:52 -0500 Subject: [PATCH 3/5] ignore multi line eslint --- backend/src/db/migrations/20240226094411_instance-id.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/db/migrations/20240226094411_instance-id.ts b/backend/src/db/migrations/20240226094411_instance-id.ts index 5b0b377af..cf5fbeef7 100644 --- a/backend/src/db/migrations/20240226094411_instance-id.ts +++ b/backend/src/db/migrations/20240226094411_instance-id.ts @@ -10,12 +10,13 @@ export async function up(knex: Knex): Promise { }); // this is updated to avoid race condition on replication - // eslint-disable-next-line - // @ts-ignore - await knex(TableName.SuperAdmin).update({ id: ADMIN_CONFIG_UUID }) + /* eslint-disable */ + await knex(TableName.SuperAdmin) + .update({ id: ADMIN_CONFIG_UUID }) .whereNotNull("id") .andWhere("id", "<>", ADMIN_CONFIG_UUID) .limit(1); + /* eslint-enable */ } export async function down(knex: Knex): Promise { From 0b924b6e45a1ff65b45e699ea436123baedcef38 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Thu, 29 Feb 2024 16:28:36 -0500 Subject: [PATCH 4/5] add ignore type script --- backend/src/db/migrations/20240226094411_instance-id.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/src/db/migrations/20240226094411_instance-id.ts b/backend/src/db/migrations/20240226094411_instance-id.ts index cf5fbeef7..16f59f076 100644 --- a/backend/src/db/migrations/20240226094411_instance-id.ts +++ b/backend/src/db/migrations/20240226094411_instance-id.ts @@ -1,3 +1,5 @@ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore import { Knex } from "knex"; import { TableName } from "../schemas"; @@ -8,15 +10,12 @@ export async function up(knex: Knex): Promise { await knex.schema.alterTable(TableName.SuperAdmin, (t) => { t.uuid("instanceId").notNullable().defaultTo(knex.fn.uuid()); }); - - // this is updated to avoid race condition on replication - /* eslint-disable */ + // eslint-disable-next-line await knex(TableName.SuperAdmin) .update({ id: ADMIN_CONFIG_UUID }) .whereNotNull("id") .andWhere("id", "<>", ADMIN_CONFIG_UUID) .limit(1); - /* eslint-enable */ } export async function down(knex: Knex): Promise { From ae4a2089d5320cefed34eb454bec9351f092edb4 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Thu, 29 Feb 2024 16:30:58 -0500 Subject: [PATCH 5/5] ignore whole file --- backend/src/db/migrations/20240226094411_instance-id.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/db/migrations/20240226094411_instance-id.ts b/backend/src/db/migrations/20240226094411_instance-id.ts index 16f59f076..9ae4741e1 100644 --- a/backend/src/db/migrations/20240226094411_instance-id.ts +++ b/backend/src/db/migrations/20240226094411_instance-id.ts @@ -1,5 +1,5 @@ // eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore +// @ts-nocheck import { Knex } from "knex"; import { TableName } from "../schemas";