1 files changed, 15 insertions, 1 deletions
diff --git a/lib/gitlab/graphql/pagination/keyset/order_info.rb b/lib/gitlab/graphql/pagination/keyset/order_info.rb
index f54695ddb9a..f3ce3a10703 100644
--- a/lib/gitlab/graphql/pagination/keyset/order_info.rb
+++ b/lib/gitlab/graphql/pagination/keyset/order_info.rb
@@ -94,6 +94,10 @@ module Gitlab
               [order_value.expr.expressions[0].name.to_s, order_value.direction, order_value.expr]
             elsif ordering_by_similarity?(order_value)
               ['similarity', order_value.direction, order_value.expr]
+            elsif ordering_by_case?(order_value)
+              ['case_order_value', order_value.direction, order_value.expr]
+            elsif ordering_by_array_position?(order_value)
+              ['array_position', order_value.direction, order_value.expr]
             else
               [order_value.expr.name, order_value.direction, nil]
             end
@@ -104,9 +108,19 @@ module Gitlab
             order_value.expr.is_a?(Arel::Nodes::NamedFunction) && order_value.expr&.name&.downcase == 'lower'
           end
 
+          # determine if ordering using ARRAY_POSITION, eg. "ORDER BY ARRAY_POSITION(Array[4,3,1,2]::smallint, state)"
+          def ordering_by_array_position?(order_value)
+            order_value.expr.is_a?(Arel::Nodes::NamedFunction) && order_value.expr&.name&.downcase == 'array_position'
+          end
+
           # determine if ordering using SIMILARITY scoring based on Gitlab::Database::SimilarityScore
           def ordering_by_similarity?(order_value)
-            order_value.to_sql.match?(/SIMILARITY\(.+\*/)
+            Gitlab::Database::SimilarityScore.order_by_similarity?(order_value)
+          end
+
+          # determine if ordering using CASE
+          def ordering_by_case?(order_value)
+            order_value.expr.is_a?(Arel::Nodes::Case)
           end
         end
       end