Simplify codebase by using qualifyColumn helper method (#54187)

Author: SanderMuller

src/Illuminate/Database/Eloquent/Builder.php

@@ -1729,12 +1729,8 @@ protected function createSelectWithConstraint($name)
     {
         return [explode(':', $name)[0], static function ($query) use ($name) {
             $query->select(array_map(static function ($column) use ($query) {
-                if (str_contains($column, '.')) {
-                    return $column;
-                }
-
                 return $query instanceof BelongsToMany
-                        ? $query->getRelated()->getTable().'.'.$column
+                        ? $query->getRelated()->qualifyColumn($column)
                         : $column;
             }, explode(',', explode(':', $name)[1])));
         }];

src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php

@@ -110,7 +110,7 @@ public function hasOne($related, $foreignKey = null, $localKey = null)
 
         $localKey = $localKey ?: $this->getKeyName();
 
-        return $this->newHasOne($instance->newQuery(), $this, $instance->getTable().'.'.$foreignKey, $localKey);
+        return $this->newHasOne($instance->newQuery(), $this, $instance->qualifyColumn($foreignKey), $localKey);
     }
 
     /**
@@ -198,11 +198,9 @@ public function morphOne($related, $name, $type = null, $id = null, $localKey =
 
         [$type, $id] = $this->getMorphs($name, $type, $id);
 
-        $table = $instance->getTable();
-
         $localKey = $localKey ?: $this->getKeyName();
 
-        return $this->newMorphOne($instance->newQuery(), $this, $table.'.'.$type, $table.'.'.$id, $localKey);
+        return $this->newMorphOne($instance->newQuery(), $this, $instance->qualifyColumn($type), $instance->qualifyColumn($id), $localKey);
     }
 
     /**
@@ -431,7 +429,7 @@ public function hasMany($related, $foreignKey = null, $localKey = null)
         $localKey = $localKey ?: $this->getKeyName();
 
         return $this->newHasMany(
-            $instance->newQuery(), $this, $instance->getTable().'.'.$foreignKey, $localKey
+            $instance->newQuery(), $this, $instance->qualifyColumn($foreignKey), $localKey
         );
     }
 
@@ -527,11 +525,9 @@ public function morphMany($related, $name, $type = null, $id = null, $localKey =
         // get the table and create the relationship instances for the developers.
         [$type, $id] = $this->getMorphs($name, $type, $id);
 
-        $table = $instance->getTable();
-
         $localKey = $localKey ?: $this->getKeyName();
 
-        return $this->newMorphMany($instance->newQuery(), $this, $table.'.'.$type, $table.'.'.$id, $localKey);
+        return $this->newMorphMany($instance->newQuery(), $this, $instance->qualifyColumn($type), $instance->qualifyColumn($id), $localKey);
     }
 
     /**

src/Illuminate/Database/Eloquent/Model.php

@@ -2134,7 +2134,7 @@ protected function resolveChildRouteBindingQuery($childType, $value, $field)
 
         if ($relationship instanceof HasManyThrough ||
             $relationship instanceof BelongsToMany) {
-            $field = $relationship->getRelated()->getTable().'.'.$field;
+            $field = $relationship->getRelated()->qualifyColumn($field);
         }
 
         return $relationship instanceof Model

src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php

@@ -892,7 +892,7 @@ public function get($columns = ['*'])
     protected function shouldSelect(array $columns = ['*'])
     {
         if ($columns == ['*']) {
-            $columns = [$this->related->getTable().'.*'];
+            $columns = [$this->related->qualifyColumn('*')];
         }
 
         return array_merge($columns, $this->aliasedPivotColumns());

src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php

@@ -297,7 +297,7 @@ public function qualifySubSelectColumn($column)
      */
     protected function qualifyRelatedColumn($column)
     {
-        return str_contains($column, '.') ? $column : $this->query->getModel()->getTable().'.'.$column;
+        return $this->query->getModel()->qualifyColumn($column);
     }
 
     /**

src/Illuminate/Database/Eloquent/Relations/HasOneOrManyThrough.php

@@ -501,7 +501,7 @@ public function cursorPaginate($perPage = null, $columns = ['*'], $cursorName =
     protected function shouldSelect(array $columns = ['*'])
     {
         if ($columns == ['*']) {
-            $columns = [$this->related->getTable().'.*'];
+            $columns = [$this->related->qualifyColumn('*')];
         }
 
         return array_merge($columns, [$this->getQualifiedFirstKeyName().' as laravel_through_key']);

src/Illuminate/Database/Eloquent/Relations/MorphTo.php

@@ -162,7 +162,7 @@ protected function getResultsByType($type)
         $whereIn = $this->whereInMethod($instance, $ownerKey);
 
         return $query->{$whereIn}(
-            $instance->getTable().'.'.$ownerKey, $this->gatherKeysByType($type, $instance->getKeyType())
+            $instance->qualifyColumn($ownerKey), $this->gatherKeysByType($type, $instance->getKeyType())
         )->get();
     }