effective_datatables 2.1.15 → 2.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6dfe9f0b9ba5357af62f40f291e1cb458fc0fb2
-  data.tar.gz: 3ecaba062fc0c5050ea99b4cda86cf5aac2a8be5
+  metadata.gz: 66e34e1b67e2fc97fba5d01227d7878a55e3c102
+  data.tar.gz: 2a245701fa04c1baee5fd25458203a31836e847a
 SHA512:
-  metadata.gz: 14988d2a7879a5bd388e02cab3243d0658cad0189f96188cb3e1f68b14fe06e00248900aa37dd74cbc445061404c4a75b6f8114c60bab2df329a11c78b7a9b2c
-  data.tar.gz: 31b81c5aa261fe824376dcd4276e06cc57597ce84fd81ec65a3367de20cf3062646d76a843e66373d7de0cbba0e7d3e2dd552295241738157efc866d44c395a6
+  metadata.gz: 45e18b50fccd9e485b31e826141e9014cfd194288b78977cff12b4bdb875b9fba1543fc5a178a4d49532be0c86cda53ba2f44a2ad96b49c6d27eca496c86f82a
+  data.tar.gz: c99ffe12d35229644454a8ab5ee31a09ea86c2102fb2befb67b8d2edea5deca5524a35ba4bf6cd763ceb3029844dfe4060b9b7f8398cbbc33427819d2646af2e

data/app/models/effective/active_record_datatable_tool.rb

@@ -2,7 +2,7 @@ module Effective
   class ActiveRecordDatatableTool
     attr_accessor :table_columns
 
-    delegate :order_name, :order_direction, :page, :per_page, :search_column, :collection_class, :to => :@datatable
+    delegate :order_name, :order_direction, :page, :per_page, :search_column, :collection_class, :quote_sql, :to => :@datatable
 
     def initialize(datatable, table_columns)
       @datatable = datatable
@@ -21,13 +21,20 @@ module Effective
       return collection if order_column.blank?
 
       column = order_column[:column]
+      before = ''; after = ''
 
-      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}")
+      if postgres?
+        after = ' NULLS LAST'
+      elsif mysql?
+        before = "ISNULL(#{column}), "
+      end
+
+      if order_column[:type] == :belongs_to_polymorphic
+        collection.order("#{before}#{column.sub('_id', '_type')} #{order_direction}, #{column} #{order_direction}#{after}")
+      elsif order_column[:sql_as_column] == true
+        collection.order("#{column} #{order_direction}")
       else
-        collection.order("COALESCE(#{column}, '') #{order_direction}")
+        collection.order("#{before}#{column} #{order_direction}#{after}")
       end
     end
 
@@ -49,14 +56,14 @@ module Effective
         if (table_column[:filter][:type] == :select && table_column[:filter][:fuzzy] != true) || sql_op != :where
           collection.public_send(sql_op, "#{column} = :term", term: term)
         else
-          collection.public_send(sql_op, "#{column} ILIKE :term", term: "%#{term}%")
+          collection.public_send(sql_op, "#{column} #{ilike} :term", term: "%#{term}%")
         end
       when :belongs_to_polymorphic
         # our key will be something like Post_15, or Event_1
         (type, id) = term.split('_')
 
         if type.present? && id.present?
-          collection.public_send(sql_op, "#{column} = :id AND #{column.sub('_id"', '_type"')} = :type", id: id, type: type)
+          collection.public_send(sql_op, "#{column} = :id AND #{column.sub('_id', '_type')} = :type", id: id, type: type)
         else
           collection
         end
@@ -85,7 +92,7 @@ module Effective
       when :effective_address
         ids = Effective::Address
           .where('addressable_type = ?', collection_class.name)
-          .where('address1 ILIKE :term OR address2 ILIKE :term OR city ILIKE :term OR postal_code ILIKE :term OR state_code = :code OR country_code = :code', term: "%#{term}%", code: term)
+          .where("address1 #{ilike} :term OR address2 #{ilike} :term OR city #{ilike} :term OR postal_code #{ilike} :term OR state_code = :code OR country_code = :code", term: "%#{term}%", code: term)
           .pluck(:addressable_id)
 
         collection.public_send(sql_op, id: ids)
@@ -137,5 +144,21 @@ module Effective
       collection.page(page).per(per_page)
     end
 
+    protected
+
+    def postgres?
+      return @postgres unless @postgres.nil?
+      @postgres ||= (collection_class.connection.kind_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) rescue false)
+    end
+
+    def mysql?
+      return @mysql unless @mysql.nil?
+      @mysql ||= (collection_class.connection.kind_of?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) rescue false)
+    end
+
+    def ilike
+      @ilike ||= (postgres? ? 'ILIKE' : 'LIKE')  # Only Postgres supports ILIKE, Mysql and Sqlite3 use LIKE
+    end
+
   end
 end

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

@@ -8,6 +8,10 @@ module Effective
         @table_columns = initialize_column_options(@table_columns)
       end
 
+      def quote_sql(name)
+        collection_class.connection.quote_column_name(name) rescue name
+      end
+
       protected
 
       def initialize_column_options(cols)
@@ -47,7 +51,7 @@ module Effective
           cols[name][:array_index] = index # The index of this column in the collection, regardless of hidden table_columns
           cols[name][:name] ||= name
           cols[name][:label] ||= name.titleize
-          cols[name][:column] ||= (sql_table && sql_column) ? "\"#{sql_table.name}\".\"#{sql_column.name}\"" : name
+          cols[name][:column] ||= (sql_table && sql_column) ? "#{quote_sql(sql_table.name)}.#{quote_sql(sql_column.name)}" : name
           cols[name][:width] ||= nil
           cols[name][:sortable] = true if cols[name][:sortable].nil?
           cols[name][:visible] = true if cols[name][:visible].nil?
@@ -89,7 +93,7 @@ module Effective
           # EffectiveRoles, if you do table_column :roles, everything just works
           if name == 'roles' && defined?(EffectiveRoles) && collection.respond_to?(:with_role)
             cols[name][:sortable] = true
-            cols[name][:column] = sql_table.present? ? "\"#{sql_table.name}\".\"roles_mask\"" : name
+            cols[name][:column] = sql_table.present? ? "#{quote_sql(sql_table.name)}.#{quote_sql('roles_mask')}" : name
             cols[name][:type] = :effective_roles
           end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.1.15'.freeze
+  VERSION = '2.1.16'.freeze
 end

metadata

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