From c2778b77461d324529138dc28274bbcff906459f Mon Sep 17 00:00:00 2001 From: Abhishek Shroff Date: Sun, 29 Jun 2025 14:00:21 +0530 Subject: [PATCH] [server] Rename resource_storage => storage_mounts --- .../data/{013_resource_storage.sql => 013_storage_mounts.sql} | 4 ++-- server/internal/jobs/migrate.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename server/internal/db/migrations/data/{013_resource_storage.sql => 013_storage_mounts.sql} (77%) diff --git a/server/internal/db/migrations/data/013_resource_storage.sql b/server/internal/db/migrations/data/013_storage_mounts.sql similarity index 77% rename from server/internal/db/migrations/data/013_resource_storage.sql rename to server/internal/db/migrations/data/013_storage_mounts.sql index e8f592e0..36b0a3ed 100644 --- a/server/internal/db/migrations/data/013_resource_storage.sql +++ b/server/internal/db/migrations/data/013_storage_mounts.sql @@ -1,8 +1,8 @@ -CREATE TABLE resource_storage( +CREATE TABLE storage_mounts( id UUID PRIMARY KEY REFERENCES resources ON DELETE CASCADE, storage TEXT NOT NULL REFERENCES storage_backends(name) ON UPDATE CASCADE ON DELETE CASCADE ); ---- create above / drop below ---- -DROP TABLE resource_storage; +DROP TABLE storage_mounts; diff --git a/server/internal/jobs/migrate.go b/server/internal/jobs/migrate.go index 8613dc84..201b74b8 100644 --- a/server/internal/jobs/migrate.go +++ b/server/internal/jobs/migrate.go @@ -65,13 +65,13 @@ func findTargetStorageForVersion(db db.Handler, versionID uuid.UUID) (storage.Ba q := `WITH RECURSIVE nodes(id, parent, storage) AS ( SELECT r.id, r.parent, s.storage FROM resources r - LEFT JOIN resource_storage s + LEFT JOIN storage_mounts s ON r.id = s.id WHERE r.id = (SELECT resource_id FROM resource_versions WHERE id = $1::UUID) UNION ALL SELECT r.id, r.parent, COALESCE(n.storage, s.storage) FROM resources r - LEFT JOIN resource_storage s ON r.id = s.id + LEFT JOIN storage_mounts s ON r.id = s.id JOIN nodes n ON r.id = n.parent ) SELECT storage from nodes n WHERE n.parent IS NULL; `