supabase · avallete · Mar 9, 2026 · Mar 9, 2026 · Mar 9, 2026 · Mar 9, 2026
diff --git a/.github/agents/pg-toolbelt.md b/.github/agents/pg-toolbelt.md
@@ -188,18 +188,6 @@ Wait for user approval before implementing.
 
 When implementing a **fix**, **feat**, or any change that affects package behavior (patch/minor/major), add a changeset before considering the work complete. Run `bunx changeset`, select the affected package(s), pick the appropriate bump type, and commit the generated `.changeset/*.md` file with your changes.
 
-<<<<<<< copilot/handle-cascade-dependencies-mv
-### Test-Driven Fixes
-
-Every bug fix must land as two commits (or one clearly described TDD history in the commit body):
-
-1. **Red.** Add a test that reproduces the bug and fails against the current code. Run the focused command and paste the failure output into the commit body so reviewers can see the regression shape.
-2. **Green.** Apply the minimum code change that makes the red test pass. Do not touch unrelated code in the same commit.
-
-A fix without a failing test first is not complete. If the bug genuinely cannot be reproduced in a test (e.g. a race, a user-environment-only issue), say so explicitly in the PR and explain what manual verification was performed instead.
-
-This rule applies to every `fix(...)` and to any `feat(...)` that changes existing behavior. New `feat(...)` work follows the usual coverage expectations in the _Test Coverage Expectations_ section.
-=======
 See also **Test-Driven Fixes** below — the regression test must exist (and fail) before the fix that the changeset describes.
 
 ### Test-Driven Fixes
@@ -225,7 +213,6 @@ If a repository policy or reviewer asks for a single squashed commit, keep the R
 - Refactors that claim to preserve behavior: if there is doubt, pin the current behavior with a passing test first, then refactor.
 
 **Don't:** write the production code first and then "backfill" a test that already passes. That test cannot prove the fix was necessary.
->>>>>>> main
 
 ### Testing Discipline
 
@@ -269,7 +256,7 @@ baseline fixtures as part of the upgrade.
 - After upgrading the image tags, rerun the focused regression tests before
   considering the upgrade done:
   - `cd packages/pg-delta && PGDELTA_TEST_POSTGRES_VERSIONS=15,17 bun run test tests/integration/supabase-base-init.test.ts tests/integration/catalog-model.test.ts tests/integration/supabase-dsl-e2e.test.ts`
-  - `cd packages/pg-delta && PGDELTA_TEST_POSTGRES_VERSIONS=15 bun run test tests/integration/dbdev-roundtrip.test.ts`
+  - `cd packages/pg-delta && PGDELTA_TEST_POSTGRES_VERSIONS=15 PGDELTA_SUPABASE_PROJECT=dbdev bun run test tests/integration/supabase-project-declarative.test.ts`
 - If the sync script or focused tests reveal new schemas, roles, grants, or
   comments, update pg-delta’s Supabase handling (for example
   `packages/pg-delta/src/core/integrations/supabase.ts` or the relevant

diff --git a/.gitignore b/.gitignore
@@ -167,6 +167,7 @@ dev-debug.log
 
 # Declarative schemas
 declarative-schemas/
+packages/pg-delta/test-results/
 
 
 # TypeDoc generated output

diff --git a/packages/pg-delta/tests/integration/dbdev-roundtrip.test.ts b/packages/pg-delta/tests/integration/dbdev-roundtrip.test.ts
diff --git a/.../migrations/20220117141357_extensions.sql → .../migrations/20220117141357_extensions.sql b/.../migrations/20220117141357_extensions.sql → .../migrations/20220117141357_extensions.sql
diff --git a/.../migrations/20220117141359_app_schema.sql → .../migrations/20220117141359_app_schema.sql b/.../migrations/20220117141359_app_schema.sql → .../migrations/20220117141359_app_schema.sql
diff --git a/...ions/migrations/20220117141507_semver.sql → ...bdev/migrations/20220117141507_semver.sql b/...ions/migrations/20220117141507_semver.sql → ...bdev/migrations/20220117141507_semver.sql
diff --git a/...ations/20220117141645_valid_name_type.sql → ...ations/20220117141645_valid_name_type.sql b/...ations/20220117141645_valid_name_type.sql → ...ations/20220117141645_valid_name_type.sql
diff --git a/...ons/20220117141942_email_address_type.sql → ...ons/20220117141942_email_address_type.sql b/...ons/20220117141942_email_address_type.sql → ...ons/20220117141942_email_address_type.sql
diff --git a/...20220117142104_account_and_org_tables.sql → ...20220117142104_account_and_org_tables.sql b/...20220117142104_account_and_org_tables.sql → ...20220117142104_account_and_org_tables.sql
diff --git a/...rations/20220117142137_package_tables.sql → ...rations/20220117142137_package_tables.sql b/...rations/20220117142137_package_tables.sql → ...rations/20220117142137_package_tables.sql
diff --git a/...ations/20220117142138_developer_tools.sql → ...ations/20220117142138_developer_tools.sql b/...ations/20220117142138_developer_tools.sql → ...ations/20220117142138_developer_tools.sql
diff --git a/...ons/20220117142141_security_utilities.sql → ...ons/20220117142141_security_utilities.sql b/...ons/20220117142141_security_utilities.sql → ...ons/20220117142141_security_utilities.sql
diff --git a/...s/20220117142142_security_definitions.sql → ...s/20220117142142_security_definitions.sql b/...s/20220117142142_security_definitions.sql → ...s/20220117142142_security_definitions.sql
diff --git a/...tions/migrations/20220117155720_views.sql → ...dbdev/migrations/20220117155720_views.sql b/...tions/migrations/20220117155720_views.sql → ...dbdev/migrations/20220117155720_views.sql
diff --git a/...rations/migrations/20220117155820_rpc.sql → ...s/dbdev/migrations/20220117155820_rpc.sql b/...rations/migrations/20220117155820_rpc.sql → ...s/dbdev/migrations/20220117155820_rpc.sql
diff --git a/...ns/20230323180034_reserved_user_accts.sql → ...ns/20230323180034_reserved_user_accts.sql b/...ns/20230323180034_reserved_user_accts.sql → ...ns/20230323180034_reserved_user_accts.sql
diff --git a/...ions/20230328185043_olirice_asciiplot.sql → ...ions/20230328185043_olirice_asciiplot.sql b/...ions/20230328185043_olirice_asciiplot.sql → ...ions/20230328185043_olirice_asciiplot.sql
diff --git a/...rations/20230330155137_supabase_dbdev.sql → ...rations/20230330155137_supabase_dbdev.sql b/...rations/20230330155137_supabase_dbdev.sql → ...rations/20230330155137_supabase_dbdev.sql
diff --git a/.../20230331145934_burggraf-pg_headerkit.sql → .../20230331145934_burggraf-pg_headerkit.sql b/.../20230331145934_burggraf-pg_headerkit.sql → .../20230331145934_burggraf-pg_headerkit.sql
diff --git a/.../20230331163908_olirice-index_advisor.sql → .../20230331163908_olirice-index_advisor.sql b/.../20230331163908_olirice-index_advisor.sql → .../20230331163908_olirice-index_advisor.sql
diff --git a/...ions/20230331163909_olirice-read_once.sql → ...ions/20230331163909_olirice-read_once.sql b/...ions/20230331163909_olirice-read_once.sql → ...ions/20230331163909_olirice-read_once.sql
diff --git a/...ions/20230404162614_michelp-adminpack.sql → ...ions/20230404162614_michelp-adminpack.sql b/...ions/20230404162614_michelp-adminpack.sql → ...ions/20230404162614_michelp-adminpack.sql
diff --git a/...20230405083103_fix_auth_schema_values.sql → ...20230405083103_fix_auth_schema_values.sql b/...20230405083103_fix_auth_schema_values.sql → ...20230405083103_fix_auth_schema_values.sql
diff --git a/...ons/20230405085810_fix_avatars_handle.sql → ...ons/20230405085810_fix_avatars_handle.sql b/...ons/20230405085810_fix_avatars_handle.sql → ...ons/20230405085810_fix_avatars_handle.sql
diff --git a/...tions/20230405163940_download_metrics.sql → ...tions/20230405163940_download_metrics.sql b/...tions/20230405163940_download_metrics.sql → ...tions/20230405163940_download_metrics.sql
diff --git a/...48_download_metrics_computed_relation.sql → ...48_download_metrics_computed_relation.sql b/...48_download_metrics_computed_relation.sql → ...48_download_metrics_computed_relation.sql
diff --git a/...0411175952_langchain-embedding_search.sql → ...0411175952_langchain-embedding_search.sql b/...0411175952_langchain-embedding_search.sql → ...0411175952_langchain-embedding_search.sql
diff --git a/...0230411175953_langchain-hybrid_search.sql → ...0230411175953_langchain-hybrid_search.sql b/...0230411175953_langchain-hybrid_search.sql → ...0230411175953_langchain-hybrid_search.sql
diff --git a/...30413130634_popular_packages_function.sql → ...30413130634_popular_packages_function.sql b/...30413130634_popular_packages_function.sql → ...30413130634_popular_packages_function.sql
diff --git a/...0230413140356_update_profile_function.sql → ...0230413140356_update_profile_function.sql b/...0230413140356_update_profile_function.sql → ...0230413140356_update_profile_function.sql
diff --git a/.../20230417141004_dbdev_short_desc_typo.sql → .../20230417141004_dbdev_short_desc_typo.sql b/.../20230417141004_dbdev_short_desc_typo.sql → .../20230417141004_dbdev_short_desc_typo.sql
diff --git a/...20230508165641_packages_order_version.sql → ...20230508165641_packages_order_version.sql b/...20230508165641_packages_order_version.sql → ...20230508165641_packages_order_version.sql
diff --git a/...5952_langchain-embedding_search-1_1_0.sql → ...5952_langchain-embedding_search-1_1_0.sql b/...5952_langchain-embedding_search-1_1_0.sql → ...5952_langchain-embedding_search-1_1_0.sql
diff --git a/...8175953_langchain-hybrid_search-1_1_0.sql → ...8175953_langchain-hybrid_search-1_1_0.sql b/...8175953_langchain-hybrid_search-1_1_0.sql → ...8175953_langchain-hybrid_search-1_1_0.sql
diff --git a/...12339_langchain_headerkit_config_dump.sql → ...12339_langchain_headerkit_config_dump.sql b/...12339_langchain_headerkit_config_dump.sql → ...12339_langchain_headerkit_config_dump.sql
diff --git a/...1432_dbdev_supports_multiple_versions.sql → ...1432_dbdev_supports_multiple_versions.sql b/...1432_dbdev_supports_multiple_versions.sql → ...1432_dbdev_supports_multiple_versions.sql
diff --git a/...s/20230829125510_fix_view_permissions.sql → ...s/20230829125510_fix_view_permissions.sql b/...s/20230829125510_fix_view_permissions.sql → ...s/20230829125510_fix_view_permissions.sql
diff --git a/...830083255_olirice-index_advisor-0_2_0.sql → ...830083255_olirice-index_advisor-0_2_0.sql b/...830083255_olirice-index_advisor-0_2_0.sql → ...830083255_olirice-index_advisor-0_2_0.sql
diff --git a/...15_allow_anon_access_to_package_views.sql → ...15_allow_anon_access_to_package_views.sql b/...15_allow_anon_access_to_package_views.sql → ...15_allow_anon_access_to_package_views.sql
diff --git a/...igrations/20230906110845_access_token.sql → ...igrations/20230906110845_access_token.sql b/...igrations/20230906110845_access_token.sql → ...igrations/20230906110845_access_token.sql
diff --git a/...ations/20230906111353_publish_package.sql → ...ations/20230906111353_publish_package.sql b/...ations/20230906111353_publish_package.sql → ...ations/20230906111353_publish_package.sql
diff --git a/...w_publishing_relocatable_and_requires.sql → ...w_publishing_relocatable_and_requires.sql b/...w_publishing_relocatable_and_requires.sql → ...w_publishing_relocatable_and_requires.sql
diff --git a/...ns/20231205051816_add_default_version.sql → ...ns/20231205051816_add_default_version.sql b/...ns/20231205051816_add_default_version.sql → ...ns/20231205051816_add_default_version.sql
diff --git a/...101809_dbdev_supports_default_version.sql → ...101809_dbdev_supports_default_version.sql b/...101809_dbdev_supports_default_version.sql → ...101809_dbdev_supports_default_version.sql
diff --git a/...tions/20231207071422_new_package_name.sql → ...tions/20231207071422_new_package_name.sql b/...tions/20231207071422_new_package_name.sql → ...tions/20231207071422_new_package_name.sql
diff --git a/...3048_dbdev_supports_new_package_names.sql → ...3048_dbdev_supports_new_package_names.sql b/...3048_dbdev_supports_new_package_names.sql → ...3048_dbdev_supports_new_package_names.sql
diff --git a/...1703_langchain@embedding_search-1.1.1.sql → ...1703_langchain@embedding_search-1.1.1.sql b/...1703_langchain@embedding_search-1.1.1.sql → ...1703_langchain@embedding_search-1.1.1.sql
diff --git a/...7112129_langchain@hybrid_search-1.1.1.sql → ...7112129_langchain@hybrid_search-1.1.1.sql b/...7112129_langchain@hybrid_search-1.1.1.sql → ...7112129_langchain@hybrid_search-1.1.1.sql
diff --git a/...0231207112942_michelp@adminpack-0.0.2.sql → ...0231207112942_michelp@adminpack-0.0.2.sql b/...0231207112942_michelp@adminpack-0.0.2.sql → ...0231207112942_michelp@adminpack-0.0.2.sql
diff --git a/...207113329_olirice@index_advisor-0.2.1.sql → ...207113329_olirice@index_advisor-0.2.1.sql b/...207113329_olirice@index_advisor-0.2.1.sql → ...207113329_olirice@index_advisor-0.2.1.sql
diff --git a/...0231207113857_olirice@read_once-0.3.2.sql → ...0231207113857_olirice@read_once-0.3.2.sql b/...0231207113857_olirice@read_once-0.3.2.sql → ...0231207113857_olirice@read_once-0.3.2.sql
diff --git a/...ons/20240108072747_update_provider_id.sql → ...ons/20240108072747_update_provider_id.sql b/...ons/20240108072747_update_provider_id.sql → ...ons/20240108072747_update_provider_id.sql
diff --git a/...s/20240605122023_fix_view_permissions.sql → ...s/20240605122023_fix_view_permissions.sql b/...s/20240605122023_fix_view_permissions.sql → ...s/20240605122023_fix_view_permissions.sql
diff --git a/...s/20240705083738_remove_contact_email.sql → ...s/20240705083738_remove_contact_email.sql b/...s/20240705083738_remove_contact_email.sql → ...s/20240705083738_remove_contact_email.sql
diff --git a/.../20250106073735_jwt_secret_from_vault.sql → .../20250106073735_jwt_secret_from_vault.sql b/.../20250106073735_jwt_secret_from_vault.sql → .../20250106073735_jwt_secret_from_vault.sql
diff --git a/...0217100252_restrict_accounts_and_orgs.sql → ...0217100252_restrict_accounts_and_orgs.sql b/...0217100252_restrict_accounts_and_orgs.sql → ...0217100252_restrict_accounts_and_orgs.sql
diff --git a/...52_remove_dbdev_from_popular_packages.sql → ...52_remove_dbdev_from_popular_packages.sql b/...52_remove_dbdev_from_popular_packages.sql → ...52_remove_dbdev_from_popular_packages.sql
diff --git a/packages/pg-delta/tests/integration/fixtures/supabase-projects/dbdev/project.ts b/packages/pg-delta/tests/integration/fixtures/supabase-projects/dbdev/project.ts
@@ -0,0 +1,36 @@
+import { supabase } from "../../../../../src/core/integrations/supabase.ts";
+import { defineSupabaseProjectFixture } from "../../../supabase-project-fixture.ts";
+
+export default defineSupabaseProjectFixture({
+  id: "dbdev",
+  displayName: "dbdev",
+  supabasePostgresVersion: 15,
+  integration: supabase,
+  migrationsDir: new URL("./migrations/", import.meta.url),
+  setRole: "postgres",
+  skipDefaultPrivilegeSubtraction: true,
+  candidateRegressionNote:
+    "Reduce the failing prefix to the smallest migration slice that reproduces the issue, then turn the generated SQL or remaining diff into a focused pg-delta integration test.",
+  scenarios: {
+    declarative: {
+      include: (filename) => filename.startsWith("20220117"),
+      onApplyError: "fail",
+    },
+    progressive: {
+      // The runner compares stepping main against a *fully* migrated branch. With
+      // the full history, the plan is a "catch up" to head that cannot be
+      // applied as one plan (statements like ADD COLUMN without migration-time
+      // DEFAULT/backfill from later files). Scope to the same prefix as
+      // declarative so the target branch and incremental main can converge.
+      include: (filename) => filename.startsWith("20220117"),
+      onApplyError: "skip",
+    },
+    adjacent: {
+      onApplyError: "skip",
+      // Migration uses DEFAULT + UPDATE + DROP DEFAULT; the final column has no
+      // default, so plan/apply from catalog diff cannot replay on non-empty tables.
+      skipAdjacentPlanApply: (filename) =>
+        filename === "20231205051816_add_default_version.sql",
+    },
+  },
+});
diff --git a/packages/pg-delta/tests/integration/supabase-project-adjacent.test.ts b/packages/pg-delta/tests/integration/supabase-project-adjacent.test.ts
@@ -0,0 +1,17 @@
+import { describe, test } from "bun:test";
+import { discoverSupabaseProjectFixtures } from "./supabase-project-fixture.ts";
+import { runSupabaseProjectAdjacentSmoke } from "./supabase-project-runners.ts";
+
+const fixtures = await discoverSupabaseProjectFixtures();
+
+for (const fixture of fixtures) {
+  describe(`${fixture.displayName} adjacent smoke (pg${fixture.supabasePostgresVersion})`, () => {
+    test(
+      "each individual migration step plans and applies cleanly against the next prefix",
+      async () => {
+        await runSupabaseProjectAdjacentSmoke(fixture);
+      },
+      30 * 60 * 1000,
+    );
+  });
+}
diff --git a/packages/pg-delta/tests/integration/supabase-project-declarative.test.ts b/packages/pg-delta/tests/integration/supabase-project-declarative.test.ts
@@ -0,0 +1,17 @@
+import { describe, test } from "bun:test";
+import { discoverSupabaseProjectFixtures } from "./supabase-project-fixture.ts";
+import { runSupabaseProjectDeclarativeRoundtrip } from "./supabase-project-runners.ts";
+
+const fixtures = await discoverSupabaseProjectFixtures();
+
+for (const fixture of fixtures) {
+  describe(`${fixture.displayName} declarative roundtrip (pg${fixture.supabasePostgresVersion})`, () => {
+    test(
+      "exported schema roundtrips to 0 remaining changes with supabase integration",
+      async () => {
+        await runSupabaseProjectDeclarativeRoundtrip(fixture);
+      },
+      5 * 60 * 1000,
+    );
+  });
+}
diff --git a/packages/pg-delta/tests/integration/supabase-project-fixture.test.ts b/packages/pg-delta/tests/integration/supabase-project-fixture.test.ts
@@ -0,0 +1,27 @@
+import { expect, test } from "bun:test";
+import { readdir, stat } from "node:fs/promises";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+
+test("dbdev fixture uses the standardized supabase-project layout", async () => {
+  const projectDir = path.join(
+    import.meta.dir,
+    "fixtures/supabase-projects/dbdev",
+  );
+  const projectFile = path.join(projectDir, "project.ts");
+  const migrationsDir = path.join(projectDir, "migrations");
+
+  expect(await Bun.file(projectFile).exists()).toBe(true);
+  expect((await stat(migrationsDir)).isDirectory()).toBe(true);
+
+  const module = await import(pathToFileURL(projectFile).href);
+  const fixture = module.default;
+  const sqlFiles = (await readdir(migrationsDir))
+    .filter((file) => file.endsWith(".sql"))
+    .sort();
+
+  expect(fixture.id).toBe("dbdev");
+  expect(fixture.supabasePostgresVersion).toBe(15);
+  expect(sqlFiles.length).toBeGreaterThan(0);
+  expect(sqlFiles[0]).toBe("20220117141357_extensions.sql");
+});