effective_datatables 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2886ccb27eabcc82b302f81df10e2e4cc8df6382
-  data.tar.gz: d7dafdae76d0e065bf81dec0466abf23c3a1df13
+  metadata.gz: e33500ce573ca5338516e3e79dfb3c06c44dc81d
+  data.tar.gz: 6aa75a77d9bf1151deb0cfc71935086f2cb75fdd
 SHA512:
-  metadata.gz: 785d2e6b32533c2f2157858acefef240165e7619837e68b50cbc7b31a21f92a9fa992201a01e3aa957c0d4f4babd795e2e0a7a0c676ad4505de86c7986df7f3f
-  data.tar.gz: 51e9a8df9494af9138a7c6fb3a2dd158c8ce9e659cbb347ebf9944ce8096267e163bf4853bf26af8a4a9bdae6e5ff41823971b5271faa31a09851b4ae1adbe7a
+  metadata.gz: 9de12751ecd5de42f4404d52e90ff3666e1ecff389d8f6acc2e3c108a8e4493a923a9025ce192c0e86e99f72e75cbf68180b06d76fbeef925e901f336aa3838a
+  data.tar.gz: 41f47e6044204bc970b0660b7a583d5a46e17ac9725465ef763ffbe711c1580f108d24d509812c774836527f4bf8c03acb99a65502af6fb50fa5e0403a5f648d

data/app/models/effective/datatable.rb

@@ -68,17 +68,16 @@ module Effective
       end
     end
 
-
     def initialize(*args)
-      unless active_record_collection? || (collection.kind_of?(Array) && collection.first.kind_of?(Array))
-        raise "Unsupported collection type. Should be ActiveRecord class, ActiveRecord relation, or an Array of Arrays [[1, 'something'], [2, 'something else']]"
-      end
-
       if args.present?
         raise 'Effective::Datatable.new() can only be called with a Hash like arguments' unless args.first.kind_of?(Hash)
         args.first.each { |k, v| self.attributes[k] = v }
       end
 
+      unless active_record_collection? || (collection.kind_of?(Array) && collection.first.kind_of?(Array))
+        raise "Unsupported collection type. Should be ActiveRecord class, ActiveRecord relation, or an Array of Arrays [[1, 'something'], [2, 'something else']]"
+      end
+
       # Any pre-selected search terms should be assigned now
       search_terms.each { |column, term| self.send("#{column}=", term) }
     end
@@ -235,7 +234,11 @@ module Effective
 
     def total_records
       @total_records ||= (
-        if active_record_collection?
+        if active_record_collection? && collection_class.connection.respond_to?(:unprepared_statement)
+          # https://github.com/rails/rails/issues/15331
+          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
+        elsif active_record_collection?
           (collection_class.connection.execute("SELECT COUNT(*) FROM (#{collection.to_sql}) AS datatables_total_count").first['count'] rescue 1).to_i
         else
           collection.size
@@ -278,7 +281,13 @@ module Effective
         col = table_tool.search(col)
 
         if table_tool.search_terms.present? && array_tool.search_terms.blank?
-          self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_filtered_count").first['count'] rescue 1).to_i
+          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
+          else
+            self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_filtered_count").first['count'] rescue 1).to_i
+          end
         end
       end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails