1 files changed, 24 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index d8d416416e..a686e3263b 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -439,7 +439,7 @@ module ActiveRecord
       self
     end
 
-    def bind(value)
+    def bind(value) # :nodoc:
       spawn.bind!(value)
     end
 
@@ -883,12 +883,15 @@ module ActiveRecord
 
       # Reorder bind indexes if joins produced bind values
       bvs = arel.bind_values + bind_values
-      arel.ast.grep(Arel::Nodes::BindParam).each_with_index do |bp, i|
+      reorder_bind_params(arel.ast, bvs)
+      arel
+    end
+
+    def reorder_bind_params(ast, bvs)
+      ast.grep(Arel::Nodes::BindParam).each_with_index do |bp, i|
         column = bvs[i].first
         bp.replace connection.substitute_at(column, i)
       end
-
-      arel
     end
 
     def symbol_unscoping(scope)
@@ -980,6 +983,10 @@ module ActiveRecord
         end
       end
 
+      association_binds, non_binds = non_binds.partition do |column, value|
+        value.is_a?(Hash) && association_for_table(column)
+      end
+
       new_opts = {}
       binds = []
 
@@ -988,11 +995,24 @@ module ActiveRecord
         new_opts[column] = connection.substitute_at(column)
       end
 
+      association_binds.each do |(column, value)|
+        association_relation = association_for_table(column).klass.send(:relation)
+        association_new_opts, association_bind = association_relation.send(:create_binds, value)
+        new_opts[column] = association_new_opts
+        binds += association_bind
+      end
+
       non_binds.each { |column,value| new_opts[column] = value }
 
       [new_opts, binds]
     end
 
+    def association_for_table(table_name)
+      table_name = table_name.to_s
+      @klass._reflect_on_association(table_name) ||
+        @klass._reflect_on_association(table_name.singularize)
+    end
+
     def build_from
       opts, name = from_value
       case opts