diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2015-12-17 02:03:07 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2015-12-17 02:03:07 -0200 |
| commit | 4d06ea9a829de8f6f5a345589828e182eacab6a3 (patch) | |
| tree | fe9fb6b621b20ffd84f99511a5e8f7357fa82bf0 /activerecord/lib/active_record/relation.rb | |
| parent | e9d15072a94e2ae4dec5b7a121c84a5db38547b8 (diff) | |
| parent | 59a030954d7fdf7f3705005b06b73a16e65a417e (diff) | |
| download | rails-4d06ea9a829de8f6f5a345589828e182eacab6a3.tar.gz rails-4d06ea9a829de8f6f5a345589828e182eacab6a3.tar.bz2 rails-4d06ea9a829de8f6f5a345589828e182eacab6a3.zip | |
Merge pull request #22615 from kamipo/join_to_delete_is_same_as_join_to_update
`join_to_delete` is same as `join_to_update`
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 2cf19c76c5..316b0d6308 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -371,11 +371,11 @@ module ActiveRecord stmt.set Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates)) stmt.table(table) - stmt.key = table[primary_key] if joins_values.any? - @klass.connection.join_to_update(stmt, arel) + @klass.connection.join_to_update(stmt, arel, table[primary_key]) else + stmt.key = table[primary_key] stmt.take(arel.limit) stmt.order(*arel.orders) stmt.wheres = arel.constraints |