Clear the joins cache before starting a join

Author: luisdalmolin

src/JoinsHelper.php

@@ -29,7 +29,6 @@ public static function make(): static
      */
     private array $joinRelationshipCache = [];
 
-
     /**
      * Join method map.
      */
@@ -117,4 +116,9 @@ public function markRelationshipAsAlreadyJoined($model, string $relation): void
     {
         $this->joinRelationshipCache[spl_object_id($model)][$relation] = true;
     }
+
+    public function clear(): void
+    {
+        $this->joinRelationshipCache = [];
+    }
 }

src/Mixins/JoinRelationship.php

@@ -100,6 +100,10 @@ public function joinRelationship(): Closure
             $joinHelper = JoinsHelper::make($this->getModel());
             $callback = $joinHelper->formatJoinCallback($callback);
 
+            $this->getQuery()->beforeQuery(function () use ($joinHelper) {
+                $joinHelper->clear();
+            });
+
             if (is_null($this->getSelect())) {
                 $this->select(sprintf('%s.*', $this->getModel()->getTable()));
             }

tests/JoinRelationshipTest.php

@@ -779,4 +779,20 @@ public function test_join_with_clone_does_not_duplicate()
 
         $this->assertEquals($clonedSql, $sql);
     }
+
+    public function test_issue_148()
+    {
+        for ($i = 0; $i < 12; $i++) {
+            try {
+                (new Post)->query()
+                    ->selectRaw('users.id as user_id')
+                    ->joinRelationship('user')
+                    ->get();
+
+                $this->assertTrue(true);
+            } catch (\Exception $e) {
+                $this->assertTrue(false, 'If it throws an exceptions, means the already joined checks are failing');
+            }
+        }
+    }
 }