diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-01-14 21:14:21 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-01-16 21:17:18 +0000 |
| commit | a84a20e1cd2133932dd1bd33f862aa2605cc821e (patch) | |
| tree | 9929ea49d9b6f06827cb10e3477e4b7c159f96d5 /activerecord/lib/active_record | |
| parent | f6cc6651f2a32af42345641c3d17fc26ddb96b52 (diff) | |
| download | rails-a84a20e1cd2133932dd1bd33f862aa2605cc821e.tar.gz rails-a84a20e1cd2133932dd1bd33f862aa2605cc821e.tar.bz2 rails-a84a20e1cd2133932dd1bd33f862aa2605cc821e.zip | |
store references as a string
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index dcfce448b1..7838271e5c 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -522,7 +522,7 @@ module ActiveRecord joined_tables = joined_tables.flatten.compact.map { |t| t.downcase }.uniq (tables_in_string(to_sql) - joined_tables).any? || - (includes_values & references_values).any? + (references_values - joined_tables).any? end def tables_in_string(string) diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index ef3545c76a..75369513e3 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -52,7 +52,7 @@ module ActiveRecord return self if args.blank? relation = clone - relation.references_values = (references_values + args).flatten.uniq + relation.references_values = (references_values + args.flatten.map(&:to_s)).uniq relation end |