Permalink
Browse files

Revert last two commits mistakenly changing join/include syntax

---

Revert "syntax error joining/including models"

This reverts commit ac35f72.

---

Revert "syntax error joining tables"

This reverts commit c365986.

---

Comments:

rails/docrails@c365986#commitcomment-4630684
  • Loading branch information...
1 parent ac35f72 commit db3ec5183258fae55ba6d5335cbdbb82f61818b7 @carlosantoniodasilva carlosantoniodasilva committed Nov 19, 2013
Showing with 7 additions and 7 deletions.
  1. +7 −7 guides/source/active_record_querying.md
View
14 guides/source/active_record_querying.md
@@ -473,7 +473,7 @@ In the case of a belongs_to relationship, an association key can be used to spec
```ruby
Post.where(author: author)
-Author.joins(:post).where(posts: {author: author})
+Author.joins(:posts).where(posts: {author: author})
```
NOTE: The values cannot be symbols. For example, you cannot do `Client.where(status: :active)`.
@@ -975,7 +975,7 @@ Now all of the following will produce the expected join queries using `INNER JOI
#### Joining a Single Association
```ruby
-Category.joins(:post)
+Category.joins(:posts)
```
This produces:
@@ -990,7 +990,7 @@ Or, in English: "return a Category object for all categories with posts". Note t
#### Joining Multiple Associations
```ruby
-Post.joins(:category, :comment)
+Post.joins(:category, :comments)
```
This produces:
@@ -1041,14 +1041,14 @@ You can specify conditions on the joined tables using the regular [Array](#array
```ruby
time_range = (Time.now.midnight - 1.day)..Time.now.midnight
-Client.joins(:order).where('orders.created_at' => time_range)
+Client.joins(:orders).where('orders.created_at' => time_range)
```
An alternative and cleaner syntax is to nest the hash conditions:
```ruby
time_range = (Time.now.midnight - 1.day)..Time.now.midnight
-Client.joins(:order).where(orders: {created_at: time_range})
+Client.joins(:orders).where(orders: {created_at: time_range})
```
This will find all clients who have orders that were created yesterday, again using a `BETWEEN` SQL expression.
@@ -1101,7 +1101,7 @@ Active Record lets you eager load any number of associations with a single `Mode
#### Array of Multiple Associations
```ruby
-Post.includes(:category, :comment)
+Post.includes(:category, :comments)
```
This loads all the posts and the associated category and comments for each post.
@@ -1121,7 +1121,7 @@ Even though Active Record lets you specify conditions on the eager loaded associ
However if you must do this, you may use `where` as you would normally.
```ruby
-Post.includes(:comment).where("comments.visible" => true)
+Post.includes(:comments).where("comments.visible" => true)
```
This would generate a query which contains a `LEFT OUTER JOIN` whereas the `joins` method would generate one using the `INNER JOIN` function instead.

0 comments on commit db3ec51

Please sign in to comment.