From 7030e7d0dfe0116ab56c9ab1d23d7f711ad9986d Mon Sep 17 00:00:00 2001 From: Sam Gunaratne Date: Tue, 8 Oct 2024 11:51:06 -0600 Subject: [PATCH] Only remove SequelPaginator tmp field when present --- lib/cloud_controller/paging/sequel_paginator.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/cloud_controller/paging/sequel_paginator.rb b/lib/cloud_controller/paging/sequel_paginator.rb index 7e1259f3df..a7cf0882c4 100644 --- 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