Fixed usage of alias coming from the 'from' method

Author: luisdalmolin

src/JoinsHelper.php

@@ -77,9 +77,18 @@ public static function ensureModelIsUniqueToQuery($query): void
             // If the model is already associated with another query, we need to clone the model.
             // This can happen if a certain query, *before having interacted with the library
             // `joinRelationship()` method*, was cloned by previous code.
+
+            // Preserve the from clause (including any alias) before setModel overwrites it
+            $originalFrom = $query->getQuery()->from;
+
             $query->setModel($model = new ($query->getModel()));
             $model->mergeCasts($originalModel->getCasts());
 
+            // Restore the original from clause if it was set
+            if ($originalFrom) {
+                $query->getQuery()->from = $originalFrom;
+            }
+
             // Link the Spl Object ID of the query to the new model...
             static::$modelQueryDictionary[$model] = $querySplObjectId;
 
@@ -99,10 +108,18 @@ public static function ensureModelIsUniqueToQuery($query): void
             $originalModel = $query->getModel();
             $originalJoinsHelper = JoinsHelper::make($originalModel);
 
+            // Preserve the from clause (including any alias) before setModel overwrites it
+            $originalFrom = $query->getQuery()->from;
+
             // Ensure the model of the cloned query is unique to the query.
             $query->setModel($model = new $originalModel());
             $model->mergeCasts($originalModel->getCasts());
 
+            // Restore the original from clause if it was set
+            if ($originalFrom) {
+                $query->getQuery()->from = $originalFrom;
+            }
+
             // Update any `beforeQueryCallbacks` to link to the new `$this` as Eloquent Query,
             // otherwise the reference to the current Eloquent query goes wrong. These query
             // callbacks are stored on the `QueryBuilder` instance and therefore do not get

src/Mixins/JoinRelationship.php

@@ -107,8 +107,17 @@ public function joinRelationship(): Closure
             JoinsHelper::ensureModelIsUniqueToQuery($this);
             JoinsHelper::clearCacheBeforeQuery($this);
 
+            // Check if the main table has an alias (e.g., "posts as p")
+            $fromClause = $this->getQuery()->from;
+            $mainTableOrAlias = $this->getModel()->getTable();
+            if ($fromClause && preg_match('/^.+\s+as\s+["\'\`]?(.+?)["\'\`]?$/i', $fromClause, $matches)) {
+                // Register the alias for the main model so joins use it
+                $mainTableOrAlias = $matches[1];
+                StaticCache::setTableAliasForModel($this->getModel(), $mainTableOrAlias);
+            }
+
             if (is_null($this->getSelect())) {
-                $this->select(sprintf('%s.*', $this->getModel()->getTable()));
+                $this->select(sprintf('%s.*', $mainTableOrAlias));
             }
 
             if (Str::contains($relationName, '.')) {
@@ -159,7 +168,6 @@ public function joinRelationship(): Closure
             }
 
             $joinHelper->markRelationshipAsAlreadyJoined($this->getModel(), $relationJoinCache);
-            StaticCache::clear();
 
             $relation->performJoinForEloquentPowerJoins(
                 builder: $this,
@@ -170,6 +178,11 @@ public function joinRelationship(): Closure
                 morphable: $morphable,
             );
 
+            // Clear only the related model's alias from cache after join is performed
+            if ($useAlias) {
+                unset(StaticCache::$powerJoinAliasesCache[spl_object_id($relation->getModel())]);
+            }
+
             return $this;
         };
     }

tests/JoinRelationshipTest.php

@@ -1016,7 +1016,7 @@ public function test_join_relationship_preserves_main_table_alias()
 
         // The join should reference the alias
         $this->assertQueryContains(
-            'inner join "users" on "users"."id" = "p"."user_id"',
+            'inner join "users" on "p"."user_id" = "users"."id"',
             $query
         );
     }
@@ -1042,7 +1042,7 @@ public function test_join_relationship_preserves_main_table_alias_with_nested_re
 
         // The second join should work normally
         $this->assertQueryContains(
-            'inner join "users" on "users"."id" = "comments"."user_id"',
+            'inner join "users" on "comments"."user_id" = "users"."id"',
             $query
         );
     }
@@ -1064,7 +1064,7 @@ public function test_join_relationship_preserves_main_table_alias_when_selecting
 
         // The join should reference the alias
         $this->assertQueryContains(
-            'inner join "users" on "users"."id" = "p"."user_id"',
+            'inner join "users" on "p"."user_id" = "users"."id"',
             $query
         );