From 682cd891b19e374c07442c24776bd0f18b6dfa83 Mon Sep 17 00:00:00 2001
From: aramissennyeydd <aramis.sennyey@doordash.com>
Date: Wed, 30 Oct 2024 11:49:42 -0400
Subject: [PATCH 1/3] fix: database config is already prefixed

Signed-off-by: aramissennyeydd <aramis.sennyey@doordash.com>
---
 .../database/DatabaseManager.test.ts          | 20 +++++--------------
 .../entrypoints/database/DatabaseManager.ts   |  6 ++----
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts
index 27cb511477..fb8e4011a8 100644
--- a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts
+++ b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts
@@ -106,12 +106,8 @@ describe('DatabaseManagerImpl', () => {
     const impl = new DatabaseManagerImpl(
       new ConfigReader({
         client: 'pg',
-        backend: {
-          database: {
-            skipMigrations: true,
-            plugin: { plugin1: { skipMigrations: true } },
-          },
-        },
+        skipMigrations: true,
+        plugin: { plugin1: { skipMigrations: true } },
       }),
       {
         pg: connector,
@@ -139,9 +135,7 @@ describe('DatabaseManagerImpl', () => {
     const impl = new DatabaseManagerImpl(
       new ConfigReader({
         client: 'pg',
-        backend: {
-          database: { plugin: { plugin1: { skipMigrations: true } } },
-        },
+        plugin: { plugin1: { skipMigrations: true } },
       }),
       {
         pg: connector,
@@ -158,12 +152,8 @@ describe('DatabaseManagerImpl', () => {
     const impl2 = new DatabaseManagerImpl(
       new ConfigReader({
         client: 'pg',
-        backend: {
-          database: {
-            skipMigrations: true,
-            plugin: { plugin1: { skipMigrations: false } },
-          },
-        },
+        skipMigrations: true,
+        plugin: { plugin1: { skipMigrations: false } },
       }),
       {
         pg: connector,
diff --git a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
index 7fddb17987..75e7d35eee 100644
--- a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
+++ b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
@@ -96,10 +96,8 @@ export class DatabaseManagerImpl {
 
     const skip =
       this.options?.migrations?.skip ??
-      this.config.getOptionalBoolean(
-        `backend.database.plugin.${pluginId}.skipMigrations`,
-      ) ??
-      this.config.getOptionalBoolean('backend.database.skipMigrations') ??
+      this.config.getOptionalBoolean(`plugin.${pluginId}.skipMigrations`) ??
+      this.config.getOptionalBoolean('skipMigrations') ??
       false;
 
     return { getClient, migrations: { skip } };

From e30bb468647c4fa197fa97433419af44567bb03c Mon Sep 17 00:00:00 2001
From: aramissennyeydd <aramis.sennyey@doordash.com>
Date: Wed, 30 Oct 2024 11:54:46 -0400
Subject: [PATCH 2/3] add changeset

Signed-off-by: aramissennyeydd <aramis.sennyey@doordash.com>
---
 .changeset/selfish-spies-cough.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/selfish-spies-cough.md

diff --git a/.changeset/selfish-spies-cough.md b/.changeset/selfish-spies-cough.md
new file mode 100644
index 0000000000..355b08b896
--- /dev/null
+++ b/.changeset/selfish-spies-cough.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': minor
+---
+
+Disabling database migrations now correctly uses the `backend.default.skipMigrations` config value.

From 610d2c92c6975b971fa28391ef343e8d22f57a2e Mon Sep 17 00:00:00 2001
From: Aramis Sennyey <159921952+aramissennyeydd@users.noreply.github.com>
Date: Wed, 30 Oct 2024 12:51:24 -0400
Subject: [PATCH 3/3] Update .changeset/selfish-spies-cough.md

Co-authored-by: Patrik Oldsberg <poldsberg@gmail.com>
Signed-off-by: Aramis Sennyey <159921952+aramissennyeydd@users.noreply.github.com>
---
 .changeset/selfish-spies-cough.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/selfish-spies-cough.md b/.changeset/selfish-spies-cough.md
index 355b08b896..f702699080 100644
--- a/.changeset/selfish-spies-cough.md
+++ b/.changeset/selfish-spies-cough.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/backend-defaults': minor
+'@backstage/backend-defaults': patch
 ---
 
 Disabling database migrations now correctly uses the `backend.default.skipMigrations` config value.