[Bugfix] Fix qualifying columns for morph-to-many relations

lindyhopchris · lindyhopchris · commit d2686e014686 · 2020-11-20T09:57:00.000Z
Laravel 8.15 introduced a breaking change by adding the
qualify column method to the relation. Previously calling
qualify column on the relation forwarded the call to the model.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## Unreleased
+
+### Fixed
+- Fixed qualifying column for morph-to-many relations. This was caused by Laravel introducing
+a breaking change of adding a `qualifyColumn` method to the relation builder. Previously
+calling `qualifyColumn` on the relation forwarded the call to the model.
+
 ## [3.1.0] - 2020-10-28
 
 ### Added
diff --git a/src/Eloquent/Concerns/SortsModels.php b/src/Eloquent/Concerns/SortsModels.php
@@ -127,7 +127,7 @@ protected function getQualifiedSortColumn($query, $field)
     {
         $key = $this->getSortColumn($field, $query->getModel());
 
-        return $query->qualifyColumn($key);
+        return $query->getModel()->qualifyColumn($key);
     }
 
     /**
diff --git a/tests/lib/Integration/Eloquent/MorphToManyTest.php b/tests/lib/Integration/Eloquent/MorphToManyTest.php
@@ -238,7 +238,8 @@ public function testReadRelated()
 
         $post->tags()->sync($tags);
 
-        $this->doReadRelated($post, 'tags')
+        $this->withoutExceptionHandling()
+            ->doReadRelated($post, 'tags')
             ->willSeeType('tags')
             ->assertFetchedMany($expected);
     }

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ protected function getQualifiedSortColumn($query, $field)`
`127`	`127`	`{`
`128`	`128`	`$key = $this->getSortColumn($field, $query->getModel());`
`129`	`129`
`130`		`- return $query->qualifyColumn($key);`
	`130`	`+ return $query->getModel()->qualifyColumn($key);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,8 @@ public function testReadRelated()`
`238`	`238`
`239`	`239`	`$post->tags()->sync($tags);`
`240`	`240`
`241`		`- $this->doReadRelated($post, 'tags')`
	`241`	`+ $this->withoutExceptionHandling()`
	`242`	`+ ->doReadRelated($post, 'tags')`
`242`	`243`	`->willSeeType('tags')`
`243`	`244`	`->assertFetchedMany($expected);`
`244`	`245`	`}`