Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move automatic relationship parsing to Eloquent's query class.

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,7 +257,7 @@ public function _with($includes)
{ {
$includes = (array) $includes; $includes = (array) $includes;
$given_includes = array(); $this->includes = array();
foreach ($includes as $relationship => $constraints) foreach ($includes as $relationship => $constraints)
{ {
@ -269,27 +269,9 @@ public function _with($includes)
list($relationship, $constraints) = array($constraints, null); 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; return $this;
} }

30
laravel/database/eloquent/query.php
View File

@ -127,7 +127,7 @@ public function hydrate($model, $results)
if (count($results) > 0) if (count($results) > 0)
{ {
foreach ($this->model->includes as $relationship => $constraints) foreach ($this->model_includes() as $relationship => $constraints)
{ {
// If the relationship is nested, we will skip loading it here and let // If the relationship is nested, we will skip loading it here and let
// the load method parse and set the nested eager loads on the right // the load method parse and set the nested eager loads on the right
@ -196,7 +196,7 @@ protected function nested_includes($relationship)
{ {
$nested = array(); $nested = array();
foreach ($this->model->includes as $include => $constraints) foreach ($this->model_includes() as $include => $constraints)
{ {
// To get the nested includes, we want to find any includes that begin // To get the nested includes, we want to find any includes that begin
// the relationship and a dot, then we will strip off the leading // the relationship and a dot, then we will strip off the leading
@ -210,6 +210,32 @@ protected function nested_includes($relationship)
return $nested; return $nested;
} }
/**
* Get the eagerly loaded relationships for the model.
*
* @return array
*/
protected function model_includes()
{
$relationships = array_keys($this->model->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
return $this->model->includes + $implicits;
}
/** /**
* Get a fluent query builder for the model. * Get a fluent query builder for the model.
* *