diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:16:21 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:16:21 +0200 |
| commit | 384dbfd1408721ded071a587b0dc9ee40203607e (patch) | |
| tree | 770854b984691dea8187ca0a998a28e93a008093 /activerecord/lib/active_record/relation/finder_methods.rb | |
| parent | 900470cf3cd346ad1b17cf6902f3f98e6dae7709 (diff) | |
| parent | af1b48926f49226c934995c322ee017239158cf3 (diff) | |
| download | rails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.gz rails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.bz2 rails-384dbfd1408721ded071a587b0dc9ee40203607e.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activerecord/lib/active_record/relation/finder_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index aae257a0e7..a3d4b7f45a 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -246,6 +246,8 @@ module ActiveRecord orders = relation.order_values values = @klass.connection.distinct("#{@klass.connection.quote_table_name table_name}.#{primary_key}", orders) + relation = relation.dup + ids_array = relation.select(values).collect {|row| row[primary_key]} ids_array.empty? ? raise(ThrowResult) : table[primary_key].in(ids_array) end |