Avoiding unnecessary extra calls to canBeJoinable

cakephp · Jun 11, 2013 · 2980839 · 2980839
1 parent 2f1b843
commit 2980839
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/Cake/ORM/Query.php b/lib/Cake/ORM/Query.php
@@ -433,7 +433,7 @@ protected function _addContainments() {
 
 		$contain = $this->normalizedContainments();
 		foreach ($contain as $relation => $meta) {
-			if ($meta['instance'] && !$meta['instance']->canBeJoined($meta['config'])) {
+			if ($meta['instance'] && !$meta['canBeJoined']) {
 				$this->_loadEagerly[$relation] = $meta;
 			}
 		}
@@ -443,7 +443,7 @@ protected function _addContainments() {
 			$alias = $table->alias();
 			$this->_addJoin($options['instance'], $options['config']);
 			foreach ($options['associations'] as $relation => $meta) {
-				if ($meta['instance'] && !$meta['instance']->canBeJoined($meta['config'])) {
+				if ($meta['instance'] && !$meta['canBeJoined']) {
 					$this->_loadEagerly[$relation] = $meta;
 				}
 			}
@@ -476,6 +476,7 @@ protected function _normalizeContain(Table $parent, $alias, $options) {
 			'instance' => $instance,
 			'config' => array_diff_key($options, $extra)
 		];
+		$config['canBeJoined'] = $instance->canBeJoined($config['config']);
 
 		foreach ($extra as $t => $assoc) {
 			$config['associations'][$t] = $this->_normalizeContain($table, $t, $assoc);
@@ -495,7 +496,7 @@ protected function _resolveJoins($source, $associations) {
 		$result = [];
 		foreach ($associations as $table => $options) {
 			$associated = $options['instance'];
-			if ($associated && $associated->canBeJoined($options['config'])) {
+			if ($options['canBeJoined']) {
 				$result[$table] = $options;
 				$result += $this->_resolveJoins($associated->target(), $options['associations']);
 			}