Qualify orderBy column with table name to avoid conflicts (#177)

wintercms · May 16, 2024 · cf8fd34 · cf8fd34 · LukeTowers · May 17, 2024
1 parent 9e9c3a5
commit cf8fd34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Database/SortableScope.php b/src/Database/SortableScope.php
@@ -17,7 +17,7 @@ public function apply(BuilderBase $builder, ModelBase $model)
     {
         // Only apply the scope when no other explicit orders have been set
         if (empty($builder->getQuery()->orders) && empty($builder->getQuery()->unionOrders)) {
-            $builder->orderBy($model->getSortOrderColumn());
+            $builder->orderBy($model->qualifyColumn($model->getSortOrderColumn()));
         }
     }
 }
diff --git a/tests/Database/SortableTest.php b/tests/Database/SortableTest.php
@@ -7,15 +7,15 @@ public function testOrderByIsAutomaticallyAdded()
         $model = new TestSortableModel();
         $query = $model->newQuery()->toSql();
 
-        $this->assertEquals('select * from "test" order by "sort_order" asc', $query);
+        $this->assertEquals('select * from "test" order by "test"."sort_order" asc', $query);
     }
 
     public function testCustomSortOrderByIsAutomaticallyAdded()
     {
         $model = new TestCustomSortableModel();
         $query = $model->newQuery()->toSql();
 
-        $this->assertEquals('select * from "test" order by "rank" asc', $query);
+        $this->assertEquals('select * from "test" order by "test"."rank" asc', $query);
     }
 
     public function testOrderByCanBeOverridden()