Skip to content

Add orderBy to HasOneLoader #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 2.x
Choose a base branch
from
Open

Add orderBy to HasOneLoader #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9095bc0
Add orderBy to HasOneLoader
markinigor Jun 4, 2024
6337389
Add tests for sqlite
markinigor Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion src/Select/Loader/HasOneLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@

namespace Cycle\ORM\Select\Loader;

use Cycle\Database\Query\SelectQuery;
use Cycle\ORM\FactoryInterface;
use Cycle\ORM\Parser\AbstractNode;
use Cycle\ORM\Parser\SingularNode;
use Cycle\ORM\Service\SourceProviderInterface;
use Cycle\ORM\Relation;
use Cycle\ORM\SchemaInterface;
use Cycle\ORM\Select\JoinableLoader;
use Cycle\ORM\Select\Traits\JoinOneTableTrait;
use Cycle\ORM\Select\Traits\OrderByTrait;
use Cycle\ORM\Select\Traits\WhereTrait;
use Cycle\Database\Query\SelectQuery;

/**
* Dedicated to load HAS_ONE relations, by default loader will prefer to join data into query.
Expand All @@ -25,6 +28,7 @@
class HasOneLoader extends JoinableLoader
{
use JoinOneTableTrait;
use OrderByTrait;
use WhereTrait;

/**
Expand All @@ -38,8 +42,22 @@ class HasOneLoader extends JoinableLoader
'as' => null,
'using' => null,
'where' => null,
'orderBy' => null,
];

public function __construct(
SchemaInterface $ormSchema,
SourceProviderInterface $sourceProvider,
FactoryInterface $factory,
string $name,
string $target,
array $schema
) {
parent::__construct($ormSchema, $sourceProvider, $factory, $name, $target, $schema);
$this->options['where'] = $schema[Relation::WHERE] ?? [];
$this->options['orderBy'] = $schema[Relation::ORDER_BY] ?? [];
}

public function configureQuery(SelectQuery $query, array $outerKeys = []): SelectQuery
{
if ($this->options['using'] !== null) {
Expand All @@ -56,6 +74,13 @@ public function configureQuery(SelectQuery $query, array $outerKeys = []): Selec
$this->options['where'] ?? $this->schema[Relation::WHERE] ?? []
);

// user specified ORDER_BY rules
$this->setOrderBy(
$query,
$this->getAlias(),
$this->options['orderBy'] ?? $this->schema[Relation::ORDER_BY] ?? []
);

return parent::configureQuery($query);
}

Expand Down
5 changes: 5 additions & 0 deletions tests/ORM/Fixtures/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class User implements ImagedInterface
*/
public $lastComment;

/**
* @var Comment|null
*/
public $firstComment;

/**
* @var Collection|Comment[]
*/
Expand Down
Loading