diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-03-15 06:21:53 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-03-15 06:21:53 -0700 |
| commit | 0721d3b37062eca73da3efd669142d7e381e4d80 (patch) | |
| tree | 75a10eb4357b101161563c380e676412dcc4c455 /activerecord/lib/active_record/querying.rb | |
| parent | df21d1eaee11e82c9a83566e2d7c4b771e344686 (diff) | |
| parent | cd87c85ef05e47f6ea1ce7422ae033fe6d82b030 (diff) | |
| download | rails-0721d3b37062eca73da3efd669142d7e381e4d80.tar.gz rails-0721d3b37062eca73da3efd669142d7e381e4d80.tar.bz2 rails-0721d3b37062eca73da3efd669142d7e381e4d80.zip | |
Merge pull request #9683 from senny/deprecate_count_distinct_option
rename `Relation#uniq` to `Relation#distinct`
Diffstat (limited to 'activerecord/lib/active_record/querying.rb')
| -rw-r--r-- | activerecord/lib/active_record/querying.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb index e04a3d0976..902fd90c54 100644 --- a/activerecord/lib/active_record/querying.rb +++ b/activerecord/lib/active_record/querying.rb @@ -8,7 +8,7 @@ module ActiveRecord delegate :find_each, :find_in_batches, :to => :all delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins, :where, :preload, :eager_load, :includes, :from, :lock, :readonly, - :having, :create_with, :uniq, :references, :none, :to => :all + :having, :create_with, :uniq, :distinct, :references, :none, :to => :all delegate :count, :average, :minimum, :maximum, :sum, :calculate, :pluck, :ids, :to => :all # Executes a custom SQL query against your database and returns all the results. The results will |