Merge pull request jeremyharris#27 from fabiofdsantos/master

Avoid lazy load if the association is empty

Author: jeremyharris

src/ORM/LazyLoadEntityTrait.php

@@ -128,7 +128,7 @@ protected function _lazyLoad($property)
             ->associations()
             ->getByProperty($property);
 
-        if ($association === null) {
+        if ($association === null || $this->get($association->getBindingKey()) === null) {
             return null;
         }
 

tests/TestCase/ORM/LazyLoadEntityTraitTest.php

@@ -1,7 +1,9 @@
 <?php
 namespace JeremyHarris\LazyLoad\Test\TestCase\ORM;
 
+use Cake\Datasource\ConnectionManager;
 use Cake\Datasource\EntityInterface;
+use Cake\Log\Log;
 use Cake\ORM\Entity;
 use Cake\ORM\Locator\LocatorAwareTrait;
 use Cake\TestSuite\TestCase;
@@ -17,7 +19,6 @@
  */
 class LazyLoadEntityTraitTest extends TestCase
 {
-
     use LocatorAwareTrait;
 
     /**
@@ -43,6 +44,8 @@ public function setUp(): void
     {
         parent::setUp();
 
+        $this->connection = ConnectionManager::get('test');
+
         $this->Articles = $this->getTableLocator()->get('Articles');
         $this->Articles->setEntityClass(LazyLoadableEntity::class);
         $this->Articles->belongsTo('Authors');
@@ -97,6 +100,35 @@ public function testMissingPrimaryKey()
         $this->assertNull($comment->author);
     }
 
+    /**
+     * tests that no db queries are performed if there's no association
+     *
+     * @return void
+     */
+    public function testNoDbQueriesOnEmptyAssociation()
+    {
+        Log::setConfig('queries', ['className' => 'Array']);
+        $log = Log::engine('queries');
+
+        $this->connection->enableQueryLogging();
+
+        $article = $this->Articles->newEntity([
+            'title' => 'Article with no author',
+            'body' => 'Article content',
+        ]);
+
+        // Force a database query
+        $this->getTableLocator()->get('Authors')->getSchema();
+
+        $initialQueries = count($log->read());
+        $this->assertFalse(isset($article->author));
+        $finalQueries = count($log->read());
+
+        $this->connection->disableQueryLogging();
+
+        $this->assertEquals($initialQueries, $finalQueries);
+    }
+
     /**
      * tests that we can override _repository to prevent errors from being thrown
      * in cases where we're creating an entity without a table. this happens in
@@ -166,7 +198,7 @@ public function testUnsetProperty()
             ->will($this->returnValue($this->Comments));
 
         $this->assertInstanceOf(EntityInterface::class, $comment->author);
-        $comment->unsetProperty('author');
+        $comment->unset('author');
         $this->assertNull($comment->author);
 
         // test re-setting a previously un-set prop
@@ -225,7 +257,7 @@ public function testUnsetEagerLoadedProperty()
             ->first();
 
         $this->assertInstanceOf(EntityInterface::class, $comment->author);
-        $comment->unsetProperty('author');
+        $comment->unset('author');
         $this->assertNull($comment->author);
     }