orm fixes

2021-02-23 16:59:43 +02:00
parent 9bb164246e
commit abd52c7a42
3 changed files with 49 additions and 4 deletions
@@ -1400,9 +1400,9 @@ abstract class BaseQueryComposer implements QueryComposer
        if (!empty($defs['select'])) {
            $expression = $defs['select'];

-            if ($alias) {
-                $expression = str_replace('{alias}', $alias, $expression);
-            }
+            $alias = $alias ?? $this->getFromAlias($params, $entity->getEntityType());
+
+            $expression = str_replace('{alias}', $alias, $expression);

            $pair = $this->getSelectPartItemPair($entity, $params, $expression);