diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-27 12:09:20 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-27 12:09:20 +0100 |
| commit | 47e5caa96bffc04c8c0b287a975a609fb048e530 (patch) | |
| tree | 653d360dc9ad7eb7c5d2338840e15ab8b28a902b /activerecord/lib/active_record/calculations.rb | |
| parent | fd58a2d1da04508a7fdf825143e61d186112e63e (diff) | |
| parent | d92c4a84023bc0c8dd75869c9b4d5e50277f4650 (diff) | |
| download | rails-47e5caa96bffc04c8c0b287a975a609fb048e530.tar.gz rails-47e5caa96bffc04c8c0b287a975a609fb048e530.tar.bz2 rails-47e5caa96bffc04c8c0b287a975a609fb048e530.zip | |
Merge Mail with latest Rails and move mail gem to Gemfile.
Diffstat (limited to 'activerecord/lib/active_record/calculations.rb')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 40242333e5..fcba23dc0d 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -148,7 +148,7 @@ module ActiveRecord else relation = arel_table(options[:from]). joins(construct_join(options[:joins], scope)). - conditions(construct_conditions(options[:conditions], scope)). + where(construct_conditions(options[:conditions], scope)). order(options[:order]). limit(options[:limit]). offset(options[:offset]) |