Skip to content
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

Fix instanceof #42

Closed
wants to merge 3 commits into from
Closed

Fix instanceof #42

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6a96b1
Fix the order relationships are evaluated in
27pchrisl Mar 11, 2024
2a5c23c
fixed and reordered
Mar 12, 2024
cc9c1a2
Fix styling
biiiiiigmonster Mar 12, 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
79 changes: 40 additions & 39 deletions src/Database/Eloquent/RelationMixin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
use Illuminate\Database\Eloquent\Relations\MorphOne;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\Relations\MorphOneOrMany;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
use LogicException;

Expand All @@ -24,6 +22,7 @@ public function getRelationExistenceInQuery(): Closure
$relation = function (Builder $query, Builder $parentQuery, $columns = ['*']): Builder {
return $query->select($columns);
};
// basic builder
$belongsTo = function (Builder $query, Builder $parentQuery) use ($relation): Builder {
$columns = $query->qualifyColumn($this->ownerKey);

Expand Down Expand Up @@ -63,32 +62,6 @@ public function getRelationExistenceInQuery(): Closure

return $relation($query, $parentQuery, $columns);
};
$hasOne = function (Builder $query, Builder $parentQuery) use ($hasOneOrMany): Builder {
if ($this->isOneOfMany()) {
$this->mergeOneOfManyJoinsTo($query);
}

return $hasOneOrMany($query, $parentQuery);
};
$morphOneOrMany = function (Builder $query, Builder $parentQuery) use ($hasOneOrMany): Builder {
return $hasOneOrMany($query, $parentQuery)->where(
$query->qualifyColumn($this->getMorphType()),
$this->morphClass
);
};
$morphOne = function (Builder $query, Builder $parentQuery) use ($morphOneOrMany): Builder {
if ($this->isOneOfMany()) {
$this->mergeOneOfManyJoinsTo($query);
}

return $morphOneOrMany($query, $parentQuery);
};
$morphToMany = function (Builder $query, Builder $parentQuery) use ($belongsToMany): Builder {
return $belongsToMany($query, $parentQuery)->where(
$this->qualifyPivotColumn($this->morphType),
$this->morphClass
);
};
$hasManyThrough = function (Builder $query, Builder $parentQuery) use ($relation): Builder {
$columns = $this->getQualifiedFirstKeyName();
if ($parentQuery->getQuery()->from === $query->getQuery()->from) {
Expand Down Expand Up @@ -121,16 +94,45 @@ public function getRelationExistenceInQuery(): Closure

return $relation($query, $parentQuery, $columns);
};
// extended builder
$hasOne = function (Builder $query, Builder $parentQuery) use ($hasOneOrMany): Builder {
if ($this->isOneOfMany()) {
$this->mergeOneOfManyJoinsTo($query);
}

return $hasOneOrMany($query, $parentQuery);
};
$morphOneOrMany = function (Builder $query, Builder $parentQuery) use ($hasOneOrMany): Builder {
return $hasOneOrMany($query, $parentQuery)->where(
$query->qualifyColumn($this->getMorphType()),
$this->morphClass
);
};
$morphOne = function (Builder $query, Builder $parentQuery) use ($morphOneOrMany): Builder {
if ($this->isOneOfMany()) {
$this->mergeOneOfManyJoinsTo($query);
}

return $morphOneOrMany($query, $parentQuery);
};
$morphToMany = function (Builder $query, Builder $parentQuery) use ($belongsToMany): Builder {
return $belongsToMany($query, $parentQuery)->where(
$this->qualifyPivotColumn($this->morphType),
$this->morphClass
);
};

return match (true) {
$this instanceof MorphMany => $morphOneOrMany($query, $parentQuery),
$this instanceof BelongsTo, $this instanceof MorphTo => $belongsTo($query, $parentQuery),
$this instanceof HasMany => $hasOneOrMany($query, $parentQuery),
// extended relation
$this instanceof HasOne => $hasOne($query, $parentQuery),
$this instanceof MorphOne => $morphOne($query, $parentQuery),
$this instanceof BelongsToMany => $belongsToMany($query, $parentQuery),
$this instanceof MorphOneOrMany => $morphOneOrMany($query, $parentQuery),
$this instanceof MorphToMany => $morphToMany($query, $parentQuery),
$this instanceof HasOneThrough, $this instanceof HasManyThrough => $hasManyThrough($query, $parentQuery),
// basic relation
$this instanceof BelongsTo => $belongsTo($query, $parentQuery),
$this instanceof BelongsToMany => $belongsToMany($query, $parentQuery),
$this instanceof HasOneOrMany => $hasOneOrMany($query, $parentQuery),
$this instanceof HasManyThrough => $hasManyThrough($query, $parentQuery),
default => throw new LogicException(
sprintf('%s must be a relationship instance.', $this::class)
)
Expand All @@ -141,10 +143,9 @@ public function getRelationExistenceInQuery(): Closure
public function getRelationWhereInKey(): Closure
{
return fn (): string => match (true) {
$this instanceof BelongsTo, $this instanceof MorphTo => $this->getQualifiedForeignKeyName(),
$this instanceof HasOne, $this instanceof HasMany, $this instanceof BelongsToMany,
$this instanceof MorphMany, $this instanceof MorphOne, $this instanceof MorphToMany => $this->getQualifiedParentKeyName(),
$this instanceof HasOneThrough, $this instanceof HasManyThrough => $this->getQualifiedLocalKeyName(),
$this instanceof BelongsTo => $this->getQualifiedForeignKeyName(),
$this instanceof HasOneOrMany, $this instanceof BelongsToMany => $this->getQualifiedParentKeyName(),
$this instanceof HasManyThrough => $this->getQualifiedLocalKeyName(),
default => throw new LogicException(
sprintf('%s must be a relationship instance.', $this::class)
)
Expand Down
Loading