Merge branch 'hotfix/v5.11.14'

Author: yajra

change-log.md

@@ -8,6 +8,9 @@
 
 ##Change Log
 
+###v5.11.14
+    - Sort by a multi-line 'select as' query. PR #245
+
 ###v5.11.13
     - Allow fractal v0.12 and up. Fix #237.
 

src/yajra/Datatables/Engines/BaseEngine.php

@@ -251,10 +251,10 @@ protected function getColumnName($column)
      */
     public function extractColumnName($str)
     {
-        preg_match('#^(\S*?)\s+as\s+(\S*?)$#si', $str, $matches);
+        $matches = explode(' as ', Str::lower($str));
 
         if ( ! empty($matches)) {
-            return $matches[2];
+            return array_pop($matches);
         } elseif (strpos($str, '.')) {
             $array = explode('.', $str);
 

src/yajra/Datatables/Engines/QueryBuilderEngine.php

@@ -95,17 +95,17 @@ public function filtering()
             function ($query) {
                 $keyword = $this->setupKeyword($this->request->keyword());
                 foreach ($this->request->searchableColumnIndex() as $index) {
-                    $column = $this->setupColumnName($index);
+                    $columnName = $this->setupColumnName($index);
 
-                    if (isset($this->columnDef['filter'][$column])) {
-                        $method     = Helper::getOrMethod($this->columnDef['filter'][$column]['method']);
-                        $parameters = $this->columnDef['filter'][$column]['parameters'];
+                    if (isset($this->columnDef['filter'][$columnName])) {
+                        $method     = Helper::getOrMethod($this->columnDef['filter'][$columnName]['method']);
+                        $parameters = $this->columnDef['filter'][$columnName]['parameters'];
                         $this->compileColumnQuery(
-                            $this->getQueryBuilder($query), $method, $parameters, $column, $keyword
+                            $this->getQueryBuilder($query), $method, $parameters, $columnName, $keyword
                         );
                     } else {
-                        $column = $this->prefixColumn($column);
-                        $this->compileGlobalSearch($this->getQueryBuilder($query), $column, $keyword);
+                        $columnName = $this->prefixColumn($columnName);
+                        $this->compileGlobalSearch($this->getQueryBuilder($query), $columnName, $keyword);
                     }
 
                     $this->isFilterApplied = true;