1 files changed, 10 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
index de639a48f2..03ba8c8628 100644
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -22,15 +22,20 @@ module ActiveRecord
         end
       end
 
-      (Relation::MULTI_VALUE_METHODS - [:joins, :where, :order]).each do |method|
+      (Relation::MULTI_VALUE_METHODS - [:joins, :where, :order, :binds]).each do |method|
         value = r.send(:"#{method}_values")
-        merged_relation.send(:"#{method}_values=", merged_relation.send(:"#{method}_values") + value) if value.present?
+        next if value.empty?
+
+        value += merged_relation.send(:"#{method}_values")
+        merged_relation.send :"#{method}_values=", value
       end
 
       merged_relation.joins_values += r.joins_values
 
       merged_wheres = @where_values + r.where_values
 
+      merged_binds = (@bind_values + r.bind_values).uniq(&:first)
+
       unless @where_values.empty?
         # Remove duplicates, last one wins.
         seen = Hash.new { |h,table| h[table] = {} }
@@ -47,6 +52,7 @@ module ActiveRecord
       end
 
       merged_relation.where_values = merged_wheres
+      merged_relation.bind_values = merged_binds
 
       (Relation::SINGLE_VALUE_METHODS - [:lock, :create_with, :reordering]).each do |method|
         value = r.send(:"#{method}_value")
@@ -122,7 +128,7 @@ module ActiveRecord
       result
     end
 
-    VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset, :extend, :eager_load,
+    VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset, :extend, :references,
                            :order, :select, :readonly, :group, :having, :from, :lock ]
 
     def apply_finder_options(options)
@@ -133,7 +139,7 @@ module ActiveRecord
       finders = options.dup
       finders.delete_if { |key, value| value.nil? && key != :limit }
 
-      ([:joins, :select, :group, :order, :having, :limit, :offset, :from, :lock, :readonly, :eager_load] & finders.keys).each do |finder|
+      ((VALID_FIND_OPTIONS - [:conditions, :include, :extend]) & finders.keys).each do |finder|
         relation = relation.send(finder, finders[finder])
       end