From 49b4080e8a091b2365763c582691d26b0e49ffbf Mon Sep 17 00:00:00 2001
From: Gefei Hou <noroldburden@gmail.com>
Date: Thu, 18 Jun 2026 23:11:34 -0700
Subject: [PATCH 1/2] Fix poublic download url

---
 .../graphile-presigned-url-plugin/src/download-url-field.ts     | 2 +-
 pgpm/types/src/pgpm.ts                                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphile/graphile-presigned-url-plugin/src/download-url-field.ts b/graphile/graphile-presigned-url-plugin/src/download-url-field.ts
index 290a88e821..30ade44656 100644
--- a/graphile/graphile-presigned-url-plugin/src/download-url-field.ts
+++ b/graphile/graphile-presigned-url-plugin/src/download-url-field.ts
@@ -183,7 +183,7 @@ export function createDownloadUrlPlugin(
                       }
 
                       if (isPublic && s3ForDb.publicUrlPrefix) {
-                        return `${s3ForDb.publicUrlPrefix}/${key}`;
+                        return `${s3ForDb.publicUrlPrefix}/${s3ForDb.bucket}/${key}`;
                       }
 
                       return generatePresignedGetUrl(
diff --git a/pgpm/types/src/pgpm.ts b/pgpm/types/src/pgpm.ts
index 76aa289543..4a277d5b4a 100644
--- a/pgpm/types/src/pgpm.ts
+++ b/pgpm/types/src/pgpm.ts
@@ -304,7 +304,7 @@ export const pgpmDefaults: PgpmOptions = {
     awsAccessKey: 'minioadmin',
     awsSecretKey: 'minioadmin',
     endpoint: 'http://localhost:9000',
-    publicUrlPrefix: 'http://localhost:9000/test-bucket'
+    publicUrlPrefix: 'http://localhost:9000'
   },
   deployment: {
     useTx: true,

From 1844c1c5b11bbffc9ee9178c5e28540918657466 Mon Sep 17 00:00:00 2001
From: Gefei Hou <noroldburden@gmail.com>
Date: Thu, 18 Jun 2026 23:21:29 -0700
Subject: [PATCH 2/2] Update snapshot

---
 graphql/env/__tests__/__snapshots__/merge.test.ts.snap | 2 +-
 pgpm/env/__tests__/__snapshots__/merge.test.ts.snap    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphql/env/__tests__/__snapshots__/merge.test.ts.snap b/graphql/env/__tests__/__snapshots__/merge.test.ts.snap
index 84c94739a1..b6969aaf51 100644
--- a/graphql/env/__tests__/__snapshots__/merge.test.ts.snap
+++ b/graphql/env/__tests__/__snapshots__/merge.test.ts.snap
@@ -24,7 +24,7 @@ exports[`getEnvOptions merges pgpm defaults, graphql defaults, config, env, and
     "bucketName": "test-bucket",
     "endpoint": "http://localhost:9000",
     "provider": "minio",
-    "publicUrlPrefix": "http://localhost:9000/test-bucket",
+    "publicUrlPrefix": "http://localhost:9000",
   },
   "db": {
     "connections": {
diff --git a/pgpm/env/__tests__/__snapshots__/merge.test.ts.snap b/pgpm/env/__tests__/__snapshots__/merge.test.ts.snap
index 085c0718cf..8ba29ba739 100644
--- a/pgpm/env/__tests__/__snapshots__/merge.test.ts.snap
+++ b/pgpm/env/__tests__/__snapshots__/merge.test.ts.snap
@@ -9,7 +9,7 @@ exports[`getEnvOptions merges defaults, config, env, and overrides 1`] = `
     "bucketName": "test-bucket",
     "endpoint": "http://localhost:9000",
     "provider": "minio",
-    "publicUrlPrefix": "http://localhost:9000/test-bucket",
+    "publicUrlPrefix": "http://localhost:9000",
   },
   "db": {
     "connections": {