activerecord-filter 6.0.0.7 → 6.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f04e35c30cfd4a96db7ba90fa1221a808121bacde16bdb70080e105274ae33d5
-  data.tar.gz: 5aabf016e7b0cec65b87b09f191fd0da5eb55b0f48cdf94cf4f1727b2c0867af
+  metadata.gz: 02d2dcb9fb2f2fce2bcd28836c71fda9835fafcf85917a2dc0ce7366e7ce2446
+  data.tar.gz: f48abf819e7b5229f3b16176eb93a04d95190358d68267ddf9228590422e5ecf
 SHA512:
-  metadata.gz: af710f6e3adfd0b3dab81c34a9ae1b2578e9d6047f81c0fed362e30dd97a06ee110eb189eb670bd3e0875792196a36f574e35051585aef37ec0eaca4b4849b69
-  data.tar.gz: 869eab8791079a03a395f45ce510d31f05fb0399914ab6996cf8ef4ff4f3450da6a70941cd6068c24a193d4923ac12a539aea4620f16da292c9ae610b77a4419
+  metadata.gz: d9ee89bb0e6352d38c0fc2455074c904ceb2ab665495b7f7fdf3c30434ac1576fd778b417cecd2ecf1028437e170927b512ec470ffedabe513672aaf1c273e1e
+  data.tar.gz: 2d8014c494e72c3f77f9b7c4c6021713b90de72218c6929ffc28b848ab5491f75ce32091acbe55f5e136e87b2dbbf32266de6b14fb3547d6a98273217bd0fbf8

data/README.md

@@ -1,6 +1,6 @@
-# ActiveRecord::filter
+# ActiveRecord::Filter
 
-`ActiveRecord::filter` provides and easy way to accept user input and filter a query by the input.
+`ActiveRecord::Filter` provides and easy way to accept user input and filter a query by the input.
 
 Installtion
 -----------
@@ -73,6 +73,9 @@ String columns:
 Property.filter(name: {like: 'nam%'}).to_sql
 # => "... WHERE properties.name LIKE 'nam%' ..."
 
+Property.filter(name: {ilike: 'nam%'}).to_sql
+# => "... WHERE properties.name ILIKE 'nam%' ..."
+
 Property.filter(name: {ts_match: 'name'}).to_sql
 # => "... WHERE to_tsvector("properties"."name") @@ to_tsquery('name') ..."
 ```
@@ -125,6 +128,6 @@ It can also sort on relations:
 
 ```ruby
 Photo.filter(property: {name: 'Empire State'}).to_sql
-# => "... INNER JOIN properties ON properties.id = photos.property_id ...
+# => "... LEFT OUTER JOIN properties ON properties.id = photos.property_id ...
 # => "... WHERE properties.name = 'Empire State'"
-```
+```

data/lib/active_record/filter.rb

@@ -4,6 +4,20 @@ require 'arel/extensions'
 class ActiveRecord::UnkownFilterError < NoMethodError
 end
 
+class ActiveRecord::Associations::AliasTracker
+
+  def initialize(connection, aliases)
+    @aliases    = aliases
+    @connection = connection
+    @relation_trail = {}
+  end
+  
+  def aliased_table_for_relation(trail, arel_table, &block)
+    @relation_trail[trail] ||= aliased_table_for(arel_table, &block)
+  end
+  
+end
+
 module ActiveRecord::Filter
 
   delegate :filter, :filter_for, to: :all
@@ -60,16 +74,21 @@ module ActiveRecord
           elsif reflection = klass._reflections[key.to_s]
             if value.is_a?(Hash)
               relations << if reflection.polymorphic?
-                join_klass = value[:as].safe_constantize
-
-                right_table = join_klass.arel_table.alias("#{join_klass.table_name}_as_#{reflection.name}")
+                value = value.dup
+                join_klass = value.delete(:as).safe_constantize
+                right_table = join_klass.arel_table
                 left_table = reflection.active_record.arel_table
 
                 on = right_table[join_klass.primary_key].
                   eq(left_table[reflection.foreign_key]).
                   and(left_table[reflection.foreign_type].eq(join_klass.name))
 
-                left_table.join(right_table, Arel::Nodes::OuterJoin).on(on).join_sources
+                cross_boundry_joins = join_klass.left_outer_joins(ActiveRecord::PredicateBuilder.filter_joins(join_klass, value).flatten).send(:build_joins, [])
+
+                [
+                  left_table.join(right_table, Arel::Nodes::OuterJoin).on(on).join_sources,
+                  cross_boundry_joins
+                ]
               else
                 {
                   key => build_filter_joins(reflection.klass, value, [], custom)
@@ -84,7 +103,7 @@ module ActiveRecord
             elsif value != true && value != false && value != 'true' && value != 'false' && !value.nil?
               relations << key
             end
-          elsif !klass.columns_hash.has_key?(key.to_s) && key.to_s.ends_with?('_ids') && reflection = klass._reflections[key.to_s.gsub(/_ids$/, 's')]
+          elsif !klass.columns_hash.has_key?(key.to_s) && key.to_s.end_with?('_ids') && reflection = klass._reflections[key.to_s.gsub(/_ids$/, 's')]
             relations << reflection.name
           elsif reflection = klass.reflect_on_all_associations(:has_and_belongs_to_many).find {|r| r.join_table == key.to_s && value.keys.first.to_s == r.association_foreign_key.to_s }
             reflection = klass._reflections[klass._reflections[reflection.name.to_s].send(:delegate_reflection).options[:through].to_s]
@@ -142,7 +161,7 @@ module ActiveRecord
           expand_filter_for_column(key, column, value, relation_trail)
         elsif relation = klass.reflect_on_association(key)
           expand_filter_for_relationship(relation, value, relation_trail, alias_tracker)
-        elsif key.to_s.ends_with?('_ids') && relation = klass.reflect_on_association(key.to_s.gsub(/_ids$/, 's'))
+        elsif key.to_s.end_with?('_ids') && relation = klass.reflect_on_association(key.to_s.gsub(/_ids$/, 's'))
           expand_filter_for_relationship(relation, {id: value}, relation_trail, alias_tracker)
         elsif relation = klass.reflect_on_all_associations(:has_and_belongs_to_many).find {|r| r.join_table == key.to_s && value.keys.first.to_s == r.association_foreign_key.to_s }
           expand_filter_for_join_table(relation, value, relation_trail, alias_tracker)
@@ -160,7 +179,7 @@ module ActiveRecord
     end
 
     def expand_filter_for_column(key, column, value, relation_trail)
-      attribute = table.arel_attribute(column.name)
+      attribute = table.arel_table[column.name]
       relation_trail.each do |rt|
         attribute = Arel::Attributes::Relation.new(attribute, rt)
       end
@@ -196,13 +215,13 @@ module ActiveRecord
     def expand_filter_for_arel_attribute(column, attribute, key, value)
       case key.to_sym
       when :contains
-        attribute.contains(column.array ? Array(value) : value)
+        attribute.contains(Arel::Nodes::Casted.new(column.array ? Array(value) : value, attribute))
       when :contained_by
-        attribute.contained_by(column.array ? Array(value) : value)
+        attribute.contained_by(Arel::Nodes::Casted.new(column.array ? Array(value) : value, attribute))
       when :equal_to, :eq
         attribute.eq(value)
       when :excludes
-        attribute.excludes(Array(value))
+        attribute.excludes(Arel::Nodes::Casted.new(column.array ? Array(value) : value, attribute))
       when :greater_than, :gt
         attribute.gt(value)
       when :greater_than_or_equal_to, :gteq, :gte
@@ -238,14 +257,16 @@ module ActiveRecord
         attribute.lt(value)
       when :less_than_or_equal_to, :lteq, :lte
         attribute.lteq(value)
-      when :like, :ilike
-        attribute.matches(value)
+      when :like
+        attribute.matches(value, nil, true)
+      when :ilike
+        attribute.matches(value, nil, false)
       when :not, :not_equal, :neq
         attribute.not_eq(value)
       when :not_in
         attribute.not_in(value)
       when :overlaps
-        attribute.overlaps(value)
+        attribute.overlaps(Arel::Nodes::Casted.new(column.array ? Array(value) : value, attribute))
       when :not_overlaps
         attribute.not_overlaps(value)
       when :ts_match
@@ -277,14 +298,14 @@ module ActiveRecord
         if value == true || value == 'true'
           counter_cache_column_name = relation.counter_cache_column || "#{relation.plural_name}_count"
           if relation.active_record.column_names.include?(counter_cache_column_name.to_s)
-            return table.arel_attribute(counter_cache_column_name.to_sym).gt(0)
+            return table.arel_table[counter_cache_column_name.to_sym].gt(0)
           else
             raise "Not Supported: #{relation.name}"
           end
         elsif value == false || value == 'false'
           counter_cache_column_name = relation.counter_cache_column || "#{relation.plural_name}_count"
           if relation.active_record.column_names.include?(counter_cache_column_name.to_s)
-            return table.arel_attribute(counter_cache_column_name.to_sym).eq(0)
+            return table.arel_table[counter_cache_column_name.to_sym].eq(0)
           else
             raise "Not Supported: #{relation.name}"
           end
@@ -292,33 +313,31 @@ module ActiveRecord
 
       when :belongs_to
         if value == true || value == 'true'
-          return table.arel_attribute(relation.foreign_key).not_eq(nil)
+          return table.arel_table[relation.foreign_key].not_eq(nil)
         elsif value == false || value == 'false' || value.nil?
-          return table.arel_attribute(relation.foreign_key).eq(nil)
+          return table.arel_table[relation.foreign_key].eq(nil)
         end
       end
 
-      builder = if relation.polymorphic?
+      if relation.polymorphic?
         value = value.dup
         klass = value.delete(:as).safe_constantize
 
-        self.class.new(TableMetadata.new(
-          klass,
-          Arel::Table.new("#{klass.table_name}_as_#{relation.name}", type_caster: klass.type_caster),
+        builder = self.class.new(TableMetadata.new(
+          klass,          
+          alias_tracker.aliased_table_for_relation(relation_trail + ["#{klass.table_name}_as_#{relation.name}"], klass.arel_table) { klass.arel_table.name },
           relation
         ))
+        builder.build_from_filter_hash(value, relation_trail + ["#{klass.table_name}_as_#{relation.name}"], alias_tracker)
       else
-        self.class.new(TableMetadata.new(
+        builder = self.class.new(TableMetadata.new(
           relation.klass,
-          alias_tracker.aliased_table_for(
-            relation.table_name,
-            relation.alias_candidate(table.send(:arel_table).name),
-            relation.klass.type_caster
-          ),
+          alias_tracker.aliased_table_for_relation(relation_trail + [relation.name], relation.klass.arel_table) { relation.alias_candidate(table.arel_table.name || relation.klass.arel_table) },
           relation
         ))
+        builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
       end
-      builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
+
     end
 
 
@@ -326,11 +345,7 @@ module ActiveRecord
       relation = relation.active_record._reflections[relation.active_record._reflections[relation.name.to_s].send(:delegate_reflection).options[:through].to_s]
       builder = self.class.new(TableMetadata.new(
         relation.klass,
-        alias_tracker.aliased_table_for(
-          relation.table_name,
-          relation.alias_candidate(table.send(:arel_table).name),
-          relation.klass.type_caster
-        ),
+        alias_tracker.aliased_table_for_relation(relation_trail + [relation.name], relation.klass.arel_table) { relation.alias_candidate(table.arel_table.name || relation.klass.arel_table) },
         relation
       ))
       builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
@@ -417,14 +432,14 @@ class ActiveRecord::Relation
       @filter_clause_factory ||= FilterClauseFactory.new(klass, predicate_builder)
     end
 
-    def build_arel(aliases)
+    def build_arel(aliases = nil)
       arel = super
       my_alias_tracker = ActiveRecord::Associations::AliasTracker.create(connection, table.name, [])
       build_filters(arel, my_alias_tracker)
       arel
     end
 
-    def build_filters(manager, aliases)
+    def build_filters(manager, alias_tracker)
       @filters.each do |filters|
         manager.where(filter_clause_factory.build(filters, alias_tracker).ast)
       end

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '6.0.0.7'
+    VERSION = '6.1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 6.0.0.7
+  version: 6.1.0.2
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: arel-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.8
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.8
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord