ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move automatic relationship parsing to Eloquent's query class.

Browse Source
This commit is contained in:
Franz Liedke
2012-07-12 22:32:43 +02:00
parent 8c2a4fba14
commit 78920c5d27
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
laravel/database/eloquent/model.php
View File

@@ -257,7 +257,7 @@ abstract class Model {
{
$includes = (array) $includes;
$given_includes = array();
$this->includes = array();
foreach ($includes as $relationship => $constraints)
{
@@ -269,27 +269,9 @@ abstract class Model {
list($relationship, $constraints) = array($constraints, null);
}
$given_includes[$relationship] = $constraints;
$this->includes[$relationship] = $constraints;
}
$relationships = array_keys($given_includes);
$implicits = array();
foreach ($relationships as $relationship)
{
$parts = explode('.', $relationship);
$prefix = '';
foreach ($parts as $part)
{
$implicits[$prefix.$part] = null;
$prefix .= $part.'.';
}
}
// Add all implicit includes to the explicit ones
$this->includes = $given_includes + $implicits;
return $this;
}