activerecord-filter 6.0.0.5 → 6.0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ef3877f5047f8f16789ea877a6c421cbeeba6cfba9bea4890bcce2aaaec09b2
-  data.tar.gz: e16bb046aa1e24771725827fddeaaf303e47482ce25433c1a143cc5df8e89bb6
+  metadata.gz: c34aa8bbd31df158c37ad5a80c46c31dff156bfb2a6e0bbb7e699d8919eb9aa1
+  data.tar.gz: eb154ad06ccc2b7b24c4b7ebea90bd4708b95a92db2b7d8fd92f74e2ca71c4c6
 SHA512:
-  metadata.gz: 491c8cbdc786ae5ee5ad860e65c5ee58ac7d8b73095e0796dfc95d151ccab22f490b50bcc6b56089725fda38dd897100b02a6398ac41e119c194733eb0e420a4
-  data.tar.gz: 65ff30c9eee91d80198d78ad4b86cb71a14cacec38cc181af1081b3f1a69af84453f61c56413111b0da01affd5fe2fd89174dda10c4032f1ec81f54a6b0e254a
+  metadata.gz: 8d715a7a707abc56c16512e2aee2fe4fd4995e82466c3651d2caf14d38bb72f0201e0445c72614c4d295d05ccc6adf66666a1287644b33612d14aa472de804b9
+  data.tar.gz: 2f4535f34a7e762c4ce68abb18530e7f0b9ca9b7f8bd6a16e6389626f806806bc89a486104c17d61cb7361dc106437a203d0fe598ce8ace34136c23048282b66

data/lib/active_record/filter.rb

@@ -59,9 +59,22 @@ module ActiveRecord
             end
           elsif reflection = klass._reflections[key.to_s]
             if value.is_a?(Hash)
-              relations << {
-                key => build_filter_joins(reflection.klass, value, [], custom)
-              }
+              relations << if reflection.polymorphic?
+                join_klass = value[:as].safe_constantize
+
+                right_table = join_klass.arel_table.alias("#{join_klass.table_name}_as_#{reflection.name}")
+                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
+              else
+                {
+                  key => build_filter_joins(reflection.klass, value, [], custom)
+                }
+              end
             elsif value.is_a?(Array)
               value.each do |v|
                 relations << {
@@ -276,6 +289,7 @@ module ActiveRecord
             raise "Not Supported: #{relation.name}"
           end
         end
+
       when :belongs_to
         if value == true || value == 'true'
           return table.arel_attribute(relation.foreign_key).not_eq(nil)
@@ -284,26 +298,32 @@ module ActiveRecord
         end
       end
 
-      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 = 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),
+          relation
+        ))
+      else
+        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
+        ))
+      end
       builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
     end
 
 
     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]
-      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(
@@ -380,7 +400,15 @@ class ActiveRecord::Relation
 
     def filter!(filters)
       js = ActiveRecord::PredicateBuilder.filter_joins(klass, filters)
-      js.each { |j| joins!(j) if j.present? }
+      js.flatten.each do |j|
+        if j.is_a?(String)
+          joins!(j)
+        elsif j.is_a?(Arel::Nodes::Join)
+          joins!(j)
+        elsif j.present?
+          left_outer_joins!(j)
+        end
+      end
       @filters << filters
       self
     end

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '6.0.0.5'
+    VERSION = '6.0.0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 6.0.0.5
+  version: 6.0.0.6
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord