From 8e6bd6c97ec106d0e699d32c9ea12dda8f05d41c Mon Sep 17 00:00:00 2001 From: pKorsholm Date: Wed, 8 Sep 2021 15:07:22 +0200 Subject: [PATCH] nullable variant_rank with defaulvalue of 0 excluded from select queries in database --- .../1630868939283-product_variant_rank.ts | 14 ----------- ...70102483-product_variant_option_cascade.ts | 17 -------------- ...05-money_amount_product_variant_cascade.ts | 16 ------------- ...631104895519-RankColumnWithDefaultValue.ts | 23 +++++++++++++++++++ packages/medusa/src/models/product-variant.ts | 2 +- 5 files changed, 24 insertions(+), 48 deletions(-) delete mode 100644 packages/medusa/src/migrations/1630868939283-product_variant_rank.ts delete mode 100644 packages/medusa/src/migrations/1630870102483-product_variant_option_cascade.ts delete mode 100644 packages/medusa/src/migrations/1630870682705-money_amount_product_variant_cascade.ts create mode 100644 packages/medusa/src/migrations/1631104895519-RankColumnWithDefaultValue.ts diff --git a/packages/medusa/src/migrations/1630868939283-product_variant_rank.ts b/packages/medusa/src/migrations/1630868939283-product_variant_rank.ts deleted file mode 100644 index 0461e33c01..0000000000 --- a/packages/medusa/src/migrations/1630868939283-product_variant_rank.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {MigrationInterface, QueryRunner} from "typeorm"; - -export class productVariantRank1630868939283 implements MigrationInterface { - name = 'productVariantRank1630868939283' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "product_variant" ADD "variant_rank" integer NOT NULL`); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "product_variant" DROP COLUMN "variant_rank"`); - } - -} diff --git a/packages/medusa/src/migrations/1630870102483-product_variant_option_cascade.ts b/packages/medusa/src/migrations/1630870102483-product_variant_option_cascade.ts deleted file mode 100644 index 6ab95c0060..0000000000 --- a/packages/medusa/src/migrations/1630870102483-product_variant_option_cascade.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {MigrationInterface, QueryRunner} from "typeorm"; - -export class productVariantOptionCascade1630870102483 implements MigrationInterface { - name = 'productVariantOptionCascade1630870102483' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "product_option_value" DROP CONSTRAINT "FK_7234ed737ff4eb1b6ae6e6d7b01"`); - await queryRunner.query(`ALTER TABLE "product_option_value" ADD CONSTRAINT "FK_7234ed737ff4eb1b6ae6e6d7b01" FOREIGN KEY ("variant_id") REFERENCES "product_variant"("id") ON DELETE cascade ON UPDATE NO ACTION`); - - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "product_option_value" DROP CONSTRAINT "FK_7234ed737ff4eb1b6ae6e6d7b01"`); - await queryRunner.query(`ALTER TABLE "product_option_value" ADD CONSTRAINT "FK_7234ed737ff4eb1b6ae6e6d7b01" FOREIGN KEY ("variant_id") REFERENCES "product_variant"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); - } - -} diff --git a/packages/medusa/src/migrations/1630870682705-money_amount_product_variant_cascade.ts b/packages/medusa/src/migrations/1630870682705-money_amount_product_variant_cascade.ts deleted file mode 100644 index bcdfd4eceb..0000000000 --- a/packages/medusa/src/migrations/1630870682705-money_amount_product_variant_cascade.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {MigrationInterface, QueryRunner} from "typeorm"; - -export class moneyAmountProductVariantCascade1630870682705 implements MigrationInterface { - name = 'moneyAmountProductVariantCascade1630870682705' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "money_amount" DROP CONSTRAINT "FK_17a06d728e4cfbc5bd2ddb70af0"`); - await queryRunner.query(`ALTER TABLE "money_amount" ADD CONSTRAINT "FK_17a06d728e4cfbc5bd2ddb70af0" FOREIGN KEY ("variant_id") REFERENCES "product_variant"("id") ON DELETE cascade ON UPDATE NO ACTION`); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "money_amount" DROP CONSTRAINT "FK_17a06d728e4cfbc5bd2ddb70af0"`); - await queryRunner.query(`ALTER TABLE "money_amount" ADD CONSTRAINT "FK_17a06d728e4cfbc5bd2ddb70af0" FOREIGN KEY ("variant_id") REFERENCES "product_variant"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); - } - -} diff --git a/packages/medusa/src/migrations/1631104895519-RankColumnWithDefaultValue.ts b/packages/medusa/src/migrations/1631104895519-RankColumnWithDefaultValue.ts new file mode 100644 index 0000000000..75b501cc38 --- /dev/null +++ b/packages/medusa/src/migrations/1631104895519-RankColumnWithDefaultValue.ts @@ -0,0 +1,23 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class RankColumnWithDefaultValue1631104895519 implements MigrationInterface { + name = 'RankColumnWithDefaultValue1631104895519' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "product_variant" ADD "variant_rank" integer DEFAULT '0'`); + await queryRunner.query(`ALTER TABLE "product_option_value" DROP CONSTRAINT "FK_7234ed737ff4eb1b6ae6e6d7b01"`); + await queryRunner.query(`ALTER TABLE "product_option_value" ADD CONSTRAINT "FK_7234ed737ff4eb1b6ae6e6d7b01" FOREIGN KEY ("variant_id") REFERENCES "product_variant"("id") ON DELETE cascade ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "money_amount" DROP CONSTRAINT "FK_17a06d728e4cfbc5bd2ddb70af0"`); + await queryRunner.query(`ALTER TABLE "money_amount" ADD CONSTRAINT "FK_17a06d728e4cfbc5bd2ddb70af0" FOREIGN KEY ("variant_id") REFERENCES "product_variant"("id") ON DELETE cascade ON UPDATE NO ACTION`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "product_variant" DROP COLUMN "variant_rank"`); + await queryRunner.query(`ALTER TABLE "product_option_value" DROP CONSTRAINT "FK_7234ed737ff4eb1b6ae6e6d7b01"`); + await queryRunner.query(`ALTER TABLE "product_option_value" ADD CONSTRAINT "FK_7234ed737ff4eb1b6ae6e6d7b01" FOREIGN KEY ("variant_id") REFERENCES "product_variant"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "money_amount" DROP CONSTRAINT "FK_17a06d728e4cfbc5bd2ddb70af0"`); + await queryRunner.query(`ALTER TABLE "money_amount" ADD CONSTRAINT "FK_17a06d728e4cfbc5bd2ddb70af0" FOREIGN KEY ("variant_id") REFERENCES "product_variant"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); + + } + +} diff --git a/packages/medusa/src/models/product-variant.ts b/packages/medusa/src/models/product-variant.ts index 363ef074a8..94c10fa104 100644 --- a/packages/medusa/src/models/product-variant.ts +++ b/packages/medusa/src/models/product-variant.ts @@ -63,7 +63,7 @@ export class ProductVariant { @Index({ unique: true, where: "deleted_at IS NOT NULL" }) upc: string - @Column() + @Column({ nullable: true, default: 0, select:false }) variant_rank: number @Column({ type: "int" })