Merge tag 'v0.10.3' into develop

lindyhopchris · lindyhopchris · commit 292bab87f003 · 2017-09-02T07:05:24.000+01:00
Fix qualified sorting parameters in Eloquent adapter.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ All notable changes to this project will be documented in this file. This projec
 - Client supplied ids will now be hydrated into Eloquent models, configurable via the `$clientId` property
 on the Eloquent hydrator.
 
+## [0.10.3] - 2017-09-02
+
+### Fixed
+-[#96] Fixed creation of qualified sorting parameters in the Eloquent adapter. 
+
 ## [0.10.2] - 2017-08-25
 
 ### Added
diff --git a/src/Store/EloquentAdapter.php b/src/Store/EloquentAdapter.php
@@ -364,7 +364,7 @@ protected function getQualifiedSortColumn(Builder $query, $field)
     {
         $key = $this->columnForField($field, $query->getModel());
 
-        if (!str_contains('.', $key)) {
+        if (!str_contains($key, '.')) {
             $key = sprintf('%s.%s', $query->getModel()->getTable(), $key);
         }
 
diff --git a/tests/Integration/Eloquent/PostsTest.php b/tests/Integration/Eloquent/PostsTest.php
@@ -13,6 +13,13 @@ class PostsTest extends TestCase
      */
     protected $resourceType = 'posts';
 
+    public function testSearch()
+    {
+        factory(Post::class, 3)->create();
+
+        $this->doSearch(['sort' => '-created-at'])->assertSearchResponse();
+    }
+
     /**
      * Test that we can search posts for specific ids
      */

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ protected function getQualifiedSortColumn(Builder $query, $field)`
`364`	`364`	`{`
`365`	`365`	`$key = $this->columnForField($field, $query->getModel());`
`366`	`366`
`367`		`- if (!str_contains('.', $key)) {`
	`367`	`+ if (!str_contains($key, '.')) {`
`368`	`368`	`$key = sprintf('%s.%s', $query->getModel()->getTable(), $key);`
`369`	`369`	`}`
`370`	`370`