From 23e112dcd718c06da3f5be2ce42b29a7b4458584 Mon Sep 17 00:00:00 2001
From: Qiao Han <qiao@supabase.io>
Date: Fri, 24 Oct 2025 10:59:43 +0800
Subject: [PATCH] fix: base client should also use schema qualified reference

---
 internal/db/diff/templates/migra.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/db/diff/templates/migra.ts b/internal/db/diff/templates/migra.ts
index 89c4edbdb5..a8ae28d804 100644
--- a/internal/db/diff/templates/migra.ts
+++ b/internal/db/diff/templates/migra.ts
@@ -22,8 +22,9 @@ const extensionSchemas = [
 try {
   // Step down from login role to postgres
   await clientHead.query(sql`set role postgres`);
-  // Use schema qualified references for pg_get_expr
+  // Force schema qualified references for pg_get_expr
   await clientHead.query(sql`set search_path = ''`);
+  await clientBase.query(sql`set search_path = ''`);
   let result = "";
   for (const schema of includedSchemas) {
     const m = await Migration.create(clientBase, clientHead, {