activerecord-filter 5.0.0.5 → 5.0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0891c91632adac443eea01685d08f599c16b61f0
-  data.tar.gz: 893066947ef4c7ece89f7e7a613d2a51cd272bae
+  metadata.gz: 7ebd77f99aa6b3919c780144570afccb9020e970
+  data.tar.gz: 9bb379f8e4148ca004c7b5823efcb56b95b2c952
 SHA512:
-  metadata.gz: 27671c1a861dceecdb5c466d49bbcf9dd940cd9c892ede60e7444b322dadabfe35a838d6a2bf06b867eee16a32466dd979f790ccb9e30fc69c4b5a434bc89e96
-  data.tar.gz: 14ebd489fac3b544474b00c0e5ea8a12e9ac2a06d16b75856531b6eba3eec86e158bf812e122373c636a8d37eb82a41247ceaa793324b641ff8360de4044c9a1
+  metadata.gz: cafc7b16939a790e9a134e0a7266f14424ab1e9f5d18543c7edf1f7437254592b48c68bd0f85ccb87aee55eb03ad27ea4b24f252223b6ee617747beed216430d
+  data.tar.gz: f128d2aee5a42cdbb6c4f6dea4f772aaf30f7bfae9f407b0d60a950bf56fdb347389049e2adc7858734d919b0fd366bc00b2ee2e2d354c9c92f080867564940a

data/lib/active_record/filter.rb

@@ -92,7 +92,7 @@ module ActiveRecord::Filter
           when :not
             resource.where(table[column].not_eq(converted_value))
           when :not_in
-            resource.where(table[column].not_in(converted_value).or(table[column].eq(nil)))
+            resource.where(table[column].not_in(converted_value))
           when :like, :ilike
             resource.where(table[column].matches(converted_value))
           when :ts_match
@@ -188,7 +188,7 @@ module ActiveRecord::Filter
         when :has_key
           resource.where(column.has_key(value))
         when :not_in
-          resource.where(column.not_in(value).or(column.eq(nil)))
+          resource.where(column.not_in(value))
         else
           raise 'Not supported'
         end
@@ -285,6 +285,11 @@ module ActiveRecord::Filter
 
   def filter_for_belongs_to(relation, value)
     resource = all
+    
+    options = {}
+    if connection.class.name == 'ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter'
+      options[:table_alias] = relation.name
+    end
 
     if value.is_a?(Array) || value.is_a?(Integer) || value.is_a?(NilClass)
       resource = resource.where(:"#{relation.foreign_key}" => value)
@@ -302,10 +307,10 @@ module ActiveRecord::Filter
         resource = resource.joins(t1.join(t2).on(
           t2[:id].eq(t1["#{relation.name}_id"]).and(t1["#{relation.name}_type"].eq(klass.name))
         ).join_sources.first)
-        resource = resource.merge(klass.filter(v))
+        resource = resource.merge(klass.filter(v, options))
       else
         resource = resource.joins(relation.name) # if !resource.references?(relation.name)
-        resource = resource.merge(relation.klass.filter(value))
+        resource = resource.merge(relation.klass.filter(value, options))
       end
     else
       if value.is_a?(String) && value =~ /\A\d+\Z/
@@ -319,4 +324,4 @@ module ActiveRecord::Filter
 
 end
 
-ActiveRecord::Base.extend(ActiveRecord::Filter)
+ActiveRecord::Base.extend(ActiveRecord::Filter)

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '5.0.0.5'
+    VERSION = '5.0.0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 5.0.0.5
+  version: 5.0.0.6
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord