asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
--list
2021-06-17 08:37:54 +02:00
parent 24a8b242b2 04fe5292f7
commit 99c95c8bfb
14 changed files with 15371 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/medusa/src/migrations/1623231564533-no_notification.ts
+9
View File
@@ -8,16 +8,25 @@ export class noNotification1623231564533 implements MigrationInterface {
await queryRunner.query(`ALTER TABLE "claim_order" ADD "no_notification" boolean`);
await queryRunner.query(`ALTER TABLE "swap" ADD "no_notification" boolean`);
await queryRunner.query(`ALTER TABLE "order" ADD "no_notification" boolean`);
<<<<<<< HEAD
await queryRunner.query(`ALTER TABLE "draft_order" ADD "no_notification_order" boolean`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "draft_order" DROP COLUMN "no_notification_order"`);
=======
}
public async down(queryRunner: QueryRunner): Promise<void> {
>>>>>>> 04fe5292f7e9dcd14cb1a4ea17db8978f9b52c03
await queryRunner.query(`ALTER TABLE "order" DROP COLUMN "no_notification"`);
await queryRunner.query(`ALTER TABLE "swap" DROP COLUMN "no_notification"`);
await queryRunner.query(`ALTER TABLE "claim_order" DROP COLUMN "no_notification"`);
await queryRunner.query(`ALTER TABLE "return" DROP COLUMN "no_notification"`);
<<<<<<< HEAD
=======
>>>>>>> 04fe5292f7e9dcd14cb1a4ea17db8978f9b52c03
}
}