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/associations.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/associations.rb')
-rwxr-xr-x | activerecord/lib/active_record/associations.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 8dcb3a7711..0ed46046ff 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1717,9 +1717,9 @@ module ActiveRecord select(column_aliases(join_dependency)). group(construct_group(options[:group], options[:having], scope)). order(construct_order(options[:order], scope)). - conditions(construct_conditions(options[:conditions], scope)) + where(construct_conditions(options[:conditions], scope)) - relation = relation.conditions(construct_arel_limited_ids_condition(options, join_dependency)) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit]) + relation = relation.where(construct_arel_limited_ids_condition(options, join_dependency)) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit]) relation = relation.limit(construct_limit(options[:limit], scope)) if using_limitable_reflections?(join_dependency.reflections) relation @@ -1757,7 +1757,7 @@ module ActiveRecord end relation = relation.joins(construct_join(options[:joins], scope)). - conditions(construct_conditions(options[:conditions], scope)). + where(construct_conditions(options[:conditions], scope)). group(construct_group(options[:group], options[:having], scope)). order(construct_order(options[:order], scope)). limit(construct_limit(options[:limit], scope)). |