From 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Sep 2021 13:18:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-3-stable-ee --- lib/gitlab/pagination/keyset/column_order_definition.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib/gitlab/pagination/keyset/column_order_definition.rb') diff --git a/lib/gitlab/pagination/keyset/column_order_definition.rb b/lib/gitlab/pagination/keyset/column_order_definition.rb index 0755af9587b..2b968c4253f 100644 --- a/lib/gitlab/pagination/keyset/column_order_definition.rb +++ b/lib/gitlab/pagination/keyset/column_order_definition.rb @@ -173,6 +173,18 @@ module Gitlab distinct end + def order_direction_as_sql_string + sql_string = ascending_order? ? +'ASC' : +'DESC' + + if nulls_first? + sql_string << ' NULLS FIRST' + elsif nulls_last? + sql_string << ' NULLS LAST' + end + + sql_string + end + private attr_reader :reversed_order_expression, :nullable, :distinct -- cgit v1.2.1