Merge branch 'ps-fix-link-repository-id-migration' into 'master'

sql-migrate: Update storage_repositories table

Closes #3806

See merge request gitlab-org/gitaly!4047

1 files changed, 7 insertions, 6 deletions

diff --git a/internal/praefect/datastore/migrations/20210906145021_link_repository_id.go b/internal/praefect/datastore/migrations/20210906145021_link_repository_id.go
index 15deb0fe2..8ee84d968 100644
--- a/internal/praefect/datastore/migrations/20210906145021_link_repository_id.go
+++ b/internal/praefect/datastore/migrations/20210906145021_link_repository_id.go
@@ -16,21 +16,22 @@ DO $BODY$
                 UPDATE storage_repositories
                 SET repository_id = sub.repository_id
                 FROM (
-                    SELECT storage_repositories.virtual_storage, storage_repositories.relative_path, repositories.repository_id
+                    SELECT storage_repositories.virtual_storage, storage_repositories.storage, storage_repositories.relative_path, repositories.repository_id
                     FROM storage_repositories JOIN repositories USING (virtual_storage, relative_path)
                     WHERE storage_repositories.repository_id IS NULL
-                    LIMIT 150
+                    LIMIT 14
                 ) AS sub
-                WHERE   storage_repositories.virtual_storage = sub.virtual_storage
-                    AND storage_repositories.relative_path   = sub.relative_path
-                RETURNING storage_repositories.repository_id
+                    WHERE   storage_repositories.virtual_storage = sub.virtual_storage
+                        AND storage_repositories.storage         = sub.storage
+                        AND storage_repositories.relative_path   = sub.relative_path
+                    RETURNING storage_repositories.repository_id
             )
             SELECT COUNT(*) INTO count_val FROM updated_rows;
             EXIT WHEN count_val = 0;
         END LOOP;
     END
 $BODY$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql
 -- +migrate StatementEnd`,
 			`
 UPDATE repository_assignments