viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-03-03 02:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ORM: no alias

Browse Source
This commit is contained in:
Yurii
2026-02-03 14:54:36 +02:00
parent bd9bacb210
commit b7b1562111
4 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/Espo/ORM/Query/Part/Selection.php
View File

@@ -63,6 +63,10 @@ class Selection
);
}
/**
* With an alias. With null, the field name will be used as an alias or an expression itself.
* Use `withNoAlias` to prevent alias addition.
*/
public function withAlias(?string $alias): self
{
$obj = clone $this;
@@ -70,4 +74,17 @@ class Selection
return $obj;
}
/**
* With on alias.
*
* @since 9.3.0
*/
public function withNoAlias(): self
{
$obj = clone $this;
$obj->alias = '';
return $obj;
}
}

4
application/Espo/ORM/Query/SelectBuilder.php
View File

@@ -166,7 +166,7 @@ class SelectBuilder implements Builder
if (is_string($select)) {
$this->params['select'] = $this->params['select'] ?? [];
$this->params['select'][] = $alias ?
$this->params['select'][] = $alias !== null ?
[$select, $alias] :
$select;
@@ -321,7 +321,7 @@ class SelectBuilder implements Builder
}
if ($item instanceof Selection) {
$resultList[] = $item->getAlias() ?
$resultList[] = $item->getAlias() !== null ?
[$item->getExpression()->getValue(), $item->getAlias()] :
[$item->getExpression()->getValue()];

15
application/Espo/ORM/QueryComposer/BaseQueryComposer.php
View File

@@ -1793,11 +1793,22 @@ abstract class BaseQueryComposer implements QueryComposer
foreach ($itemPairList as $item) {
$expression = $item[0];
if ($expression === '') {
throw new RuntimeException("Bad select expression.");
}
if ($item[1] === '') {
$selectPartItemList[] = $expression;
continue;
}
/** @noinspection PhpDeprecationInspection */
$alias = $this->sanitizeSelectAlias($item[1]);
if ($expression === '' || $alias === '') {
throw new RuntimeException("Bad select expression.");
if ($alias === '') {
throw new RuntimeException("Bad alias.");
}
$selectPartItemList[] = "$expression AS " . $this->quoteIdentifier($alias);

9
tests/unit/Espo/ORM/MysqlQueryComposerTest.php
View File

@@ -31,6 +31,7 @@ namespace tests\unit\Espo\ORM;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\Part\Join;
use Espo\ORM\Query\Part\Selection;
use Espo\ORM\Query\Part\Where\Comparison;
use Espo\ORM\Query\Part\WhereClause;
use Espo\ORM\Query\SelectBuilder;
@@ -3644,7 +3645,7 @@ class MysqlQueryComposerTest extends TestCase
->query(
SelectBuilder::create()
->select([
'order',
Selection::fromString('order')->withNoAlias(),
'id',
'parentId'
])
@@ -3655,7 +3656,7 @@ class MysqlQueryComposerTest extends TestCase
->query(
SelectBuilder::create()
->select([
'order',
Selection::fromString('order')->withNoAlias(),
'id',
'parentId',
])
@@ -3691,9 +3692,9 @@ class MysqlQueryComposerTest extends TestCase
$expected =
"WITH RECURSIVE `common_table` AS (" .
"(SELECT category.order AS `order`, category.id AS `id`, category.parent_id AS `parentId` FROM `category` " .
"(SELECT category.order, category.id AS `id`, category.parent_id AS `parentId` FROM `category` " .
"WHERE category.parent_id IS NULL) UNION ALL " .
"(SELECT category.order AS `order`, category.id AS `id`, category.parent_id AS `parentId` FROM `category` " .
"(SELECT category.order, category.id AS `id`, category.parent_id AS `parentId` FROM `category` " .
"JOIN `common_table` AS `comTab` ON comTab.id = category.parent_id " .
"WHERE category.parent_id IS NULL)) SELECT test.id AS `id` FROM `test` AS `test` " .
"JOIN `common_table` AS `comTab` ON comTab.id = test.category_id";