Merge pull request #31 from jeremyharris/issue/29

Fix for unconventional PKs
jeremyharris · Nov 15, 2021 · 568b41c · 568b41c
2 parents 1c0cd9e + 6184e7f
commit 568b41c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/ORM/LazyLoadEntityTrait.php b/src/ORM/LazyLoadEntityTrait.php
@@ -2,6 +2,7 @@
 namespace JeremyHarris\LazyLoad\ORM;
 
 use Cake\Datasource\RepositoryInterface;
+use Cake\ORM\Association\BelongsTo;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
@@ -128,7 +129,10 @@ protected function _lazyLoad($property)
             ->associations()
             ->getByProperty($property);
 
-        if ($association === null || $this->get($association->getBindingKey()) === null) {
+        // is belongsTo and missing FK on this table? loadInto tries to load belongsTo data regardless
+        $isMissingBelongsToFK = $association instanceof BelongsTo && !isset($this->_fields[$association->getForeignKey()]);
+
+        if ($association === null || $isMissingBelongsToFK) {
             return null;
         }
 

diff --git a/tests/Fixture/AuthorsFixture.php b/tests/Fixture/AuthorsFixture.php
@@ -29,9 +29,9 @@ class AuthorsFixture extends TestFixture
      * @var array
      */
     public $fields = [
-        'id' => ['type' => 'integer'],
+        'author_id' => ['type' => 'integer'],
         'name' => ['type' => 'string', 'default' => null],
-        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['author_id']]]
     ];
 
     /**

diff --git a/tests/TestCase/ORM/LazyLoadEntityTraitTest.php b/tests/TestCase/ORM/LazyLoadEntityTraitTest.php
@@ -46,6 +46,9 @@ public function setUp(): void
 
         $this->connection = ConnectionManager::get('test');
 
+        $this->Authors = $this->getTableLocator()->get('Authors');
+        $this->Authors->setPrimaryKey('author_id');
+
         $this->Articles = $this->getTableLocator()->get('Articles');
         $this->Articles->setEntityClass(LazyLoadableEntity::class);
         $this->Articles->belongsTo('Authors');
@@ -313,7 +316,7 @@ public function testGetLazyLoadsOnce()
 
         $author = $comment->author;
 
-        $this->assertEquals(2, $author->id);
+        $this->assertEquals(2, $author->author_id);
 
         // ensure it is grabbed from _properties and not lazy loaded again (which calls repository())
         $comment->author;
@@ -375,7 +378,7 @@ public function testEmptySource()
         $comment = new Comment(['id' => 1, 'user_id' => 2]);
         $author = $comment->author;
 
-        $this->assertEquals(2, $author->id);
+        $this->assertEquals(2, $author->author_id);
     }
 
     /**