binxtils 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae08f86d8d31882ed56c248ad820a66823606b09a5f5b429b35ea76eb5530cb7
-  data.tar.gz: 0e96c6e1230b26127f1ce6906df7b08db3d83a2b8c0bdc12d6824074ae39ac1d
+  metadata.gz: c8b4a35440c2841b1f08baf31395cdf61bed5d1c0ec4ce33cc98a5dab8f43f22
+  data.tar.gz: 9da110f74dd61abf3896e6fae12e52ccbabef082338f9cd905ad8b70dad11859
 SHA512:
-  metadata.gz: 8e0d408e004acbc45439477d6ea3e79e94f2975a3a1f4cb9a37bef1a6cbfcabf4935a884061e38e90b79fedcfe6e72f07e4aefd119c7b4a298e060d015b72924
-  data.tar.gz: 7ead69ca11aa5335956f0222b8892a29fc356067952d02c09840154bae0f41ccb530a1e70e586869363d70dc9734099b99fe9ae103b4a192ebbad1ed061f9b88
+  metadata.gz: a002ee9f7a38fa824cc20a5a0e6c9ecfdb35f55f4b905155b1d05a449e3aec4dc16019bff709b20f9c9224d5c113ffa1723677dbb7b8647a65970182515498d2
+  data.tar.gz: f89dbdb5382f6b3e608ac7742d79cd9b935becf19ed554e59b0cf7b2bc34f647d9d33bf0061f0edadcaa44e977f8e8a6a66466c307f32f2d4f8fb64abc1685eb

data/README.md

@@ -59,12 +59,12 @@ class BikesController < ApplicationController
 end
 ```
 
-Order with `sortable_order`, which applies `sort_direction` and puts nils last in both directions. It takes `sort_column` by default, or an Arel node or SQL string:
+Order with `sortable_order`, which applies `sort_direction` and puts nils last. Pass the model to order by its `sort_column` — non-null columns skip `NULLS LAST`, since an index can't serve `DESC NULLS LAST`. It also takes an Arel node or SQL string, which are treated as nullable unless you pass `nulls_last:`:
 
 ```ruby
-Bike.order(sortable_order)
+Bike.order(sortable_order(Bike))
 Bike.order(sortable_order(Bike.arel_table[sort_column].lower))
-Bike.order(sortable_order("COALESCE((data -> 'bike_count')::integer, 0)"))
+Bike.order(sortable_order("COALESCE((data -> 'bike_count')::integer, 0)", nulls_last: false))
 ```
 
 ## npm package

data/app/controllers/concerns/binxtils/sortable_table.rb

@@ -18,10 +18,15 @@ module Binxtils
       %w[asc desc].include?(params[:direction]) ? params[:direction] : default_direction
     end
 
-    # Desc puts nils last, matching asc
-    def sortable_order(expression = sort_column)
-      node = expression.respond_to?(:asc) ? expression : Arel.sql(expression)
-      node.public_send(sort_direction).nulls_last
+    # Desc puts nils last, matching asc; not for a model's non-null column, since an index can't serve DESC NULLS LAST
+    def sortable_order(expression = sort_column, nulls_last: !expression.is_a?(Class) || expression.columns_hash[sort_column]&.null != false)
+      node = if expression.is_a?(Class)
+        expression.arel_table[sort_column]
+      else
+        expression.respond_to?(:asc) ? expression : Arel.sql(expression)
+      end
+      ordering = node.public_send(sort_direction)
+      nulls_last ? ordering.nulls_last : ordering
     end
 
     def permitted_time_range_columns

data/lib/binxtils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Binxtils
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: binxtils
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Bike Index