effective_datatables 2.1.13 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c93fe59f1b8b37e77d7c6378d70eabc24472d6
-  data.tar.gz: 975e8314174671de14e44628f5471f4b9e1a22d7
+  metadata.gz: e90ec2c77193da9eb07f632193c5cf1714a8c121
+  data.tar.gz: c52a0ff93cc7aa36593309bdeb301cdcc7ee675d
 SHA512:
-  metadata.gz: 3dc2d7c92bdebc4a3825b001f6de71bcffd314f35f85d5357e7ce888ddf0518a2099f8b92d7ddc0e7c72eaafcfb318b996431d2ae0043f24c1a11173d77f0de2
-  data.tar.gz: cb825d287eef00abe406ed95ea5c2998212276f126853126023275579f1cd04278df3ffee4632b5939d3842474025dc12970c3160957ce356c7fad8720575002
+  metadata.gz: eabd2993073736222a0396e30a702c8f4d3c8266f351315d1b72b74cb6cf445cc43a9c0eedf97f0c6c384de0d6ee35ac53dbe843fa5f1ee5246f2d99abc05c68
+  data.tar.gz: 37376c4a58bdf27a70f6681621aad9b8bc7e9a74505efa2fc61f556690252c84efa57e442e13722797d26caae4833d54983435f3c76b4fa6f28e4ccfa62ca410

data/app/models/effective/active_record_datatable_tool.rb

@@ -25,9 +25,9 @@ module Effective
       if [:string, :text].include?(order_column[:type]) && order_column[:sql_as_column] != true
         collection.order("COALESCE(#{column}, '') #{order_direction}")
       elsif order_column[:type] == :belongs_to_polymorphic
-        collection.order("(#{column.sub('_id"', '_type"')}, #{column}) #{order_direction} NULLS LAST")
+        collection.order("(#{column.sub('_id"', '_type"')}, #{column}) #{order_direction}")
       else
-        collection.order("#{column} #{order_direction} NULLS LAST")
+        collection.order("COALESCE(#{column}, '') #{order_direction}")
       end
     end
 
@@ -117,6 +117,8 @@ module Effective
         rescue => e
           collection
         end
+      when :boolean
+        collection.public_send(sql_op, "#{column} = :term", term: [1, 'true', 'yes'].include?(term.to_s.downcase))
       when :integer
         collection.public_send(sql_op, "#{column} = :term", term: term.gsub(/\D/, '').to_i)
       when :year

data/app/models/effective/datatable.rb

@@ -89,9 +89,9 @@ module Effective
           # https://github.com/rails/rails/issues/15331
           if collection_class.connection.respond_to?(:unprepared_statement)
             collection_sql = collection_class.connection.unprepared_statement { collection.to_sql }
-            (collection_class.connection.execute("SELECT COUNT(*) FROM (#{collection_sql}) AS datatables_total_count").first['count'] rescue 1).to_i
+            (collection_class.connection.execute("SELECT COUNT(*) FROM (#{collection_sql}) AS datatables_total_count").first.values.first rescue 1).to_i
           else
-            (collection_class.connection.execute("SELECT COUNT(*) FROM (#{collection.to_sql}) AS datatables_total_count").first['count'] rescue 1).to_i
+            (collection_class.connection.execute("SELECT COUNT(*) FROM (#{collection.to_sql}) AS datatables_total_count").first.values.first rescue 1).to_i
           end
         else
           collection.size

data/app/models/effective/effective_datatable/rendering.rb

@@ -24,9 +24,9 @@ module Effective
             if collection_class.connection.respond_to?(:unprepared_statement)
               # https://github.com/rails/rails/issues/15331
               col_sql = collection_class.connection.unprepared_statement { col.to_sql }
-              self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col_sql}) AS datatables_filtered_count").first['count'] rescue 1).to_i
+              self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col_sql}) AS datatables_filtered_count").first.values.first rescue 1).to_i
             else
-              self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_filtered_count").first['count'] rescue 1).to_i
+              self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_filtered_count").first.values.first rescue 1).to_i
             end
           end
         end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.1.13'.freeze
+  VERSION = '2.1.14'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.14
 platform: ruby
 authors:
 - Code and Effect