diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-04-02 15:28:09 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-04-02 17:38:02 +0100 |
| commit | bc7da9b77d6347eeccefa2c735b2f236a08eea57 (patch) | |
| tree | c67010fd6a068b1b7e28cd48cb500c967f2997f5 /activerecord/lib/active_record/relation | |
| parent | 30f3a3df77a63f09a291c70f26a8a4f534827cd2 (diff) | |
| download | rails-bc7da9b77d6347eeccefa2c735b2f236a08eea57.tar.gz rails-bc7da9b77d6347eeccefa2c735b2f236a08eea57.tar.bz2 rails-bc7da9b77d6347eeccefa2c735b2f236a08eea57.zip | |
Consistency when using Relation constants
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/spawn_methods.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb index a17de1bdbb..63246079cb 100644 --- a/activerecord/lib/active_record/relation/spawn_methods.rb +++ b/activerecord/lib/active_record/relation/spawn_methods.rb @@ -6,7 +6,7 @@ module ActiveRecord merged_relation = clone return merged_relation unless r - (ActiveRecord::Relation::ASSOCIATION_METHODS + ActiveRecord::Relation::MULTI_VALUE_METHODS).reject {|m| [:joins, :where].include?(m)}.each do |method| + (Relation::ASSOCIATION_METHODS + Relation::MULTI_VALUE_METHODS).reject {|m| [:joins, :where].include?(m)}.each do |method| unless (value = r.send(:"#{method}_values")).blank? merged_relation.send(:"#{method}_values=", value) end @@ -26,7 +26,7 @@ module ActiveRecord merged_relation.where_values = merged_wheres - ActiveRecord::Relation::SINGLE_VALUE_METHODS.reject {|m| m == :lock}.each do |method| + Relation::SINGLE_VALUE_METHODS.reject {|m| m == :lock}.each do |method| unless (value = r.send(:"#{method}_value")).nil? merged_relation.send(:"#{method}_value=", value) end |