Checking boundable not only `IN` clause but also `NOT IN` clause

2 files changed, 16 insertions, 0 deletions

diff --git a/activerecord/lib/arel/nodes/bind_param.rb b/activerecord/lib/arel/nodes/bind_param.rb
index 91e9b2b70f..ba8340558a 100644
--- a/activerecord/lib/arel/nodes/bind_param.rb
+++ b/activerecord/lib/arel/nodes/bind_param.rb
@@ -23,6 +23,10 @@ module Arel # :nodoc: all
       def nil?
         value.nil?
       end
+
+      def boundable?
+        !value.respond_to?(:boundable?) || value.boundable?
+      end
     end
   end
 end
diff --git a/activerecord/lib/arel/visitors/to_sql.rb b/activerecord/lib/arel/visitors/to_sql.rb
index 7ce26884a5..8e56fb55a2 100644
--- a/activerecord/lib/arel/visitors/to_sql.rb
+++ b/activerecord/lib/arel/visitors/to_sql.rb
@@ -579,6 +579,10 @@ module Arel # :nodoc: all
         end
 
         def visit_Arel_Nodes_In(o, collector)
+          if Array === o.right && !o.right.empty?
+            o.right.keep_if { |value| boundable?(value) }
+          end
+
           if Array === o.right && o.right.empty?
             collector << "1=0"
           else
@@ -589,6 +593,10 @@ module Arel # :nodoc: all
         end
 
         def visit_Arel_Nodes_NotIn(o, collector)
+          if Array === o.right && !o.right.empty?
+            o.right.keep_if { |value| boundable?(value) }
+          end
+
           if Array === o.right && o.right.empty?
             collector << "1=1"
           else
@@ -788,6 +796,10 @@ module Arel # :nodoc: all
           }
         end
 
+        def boundable?(value)
+          !value.respond_to?(:boundable?) || value.boundable?
+        end
+
         def has_join_sources?(o)
           o.relation.is_a?(Nodes::JoinSource) && !o.relation.right.empty?
         end