Merge pull request #473 from foaly-nr1/patch-embeddable-order-column

Support embeddables in order columns
stwe · Oct 24, 2016 · 5ee0b5a · 5ee0b5a
2 parents 23bbfa9 + 0e5bb9b
commit 5ee0b5a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Datatable/Data/DatatableQuery.php b/Datatable/Data/DatatableQuery.php
@@ -305,8 +305,9 @@ private function setupColumnArrays()
                 if (count($parts) > 1) {
                     // If it's an embedded class, we can query without JOIN
                     if (array_key_exists($parts[0], $metadata->embeddedClasses)) {
-                        $this->selectColumns[$currentAlias][] = str_replace('\\', '', $data);
-                        $this->addSearchOrderColumn($key, $currentAlias, $data);
+                        $column = str_replace('\\', '', $data);
+                        $this->selectColumns[$currentAlias][] = $column;
+                        $this->addSearchOrderColumn($key, $currentAlias, $column);
                         continue;
                     }
                 } else {