Only remove SequelPaginator tmp field when present

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