Merge pull request #47 from patterninc/GRO-15761_Incorrect-Sorting-for-Descending-Order

[GRO-15761] Added new attribute on class SqlSort which would keep nul…

Author: NileshN

.github/workflows/brakeman.yml

@@ -17,7 +17,7 @@ jobs:
           bundler-cache: true
 
       - name: Brakeman install
-        run: gem install brakeman
+        run: gem install brakeman -v 5.4.1
 
       - name: brakeman
         id: brakeman

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_helper (0.3.5)
+    query_helper (0.3.6)
       activerecord (> 5)
       activesupport (> 5)
       sqlite3
@@ -89,7 +89,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    sqlite3 (1.6.2)
+    sqlite3 (1.6.4)
       mini_portile2 (~> 2.8.0)
     thor (1.1.0)
     tzinfo (2.0.4)

lib/query_helper/sql_sort.rb

@@ -5,12 +5,13 @@ class SqlSort
 
     attr_accessor :column_maps, :select_strings, :sort_tiebreak, :column_sort_order
 
-    def initialize(sort_string: "", sort_tiebreak: "", column_maps: [], column_sort_order: {})
+    def initialize(sort_string: "", sort_tiebreak: "", column_maps: [], column_sort_order: {}, keep_nulls_last: false)
       @sort_string = sort_string
       @column_maps = column_maps
       @sort_tiebreak = sort_tiebreak
       @column_sort_order = column_sort_order
       @select_strings = []
+      @keep_nulls_last = keep_nulls_last
     end
 
     def parse_sort_string
@@ -41,12 +42,12 @@ def attributes_sql_expression(sort_attribute)
           if direction == "desc"
             case ActiveRecord::Base.connection.adapter_name
             when "SQLite" # SQLite is used in the test suite
-              direction = "desc"
+              direction = @keep_nulls_last ? "desc nulls last" : "desc"
             else
               direction = "desc nulls last"
             end
           else
-            direction = "asc"
+            direction = @keep_nulls_last ? "asc nulls last" : "asc"
           end
 
           case modifier

lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end