From e1ca69713c8d59e7e3378ad47954fe6a6052b1d4 Mon Sep 17 00:00:00 2001 From: oesgalha Date: Thu, 29 Oct 2015 10:22:42 -0200 Subject: Use #distinct instead of #uniq in the guides [ci skip] * #uniq is an alias of #distinct * #uniq will be deprecated, see: rails/rails@adfab2dcf4003ca564d78d4425566dd2d9cd8b4f --- guides/source/active_record_querying.md | 4 ++-- guides/source/association_basics.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'guides') diff --git a/guides/source/active_record_querying.md b/guides/source/active_record_querying.md index 8ea0f383c0..1427903dfb 100644 --- a/guides/source/active_record_querying.md +++ b/guides/source/active_record_querying.md @@ -80,7 +80,7 @@ The methods are: * `reorder` * `reverse_order` * `select` -* `uniq` +* `distinct` * `where` All of the above methods return an instance of `ActiveRecord::Relation`. @@ -999,7 +999,7 @@ SELECT categories.* FROM categories INNER JOIN articles ON articles.category_id = categories.id ``` -Or, in English: "return a Category object for all categories with articles". Note that you will see duplicate categories if more than one article has the same category. If you want unique categories, you can use `Category.joins(:articles).uniq`. +Or, in English: "return a Category object for all categories with articles". Note that you will see duplicate categories if more than one article has the same category. If you want unique categories, you can use `Category.joins(:articles).distinct`. #### Joining Multiple Associations diff --git a/guides/source/association_basics.md b/guides/source/association_basics.md index 999c533fb3..74cd9bdc7b 100644 --- a/guides/source/association_basics.md +++ b/guides/source/association_basics.md @@ -2163,7 +2163,7 @@ You can use any of the standard [querying methods](active_record_querying.html) * `order` * `readonly` * `select` -* `uniq` +* `distinct` ##### `where` @@ -2239,9 +2239,9 @@ If you use the `readonly` method, then the associated objects will be read-only The `select` method lets you override the SQL `SELECT` clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns. -##### `uniq` +##### `distinct` -Use the `uniq` method to remove duplicates from the collection. +Use the `distinct` method to remove duplicates from the collection. #### When are Objects Saved? -- cgit v1.2.3