Merge pull request #29282 from kamipo/prevent_making_bind_param_if_casted_value_is_nil

Prevent making bind param if casted value is nil

2 files changed, 13 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index a6309e0b5c..7dea5deec5 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -107,21 +107,26 @@ module ActiveRecord
             first = value.begin
             last = value.end
             unless first.respond_to?(:infinite?) && first.infinite?
-              binds << build_bind_param(column_name, first)
+              binds << build_bind_attribute(column_name, first)
               first = Arel::Nodes::BindParam.new
             end
             unless last.respond_to?(:infinite?) && last.infinite?
-              binds << build_bind_param(column_name, last)
+              binds << build_bind_attribute(column_name, last)
               last = Arel::Nodes::BindParam.new
             end
 
             result[column_name] = RangeHandler::RangeWithBinds.new(first, last, value.exclude_end?)
+          when value.is_a?(Relation)
+            binds.concat(value.bound_attributes)
           else
             if can_be_bound?(column_name, value)
-              result[column_name] = Arel::Nodes::BindParam.new
-              binds << build_bind_param(column_name, value)
-            elsif value.is_a?(Relation)
-              binds.concat(value.bound_attributes)
+              bind_attribute = build_bind_attribute(column_name, value)
+              if value.is_a?(StatementCache::Substitute) || !bind_attribute.value_for_database.nil?
+                result[column_name] = Arel::Nodes::BindParam.new
+                binds << bind_attribute
+              else
+                result[column_name] = nil
+              end
             end
           end
         end
@@ -164,7 +169,7 @@ module ActiveRecord
         end
       end
 
-      def build_bind_param(column_name, value)
+      def build_bind_attribute(column_name, value)
         Relation::QueryAttribute.new(column_name.to_s, value, table.type(column_name))
       end
   end
diff --git a/activerecord/lib/active_record/relation/where_clause_factory.rb b/activerecord/lib/active_record/relation/where_clause_factory.rb
index 04bee73e8f..b862dd56a5 100644
--- a/activerecord/lib/active_record/relation/where_clause_factory.rb
+++ b/activerecord/lib/active_record/relation/where_clause_factory.rb
@@ -57,7 +57,7 @@ module ActiveRecord
             else
               column = klass.column_for_attribute(attribute)
 
-              binds << predicate_builder.send(:build_bind_param, attribute, value)
+              binds << predicate_builder.send(:build_bind_attribute, attribute, value)
               value = Arel::Nodes::BindParam.new
 
               predicate = if options[:case_sensitive]