diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2014-11-29 17:23:10 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2014-11-29 17:23:10 -0700 |
| commit | a975407a0a4f8bb06f8d4696de6a8b5e5a086622 (patch) | |
| tree | 2eb6aa16cc293b80a4a09f5e9efcd02b0f414b34 /activerecord/lib/active_record/relation.rb | |
| parent | b5242b6f95bc6a9481f438dce3fbed89e0f1edb0 (diff) | |
| download | rails-a975407a0a4f8bb06f8d4696de6a8b5e5a086622.tar.gz rails-a975407a0a4f8bb06f8d4696de6a8b5e5a086622.tar.bz2 rails-a975407a0a4f8bb06f8d4696de6a8b5e5a086622.zip | |
Update Arel usage for rails/arel#98fc259
`where_sql` now requires that we pass it an engine. None of the manager
classes take an engine in their constructor.
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 7e1994086f..7df50f7c97 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -327,7 +327,7 @@ module ActiveRecord def update_all(updates) raise ArgumentError, "Empty list of attributes to change" if updates.blank? - stmt = Arel::UpdateManager.new(arel.engine) + stmt = Arel::UpdateManager.new stmt.set Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates)) stmt.table(table) @@ -465,7 +465,7 @@ module ActiveRecord if conditions where(conditions).delete_all else - stmt = Arel::DeleteManager.new(arel.engine) + stmt = Arel::DeleteManager.new stmt.from(table) if joins_values.any? |