activerecord-filter 6.0.0.3 → 6.0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d5c6eebcaf0ce67328ce60b589d3db745379c3e1f9e167a72b6d529c12dd242
-  data.tar.gz: 12e0734ef2c953958cdbef7725e71273d7f6173abeb9e2155c81eb5096e93f87
+  metadata.gz: 86c7f7cf36ec41fc4dae21d1460151fcf2a32a9813f13a8b0acec56ebdccfbdd
+  data.tar.gz: 9993953d4a401d46e1bfd60102162794fd6f13d496d2fcd3352534fa0601ef90
 SHA512:
-  metadata.gz: 4faa92743587408661292c04b9100929519354d194a583a0ba9fadb51e208d895ee0d79c2d188563479ce8dc51892d6678f039644ae41cccdafc53eae28c226d
-  data.tar.gz: 15acb3d28304602f7c24b2ac966f37cd809a31bd36ba4d0fed0f2a8c8d3cdfebe16eb2ea536309d05a458146b31cde62b8fd9e6c6ee1ff7b82e924c44351ff41
+  metadata.gz: 69ad9b34f9b0511a0e34d76ef819b147a5705b9d0731fdca7fdcd3b876a90d1685321386033354653c39d30d3fb96283a4e4443e5a330bc405736e3342c24e06
+  data.tar.gz: f466d0b394b040109ba460a24a1811c8f4550bdeb9ca17904a4906ee1c2f011e59bf38481e074c29e08b4f6af4ea81360352bebb65fa45e49a285377d798f291

data/lib/active_record/filter.rb

@@ -77,13 +77,13 @@ module ActiveRecord
       relations
     end
     
-    def build_from_filter_hash(attributes)
+    def build_from_filter_hash(attributes, relation_trail, alias_tracker)
       if attributes.is_a?(Array)
-        node = build_from_filter_hash(attributes.shift)
+        node = build_from_filter_hash(attributes.shift, relation_trail, alias_tracker)
 
         n = attributes.shift(2)
         while !n.empty?
-          n[1] = build_from_filter_hash(n[1])
+          n[1] = build_from_filter_hash(n[1], relation_trail, alias_tracker)
           if n[0] == 'AND'
             if node.is_a?(Arel::Nodes::And)
               node.children.push(n[1])
@@ -100,26 +100,26 @@ module ActiveRecord
         
         node
       elsif attributes.is_a?(Hash)
-        expand_from_filter_hash(attributes)
+        expand_from_filter_hash(attributes, relation_trail, alias_tracker)
       else
-        expand_from_filter_hash({id: attributes})
+        expand_from_filter_hash({id: attributes}, relation_trail, alias_tracker)
       end
     end
     
-    def expand_from_filter_hash(attributes)
+    def expand_from_filter_hash(attributes, relation_trail, alias_tracker)
       klass = table.send(:klass)
       
       children = attributes.flat_map do |key, value|
         if custom_filter = klass.filters[key]
-          self.instance_exec(klass, table, key, value, &custom_filter[:block])
+          self.instance_exec(klass, table, key, value, relation_trail, alias_tracker, &custom_filter[:block])
         elsif column = klass.columns_hash[key.to_s] || klass.columns_hash[key.to_s.split('.').first]
-          expand_filter_for_column(key, column, value)
+          expand_filter_for_column(key, column, value, relation_trail)
         elsif relation = klass.reflect_on_association(key)
-          expand_filter_for_relationship(relation, value)
+          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'))
-          expand_filter_for_relationship(relation, {id: value})
+          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)
+          expand_filter_for_join_table(relation, value, relation_trail, alias_tracker)
         else
           raise ActiveRecord::UnkownFilterError.new("Unkown filter \"#{key}\" for #{klass}.")
         end
@@ -133,21 +133,12 @@ module ActiveRecord
       end
     end
     
-    def expand_filter_for_column(key, column, value)
-      # Not sure why
-      # activerecord/lib/active_record/table_metadata.rb#arel_attribute
-      # doesn't work here, something's not working with a
-      # Arel::Nodes::TableAlias, would like to go back to it one day
-      attribute = if klass = table.send(:klass)
-        if Arel::Nodes::TableAlias === table.send(:arel_table)
-          klass.arel_attribute(column.name, table.send(:arel_table).left)
-        else
-          klass.arel_attribute(column.name, table.send(:arel_table))
-        end
-      else
-        table.send(:arel_table)[column.name]
+    def expand_filter_for_column(key, column, value, relation_trail)
+      attribute = table.arel_attribute(column.name)
+      relation_trail.each do |rt|
+        attribute = Arel::Attributes::Relation.new(attribute, rt)
       end
-
+      
       if column.type == :json || column.type == :jsonb
         names = key.to_s.split('.')
         names.shift
@@ -250,11 +241,11 @@ module ActiveRecord
           raise "Not Supported value for within: #{value.inspect}"
         end
       else
-        raise "Not Supported: #{key.to_sym}"
+        raise "Not Supported: #{key.to_sym} on column \"#{column.name}\" of type #{column.type}"
       end
     end
     
-    def expand_filter_for_relationship(relation, value)
+    def expand_filter_for_relationship(relation, value, relation_trail, alias_tracker)
       case relation.macro
       when :has_many
         if value == true || value == 'true'
@@ -279,16 +270,37 @@ module ActiveRecord
           return table.arel_attribute(relation.foreign_key).eq(nil)
         end
       end
-      
-      builder = associated_predicate_builder(relation.name.to_sym)
-      builder.build_from_filter_hash(value)
+
+      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
+        ),
+        relation
+      ))
+      builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
     end
     
-    def expand_filter_for_join_table(relation, value)
+    
+    def expand_filter_for_join_table(relation, value, relation_trail, alias_tracker)
       relation = relation.active_record._reflections[relation.active_record._reflections[relation.name.to_s].send(:delegate_reflection).options[:through].to_s]
-
-      builder = associated_predicate_builder(relation.name.to_sym)
-      builder.build_from_filter_hash(value)
+      STDOUT.puts [
+        relation.table_name,
+        relation.alias_candidate(table.send(:arel_table).name)
+        
+      ].inspect
+      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
+        ),
+        relation
+      ))
+      builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
     end
 
   end
@@ -303,14 +315,9 @@ module ActiveRecord
         @predicate_builder = predicate_builder
       end
 
-      def build(filters)
+      def build(filters, alias_tracker)
         if filters.is_a?(Hash) || filters.is_a?(Array)
-          # attributes = predicate_builder.resolve_column_aliases(filters)
-          # attributes = klass.send(:expand_hash_conditions_for_aggregates, attributes)
-          # attributes.stringify_keys!
-          #
-          # attributes, binds = predicate_builder.create_binds(attributes)
-          parts = [predicate_builder.build_from_filter_hash(filters)]
+          parts = [predicate_builder.build_from_filter_hash(filters, [], alias_tracker)]
         else
           raise ArgumentError, "Unsupported argument type: #{filters.inspect} (#{filters.class})"
         end
@@ -371,13 +378,14 @@ class ActiveRecord::Relation
     
     def build_arel(aliases)
       arel = super
-      build_filters(arel)
+      my_alias_tracker = ActiveRecord::Associations::AliasTracker.create(connection, table.name, [])
+      build_filters(arel, my_alias_tracker)
       arel
     end
     
-    def build_filters(manager)
+    def build_filters(manager, aliases)
       @filters.each do |filters|
-        manager.where(filter_clause_factory.build(filters).ast)
+        manager.where(filter_clause_factory.build(filters, alias_tracker).ast)
       end
     end
 

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '6.0.0.3'
+    VERSION = '6.0.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 6.0.0.3
+  version: 6.0.0.4
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.0.5
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement