Fixed an issue where columns aliases were turned into qualified column names

Author: Marcel Gwerder

src/Parser.php

@@ -726,7 +726,13 @@ protected function isRelation($model, $relationName)
      */
     protected function getQualifiedColumnName($column, $table = null)
     {
-        if (strpos($column, '.') === false) {
+        //Check whether there is a matching column expression that contains an 
+        //alias and should therefore not be turned into a qualified column name.
+        $isAlias = !empty(array_filter($this->query->columns ?: [], function($column) {
+            return stripos($column, ' as ') !== false;
+        }));
+
+        if (strpos($column, '.') === false && !$isAlias) {
             return $table ?: $this->query->from.'.'.$column;
         } else {
             return $column;

tests/ApiHandlerTest.php

@@ -242,7 +242,7 @@ public function testGetBuilder()
         $this->assertContains(['column' => 'comments.created_at', 'direction' => 'asc'], $orders);
 
         //
-        // Fulltext search
+        // Default fulltext search
         //
 
         $builder = $this->apiHandler->parseMultiple($post, ['title', 'description'], ['_q' => 'Something to search'])->getBuilder();
@@ -265,9 +265,17 @@ public function testGetBuilder()
             }
         }
 
-        $builder = $this->apiHandler->parseMultiple($post, ['title', 'description'], ['_q' => 'Something to search'])->getBuilder();
+        //
+        // Native fulltext search
+        //
+
+        $builder = $this->apiHandler->parseMultiple($post, ['title', 'description'], ['_q' => 'Something to search', '_sort' => '_score'])->getBuilder();
         $queryBuilder = $builder->getQuery();
 
+        //Test alias column in sort
+        $orders = $queryBuilder->orders;
+        $this->assertContains(['column' => '_score', 'direction' => 'asc'], $orders);
+
         //Test the where
         $wheres = $queryBuilder->wheres;
         $this->assertEquals(['type' => 'raw', 'sql' => 'MATCH(posts.title,posts.description) AGAINST("Something to search" IN BOOLEAN MODE)', 'boolean' => 'and'], $wheres[0]);