diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-12-26 03:50:57 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-12-26 03:50:57 +0530 |
| commit | 95274b28d95ad85ada25eb0c697ce5650ae488a9 (patch) | |
| tree | 8ea9d7fc169413a163d782ef8fdd5b5b57ad8a3a /activerecord/lib/active_record/calculations.rb | |
| parent | 1a993371805122cf50531b95651c6933d568080e (diff) | |
| download | rails-95274b28d95ad85ada25eb0c697ce5650ae488a9.tar.gz rails-95274b28d95ad85ada25eb0c697ce5650ae488a9.tar.bz2 rails-95274b28d95ad85ada25eb0c697ce5650ae488a9.zip | |
Rename Model.conditions and relation.conditions to .where
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]) |