1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/pagination/keyset/in_operator_optimization/strategies/record_loader_strategy.rb b/lib/gitlab/pagination/keyset/in_operator_optimization/strategies/record_loader_strategy.rb
index 4f79a3593f4..786ae282c88 100644
--- a/lib/gitlab/pagination/keyset/in_operator_optimization/strategies/record_loader_strategy.rb
+++ b/lib/gitlab/pagination/keyset/in_operator_optimization/strategies/record_loader_strategy.rb
@@ -14,6 +14,7 @@ module Gitlab
               @finder_query = finder_query
               @order_by_columns = order_by_columns
               @table_name = model.table_name
+              @model = model
             end
 
             def initializer_columns
@@ -30,7 +31,11 @@ module Gitlab
             end
 
             def final_projections
-              ["(#{RECORDS_COLUMN}).*"]
+              if @model.default_select_columns.is_a?(Array)
+                @model.default_select_columns.map { |column| "(#{RECORDS_COLUMN}).#{column.name}" }
+              else
+                ["(#{RECORDS_COLUMN}).*"]
+              end
             end
 
             private