From 205573f5e3bb826abe1cc1bc16855f079aa490e4 Mon Sep 17 00:00:00 2001
From: Sebastian Rindom <skrindom@gmail.com>
Date: Thu, 21 Mar 2024 11:33:40 +0100
Subject: [PATCH] fix(medusa): migrate with feature flag (#6771)

* fix(medusa): migrate with feature flag

* fix

* Create small-guests-whisper.md
---
 .changeset/small-guests-whisper.md      | 5 +++++
 packages/medusa/src/commands/migrate.js | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/small-guests-whisper.md

diff --git a/.changeset/small-guests-whisper.md b/.changeset/small-guests-whisper.md
new file mode 100644
index 0000000000..065dd8b041
--- /dev/null
+++ b/.changeset/small-guests-whisper.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): ensure feature flags are loaded properly in migrate command
diff --git a/packages/medusa/src/commands/migrate.js b/packages/medusa/src/commands/migrate.js
index 2182065e05..4b9c454444 100644
--- a/packages/medusa/src/commands/migrate.js
+++ b/packages/medusa/src/commands/migrate.js
@@ -72,9 +72,8 @@ const main = async function ({ directory }) {
   args.shift()
   args.shift()
 
-  const featureFlagRouter = featureFlagLoader(configModule)
   const configModule = configModuleLoader(directory)
-  const dataSource = await getDataSource(directory)
+  const featureFlagRouter = featureFlagLoader(configModule)
 
   if (args[0] === "run") {
     if (featureFlagRouter.isFeatureEnabled(MedusaV2Flag.key)) {
@@ -91,6 +90,7 @@ const main = async function ({ directory }) {
         { registerInContainer: false }
       )
     } else {
+      const dataSource = await getDataSource(directory)
       await dataSource.runMigrations()
       await dataSource.destroy()
       await runIsolatedModulesMigration(configModule)
@@ -101,11 +101,13 @@ const main = async function ({ directory }) {
 
     Logger.info("Migrations completed.")
   } else if (args[0] === "revert") {
+    const dataSource = await getDataSource(directory)
     await dataSource.undoLastMigration({ transaction: "all" })
     await dataSource.destroy()
     await revertIsolatedModulesMigration(configModule)
     Logger.info("Migrations reverted.")
   } else if (args[0] === "show") {
+    const dataSource = await getDataSource(directory)
     const unapplied = await dataSource.showMigrations()
     Logger.info(unapplied)
     await dataSource.destroy()