Merge pull request #368 from bowphp/refactor/code-base

papac · web-flow · commit 4c46262d4402 · 2026-03-20T11:53:03.000Z
Fix belongs to
diff --git a/src/Database/Barry/Relations/BelongsTo.php b/src/Database/Barry/Relations/BelongsTo.php
@@ -38,7 +38,7 @@ public function __construct(
      */
     public function getResults(): mixed
     {
-        $key = $this->query->getTable() . ":belongsto:" . $this->related->getTable() . ":" . $this->foreign_key;
+        $key = $this->query->getTable() . ":" . $this->local_key . ":belongsto:" . $this->related->getTable() . ":" . $this->foreign_key;
 
         $cache = Cache::store('file')->get($key);
 
diff --git a/src/Database/Barry/Relations/HasOne.php b/src/Database/Barry/Relations/HasOne.php
@@ -33,7 +33,7 @@ public function __construct(Model $related, Model $parent, string $foreign_key,
      */
     public function getResults(): ?Model
     {
-        $key = $this->query->getTable() . ":hasone:" . $this->related->getTable() . ":" . $this->foreign_key;
+        $key = $this->query->getTable() . ":" . $this->local_key . ":hasone:" . $this->related->getTable() . ":" . $this->foreign_key;
 
         $cache = Cache::store('file')->get($key);
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function __construct(`
`38`	`38`	`*/`
`39`	`39`	`public function getResults(): mixed`
`40`	`40`	`{`
`41`		`- $key = $this->query->getTable() . ":belongsto:" . $this->related->getTable() . ":" . $this->foreign_key;`
	`41`	`+ $key = $this->query->getTable() . ":" . $this->local_key . ":belongsto:" . $this->related->getTable() . ":" . $this->foreign_key;`
`42`	`42`
`43`	`43`	`$cache = Cache::store('file')->get($key);`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct(Model $related, Model $parent, string $foreign_key,`
`33`	`33`	`*/`
`34`	`34`	`public function getResults(): ?Model`
`35`	`35`	`{`
`36`		`- $key = $this->query->getTable() . ":hasone:" . $this->related->getTable() . ":" . $this->foreign_key;`
	`36`	`+ $key = $this->query->getTable() . ":" . $this->local_key . ":hasone:" . $this->related->getTable() . ":" . $this->foreign_key;`
`37`	`37`
`38`	`38`	`$cache = Cache::store('file')->get($key);`
`39`	`39`