Only remove SequelPaginator tmp field when present

cloudfoundry · Oct 8, 2024 · 36e75f2 · 36e75f2
1 parent adfc489
commit 36e75f2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/cloud_controller/paging/sequel_paginator.rb b/lib/cloud_controller/paging/sequel_paginator.rb
@@ -54,6 +54,7 @@ def paginate_with_window_function(dataset, per_page, page, table_name)
       records = paged_dataset.all
 
       count = records.any? ? records.first[:pagination_total_results] : 0
+
       records.each do |x|
         x.values.delete(:pagination_total_results)
         x.values.delete(:tmp_deferred_id)
@@ -74,7 +75,9 @@ def paginate_with_extension(dataset, per_page, page, table_name)
       end
 
       records = paged_dataset.all
-      records.each { |x| x.values.delete(:tmp_deferred_id) }
+
+      has_tmp_deferred_id = records.first&.keys&.include?(:tmp_deferred_id)
+      records.each { |x| x.values.delete(:tmp_deferred_id) } if has_tmp_deferred_id
 
       [records, count]
     end