From d18ee26dd1d882be1b15dccc5d98e5a15d15fad2 Mon Sep 17 00:00:00 2001 From: Pudong Date: Thu, 28 Sep 2023 13:39:06 +0800 Subject: [PATCH] Fix compatibility issues with db-migration (#18831) --- .../migration/1695733993909-CodeSyncDropDeleted.ts | 8 ++++---- .../migration/1695735203768-CostCenterDropDeleted.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/gitpod-db/src/typeorm/migration/1695733993909-CodeSyncDropDeleted.ts b/components/gitpod-db/src/typeorm/migration/1695733993909-CodeSyncDropDeleted.ts index f5ab6da492eff1..a882c383c0546a 100644 --- a/components/gitpod-db/src/typeorm/migration/1695733993909-CodeSyncDropDeleted.ts +++ b/components/gitpod-db/src/typeorm/migration/1695733993909-CodeSyncDropDeleted.ts @@ -10,22 +10,22 @@ import { columnExists } from "./helper/helper"; export class CodeSyncDropDeleted1695733993909 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { if (await columnExists(queryRunner, "d_b_code_sync_resource", "deleted")) { - await queryRunner.query("ALTER TABLE `d_b_code_sync_resource` DROP COLUMN `deleted`, ALGORITHM=INSTANT"); + await queryRunner.query("ALTER TABLE `d_b_code_sync_resource` DROP COLUMN `deleted`"); } if (await columnExists(queryRunner, "d_b_code_sync_collection", "deleted")) { - await queryRunner.query("ALTER TABLE `d_b_code_sync_collection` DROP COLUMN `deleted`, ALGORITHM=INSTANT"); + await queryRunner.query("ALTER TABLE `d_b_code_sync_collection` DROP COLUMN `deleted`"); } } public async down(queryRunner: QueryRunner): Promise { if (!(await columnExists(queryRunner, "d_b_code_sync_collection", "deleted"))) { await queryRunner.query( - "ALTER TABLE `d_b_code_sync_collection` ADD COLUMN `deleted` tinyint(4) NOT NULL DEFAULT '0', ALGORITHM=INSTANT", + "ALTER TABLE `d_b_code_sync_collection` ADD COLUMN `deleted` tinyint(4) NOT NULL DEFAULT '0'", ); } if (!(await columnExists(queryRunner, "d_b_code_sync_resource", "deleted"))) { await queryRunner.query( - "ALTER TABLE `d_b_code_sync_resource` ADD COLUMN `deleted` tinyint(4) NOT NULL DEFAULT '0', ALGORITHM=INSTANT", + "ALTER TABLE `d_b_code_sync_resource` ADD COLUMN `deleted` tinyint(4) NOT NULL DEFAULT '0'", ); } } diff --git a/components/gitpod-db/src/typeorm/migration/1695735203768-CostCenterDropDeleted.ts b/components/gitpod-db/src/typeorm/migration/1695735203768-CostCenterDropDeleted.ts index 7747344d6614df..9475317ec92c9f 100644 --- a/components/gitpod-db/src/typeorm/migration/1695735203768-CostCenterDropDeleted.ts +++ b/components/gitpod-db/src/typeorm/migration/1695735203768-CostCenterDropDeleted.ts @@ -10,14 +10,14 @@ import { columnExists } from "./helper/helper"; export class CostCenterDropDeleted1695735203768 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { if (await columnExists(queryRunner, "d_b_cost_center", "deleted")) { - await queryRunner.query("ALTER TABLE `d_b_cost_center` DROP COLUMN `deleted`, ALGORITHM=INSTANT"); + await queryRunner.query("ALTER TABLE `d_b_cost_center` DROP COLUMN `deleted`"); } } public async down(queryRunner: QueryRunner): Promise { if (!(await columnExists(queryRunner, "d_b_cost_center", "deleted"))) { await queryRunner.query( - "ALTER TABLE `d_b_cost_center` ADD COLUMN `deleted` tinyint(4) NOT NULL DEFAULT '0', ALGORITHM=INSTANT", + "ALTER TABLE `d_b_cost_center` ADD COLUMN `deleted` tinyint(4) NOT NULL DEFAULT '0'", ); } }