diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-17 02:07:27 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-17 02:07:27 -0200 |
| commit | 5082cce6e3de01f54af620c590055ebb1effa299 (patch) | |
| tree | f580abf737de8d78b6e6cb882379befd7d7761dc /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | |
| parent | 4d06ea9a829de8f6f5a345589828e182eacab6a3 (diff) | |
| download | rails-5082cce6e3de01f54af620c590055ebb1effa299.tar.gz rails-5082cce6e3de01f54af620c590055ebb1effa299.tar.bz2 rails-5082cce6e3de01f54af620c590055ebb1effa299.zip | |
Revert "Merge pull request #22615 from kamipo/join_to_delete_is_same_as_join_to_update"
This reverts commit 4d06ea9a829de8f6f5a345589828e182eacab6a3, reversing
changes made to e9d15072a94e2ae4dec5b7a121c84a5db38547b8.
Reason: This will break oracle-enhanced, see
https://github.com/rsim/oracle-enhanced/blob/3c42131db82b64ac41645db3affc6e4650289df6/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb#L1254
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 6fddfb5347..25ba42e5c9 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -432,7 +432,7 @@ module ActiveRecord # In the simple case, MySQL allows us to place JOINs directly into the UPDATE # query. However, this does not allow for LIMIT, OFFSET and ORDER. To support # these, we must use a subquery. - def join_to_update(update, select, key) # :nodoc: + def join_to_update(update, select) #:nodoc: if select.limit || select.offset || select.orders.any? super else |