mcndave/ulmus
1
0
Fork 0
Code Issues 16 Pull Requests Projects 1 Releases Wiki Activity

- Fixed a bug where withJoin() would mess with previous select() done on querybuilding

Browse Source 
- Fixed a problem related with distinct in select whenever another select on fields was done
This commit is contained in:
Dave Mc Nicoll 2025-03-20 17:28:56 +00:00
parent bfddf84564
commit 9556dea849
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/QueryBuilder/Sql/MysqlQueryBuilder.php
View File

@ -59,7 +59,7 @@ class MysqlQueryBuilder extends SqlQueryBuilder
$this->push($select); $this->push($select);
} }
$select->distinct = $distinct; $select->distinct = $select->distinct || $distinct;
return $this; return $this;
} }

9
src/Repository.php
View File

@ -407,7 +407,9 @@ class Repository implements RepositoryInterface
public function withJoin(string|array $fields, array $options = []) : self public function withJoin(string|array $fields, array $options = []) : self
{ {
if ( null === $this->queryBuilder->getFragment(Query\Select::class) ) { $canSelect = null === $this->queryBuilder->getFragment(Query\Select::class);
if ( $canSelect ) {
$select = $this->entityResolver->fieldList(EntityResolver::KEY_COLUMN_NAME, true); $select = $this->entityResolver->fieldList(EntityResolver::KEY_COLUMN_NAME, true);
$this->select($this->entityClass::fields(array_map(fn($f) => $f['object']->name ?? $f['name'], $select))); $this->select($this->entityClass::fields(array_map(fn($f) => $f['object']->name ?? $f['name'], $select)));
} }
@ -442,8 +444,9 @@ class Repository implements RepositoryInterface
$name = $entity::resolveEntity()->searchFieldAnnotation($field->name, [ Field::class ])->name ?? $field->name; $name = $entity::resolveEntity()->searchFieldAnnotation($field->name, [ Field::class ])->name ?? $field->name;
if ($canSelect) {
$this->select("$escAlias.$fieldName as $alias\${$name}"); $this->select("$escAlias.$fieldName as $alias\${$name}");
}
} }
} }