Merge branch '210589-statement-invalid-column-reference-is-ambiguous' into 'master'

Geo - Fix ambiguous reference column while loading migrated local files to clean up

Closes #210589

See merge request gitlab-org/gitlab!27252

ee/app/workers/geo/migrated_local_files_clean_up_worker.rb

@@ -49,7 +49,7 @@ module Geo
       return [] unless lfs_objects_object_store_enabled?
 
       lfs_objects_finder.find_migrated_local(batch_size: batch_size, except_ids: scheduled_file_ids(:lfs))
-                        .pluck(:id)
+                        .pluck(Geo::Fdw::LfsObject.arel_table[:id])
                         .map { |id| ['lfs', id] }
     end
     # rubocop: enable CodeReuse/ActiveRecord
@@ -59,7 +59,7 @@ module Geo
       return [] unless attachments_object_store_enabled?
 
       attachments_finder.find_migrated_local(batch_size: batch_size, except_ids: scheduled_file_ids(Gitlab::Geo::Replication::USER_UPLOADS_OBJECT_TYPES))
-                        .pluck(:uploader, :id)
+                        .pluck(Geo::Fdw::Upload.arel_table[:uploader], Geo::Fdw::Upload.arel_table[:id])
                         .map { |uploader, id| [uploader.sub(/Uploader\z/, '').underscore, id] }
     end
     # rubocop: enable CodeReuse/ActiveRecord

ee/changelogs/unreleased/210589-statement-invalid-column-reference-is-ambiguous.yml

+---
+title: Geo - Fix ambiguous reference column while loading migrated local files to
+  clean up
+merge_request: 27252
+author:
+type: fixed