Strip schema from table for HasMany::their_name guess (#1002)

atk4 · May 31, 2022 · 0401814 · 0401814
1 parent 07b1c72
commit 0401814
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Reference/HasMany.php b/src/Reference/HasMany.php
@@ -29,7 +29,7 @@ public function getTheirFieldName(Model $theirModel = null): string
         // this is pure guess, verify if such field exist, otherwise throw
         // TODO probably remove completely in the future
         $ourModel = $this->getOurModel(null);
-        $theirFieldName = $this->getModelTableString($ourModel) . '_' . $ourModel->id_field;
+        $theirFieldName = preg_replace('~^.+?\.~', '', $this->getModelTableString($ourModel)) . '_' . $ourModel->id_field;
         if (!$this->createTheirModel()->hasField($theirFieldName)) {
             throw (new Exception('Their model does not contain fallback field'))
                 ->addMoreInfo('their_fallback_field', $theirFieldName);

diff --git a/tests/ReferenceTest.php b/tests/ReferenceTest.php
@@ -115,4 +115,14 @@ public function testCustomRef(): void
 
         $this->assertSame('user_archive', $m->ref('archive')->table);
     }
+
+    public function testOtherDbFieldRef(): void
+    {
+        $user = new Model($this->db, ['table' => 'thisdb.user']);
+        $order = new Model($this->db, ['table' => 'otherdb.orders']);
+        $order->addField('user_id');
+
+        $user->hasMany('Orders', ['model' => $order, 'caption' => 'My Orders']);
+        $this->assertSame($user->getRef('Orders')->getTheirFieldName(), 'user_id');
+    }
 }