Fixed Query::eagerLoaded() and added test

src/Datasource/QueryTrait.php

@@ -75,6 +75,13 @@ trait QueryTrait {
  */
 	protected $_options = [];
 
+/**
+ * Whether the query is standalone or the product of an eager load operation.
+ *
+ * @var boolean
+ */
+	protected $_eagerLoaded = false;
+
 /**
  * Returns the default table object that will be used by this query,
  * that is, the table that will appear in the from clause.
@@ -168,6 +175,21 @@ public function cache($key, $config = 'default') {
 		return $this;
 	}
 
+/**
+ * Sets the query instance to be the eager loaded query. If no argument is
+ * passed, the current configured query `_eagerLoaded` value is returned.
+ *
+ * @param boolean $value
+ * @return \Cake\ORM\Query
+ */
+	public function eagerLoaded($value = null) {
+		if ($value === null) {
+			return $this->_eagerLoaded;
+		}
+		$this->_eagerLoaded = $value;
+		return $this;
+	}
+
 /**
  * Fetch the results for this query.
  *
@@ -185,7 +207,7 @@ public function all() {
 		}
 
 		$table = $this->repository();
-		$event = new Event('Model.beforeFind', $table, [$this, $this->_options, $this->eagerLoaded()]);
+		$event = new Event('Model.beforeFind', $table, [$this, $this->_options, !$this->eagerLoaded()]);
 		$table->getEventManager()->dispatch($event);
 
 		if (isset($this->_results)) {

src/ORM/Association.php

@@ -418,7 +418,7 @@ public function attachTo(Query $query, array $options = []) {
 		}
 
 		$options['conditions'] = $query->newExpr()->add($options['conditions']);
-		$dummy = $target->query()->eagerLoaded(false);
+		$dummy = $target->query()->eagerLoaded(true);
 
 		if (!empty($options['queryBuilder'])) {
 			$dummy = $options['queryBuilder']($dummy);

src/ORM/Association/ExternalAssociationTrait.php

@@ -228,7 +228,7 @@ protected function _buildQuery($options) {
 		$fetchQuery = $this
 			->find('all')
 			->where($options['conditions'])
-			->eagerLoaded(false)
+			->eagerLoaded(true)
 			->hydrate($options['query']->hydrate());
 		$fetchQuery = $this->_addFilteringCondition($fetchQuery, $key, $filter);
 

src/ORM/Query.php

@@ -95,13 +95,6 @@ class Query extends DatabaseQuery {
  */
 	protected $_eagerLoader;
 
-/**
- * Whether the query is the primary query or a byproduct.
- *
- * @var boolean
- */
-	protected $_eagerLoaded = true;
-
 /**
  * Constuctor
  *
@@ -653,21 +646,6 @@ protected function _dirty() {
 		parent::_dirty();
 	}
 
-/**
- * Sets the query instance to be the eager loaded query. If no argument is
- * passed, the current configured query `_eagerLoaded` value is returned.
- *
- * @param boolean $value
- * @return \Cake\ORM\Query
- */
-	public function eagerLoaded($value = null) {
-		if ($value === null) {
-			return $this->_eagerLoaded;
-		}
-		$this->_eagerLoaded = $value;
-		return $this;
-	}
-
 /**
  * Create an update query.
  *

tests/TestCase/ORM/QueryTest.php

@@ -1815,4 +1815,30 @@ public function testDebugInfo() {
 		$this->assertSame($expected, $query->__debugInfo());
 	}
 
+/**
+ * Tests that the eagerLoaded function works and is trnasmitted correctly to eagerly
+ * loaded associations
+ *
+ * @return void
+ */
+	public function testEagerLoaded() {
+		$table = TableRegistry::get('authors');
+		$table->hasMany('articles');
+		$query = $table->find()->contain(['articles' => function($q) {
+			$this->assertTrue($q->eagerLoaded());
+			return $q;
+		}]);
+		$this->assertFalse($query->eagerLoaded());
+
+		$table->getEventManager()->attach(function($e, $q, $o, $primary) {
+			$this->assertTrue($primary);
+		}, 'Model.beforeFind');
+
+		TableRegistry::get('articles')
+			->getEventManager()->attach(function($e, $q, $o, $primary) {
+				$this->assertFalse($primary);
+			}, 'Model.beforeFind');
+		$query->all();
+	}
+
 }