Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

All tests passing now

  • Loading branch information...
commit fba68dcdeece59751b9bc3bdfbe6f70b9c06ac2c 1 parent fba9f17
@lorenzo lorenzo authored
Showing with 6 additions and 7 deletions.
  1. +6 −7 src/ORM/EagerLoader.php
View
13 src/ORM/EagerLoader.php
@@ -233,14 +233,14 @@ protected function _normalizeContain(Table $parent, $alias, $options) {
];
$config['canBeJoined'] = $instance->canBeJoined($config['config']);
- if (!$config['canBeJoined']) {
- $this->_loadEagerly[$alias] = $config;
- }
-
foreach ($extra as $t => $assoc) {
$config['associations'][$t] = $this->_normalizeContain($table, $t, $assoc);
}
+ if (!$config['canBeJoined']) {
+ $this->_loadEagerly[$alias] = $config;
+ }
+
return $config;
}
@@ -263,9 +263,8 @@ protected function _resolveJoins($associations) {
}
/**
- * Helper method that will calculate those associations that cannot be joined
- * directly in this query and will setup the required extra queries for fetching
- * the extra data.
+ * Decorates the passed statement object in order to inject data form associations
+ * that cannot be joined directly.
*
* @param \Cake\ORM\Query $query The query for which to eage load external
* associations
Please sign in to comment.
Something went wrong with that request. Please try again.