fixing merge issues for comment tweaks

This commit is contained in:
Dayle Rees
2012-07-31 16:55:02 +01:00
21 changed files with 65 additions and 74 deletions

View File

@@ -224,7 +224,7 @@ Want to join on a different foreign key? No problem. Just pass it in the second
return $this->has_many('Comment', 'my_foreign_key');
You may be wondering: _If the dynamic properties return the relationship and require less keystokes, why would I ever use the relationship methods?_ Actually, relationship methods are very powerful. They allow you to continue to chain query methods before retrieving the relationship. Check this out:
You may be wondering: _If the dynamic properties return the relationship and require less keystrokes, why would I ever use the relationship methods?_ Actually, relationship methods are very powerful. They allow you to continue to chain query methods before retrieving the relationship. Check this out:
echo Post::find(1)->comments()->order_by('votes', 'desc')->take(10)->get();

View File

@@ -169,7 +169,7 @@ You may also specify multiple conditions for an **ON** clause by passing a Closu
$join->on('users.id', '=', 'phone.user_id');
$join->or_on('users.id', '=', 'phone.contact_id');
})
->get(array('users.email', 'phone.numer'));
->get(array('users.email', 'phone.number'));
<a name="ordering"></a>
## Ordering Results

View File

@@ -13,7 +13,7 @@
<a name="the-basics"></a>
## The Basics
The Schema Bulder provides methods for creating and modifying your database tables. Using a fluent syntax, you can work with your tables without using any vendor specific SQL.
The Schema Builder provides methods for creating and modifying your database tables. Using a fluent syntax, you can work with your tables without using any vendor specific SQL.
*Further Reading:*