#3010 - convert expressions to strings

Author: Nacoma

src/EloquentDataTable.php

@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Database\Query\Expression;
 use Yajra\DataTables\Exceptions\Exception;
 
 /**
@@ -140,6 +141,19 @@ protected function isMorphRelation($relation)
         return $isMorph;
     }
 
+    protected function getColumnNameByIndex(int $index): string
+    {
+        $name = (isset($this->columns[$index]) && $this->columns[$index] != '*')
+            ? $this->columns[$index]
+            : $this->getPrimaryKeyName();
+
+        if ($name instanceof Expression) {
+            $name = $name->getValue($this->query->getGrammar());
+        }
+
+        return in_array($name, $this->extraColumns, true) ? $this->getPrimaryKeyName() : $name;
+    }
+
     /**
      * Resolve the proper column name be used.
      *

src/QueryDataTable.php

@@ -311,6 +311,19 @@ protected function getColumnSearchKeyword(int $i, bool $raw = false): string
         return $this->setupKeyword($keyword);
     }
 
+    protected function getColumnNameByIndex(int $index): string
+    {
+        $name = (isset($this->columns[$index]) && $this->columns[$index] != '*')
+            ? $this->columns[$index]
+            : $this->getPrimaryKeyName();
+
+        if ($name instanceof Expression) {
+            $name = $name->getValue($this->query->getGrammar());
+        }
+
+        return in_array($name, $this->extraColumns, true) ? $this->getPrimaryKeyName() : $name;
+    }
+
     /**
      * Apply filterColumn api search.
      *