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

Jump to bottom

HasManyThrough with Lambda #842

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

HasManyThrough with Lambda #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6082f78
Fixed Lambda HasManyThrough
tychokamphuis-aqqo Aug 30, 2024
72095df
Removed redundant change
tychokamphuis-aqqo Aug 30, 2024
9d92e69
Improvements for php7
tychokamphuis-aqqo Aug 30, 2024
29d3379
Merge branch 'refs/heads/5.x' into 5.x-lambda-has-many-through
tychokamphuis-aqqo Sep 19, 2024
5912ced
Added support for array if using other packages
tychokamphuis-aqqo Sep 26, 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
22 changes: 15 additions & 7 deletions src/Drivers/EloquentEntitySet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
Expand Down Expand Up @@ -393,6 +394,7 @@ protected function getRelationships(): array
$expansionSet->configureBuilder($builder);
};


$relations = array_merge(
$relations,
Collection::make($expansionSet->getRelationships())
Expand Down Expand Up @@ -541,24 +543,30 @@ public function discoverRelationship(

$navigationProperty->setNullable($nullable);

if ($relation instanceof HasOneOrMany || $relation instanceof BelongsTo) {
if ($relation instanceof HasOneOrMany || $relation instanceof BelongsTo || $relation instanceof HasManyThrough) {
$localProperty = null;
$foreignProperty = null;


switch (true) {
case $relation instanceof HasOneOrMany:
$localProperty = $this->getPropertyBySourceName($relation->getLocalKeyName());
$foreignProperty = $right->getPropertyBySourceName($relation->getForeignKeyName());
$localProperty = $this->getPropertyBySourceName(is_array($relation->getLocalKeyName()) ? $relation->getLocalKeyName()[0] : $relation->getLocalKeyName());
$foreignProperty = $right->getPropertyBySourceName(is_array($relation->getForeignKeyName()) ? $relation->getForeignKeyName()[0] : $relation->getForeignKeyName());
break;

case $relation instanceof BelongsTo:
$localProperty = $this->getPropertyBySourceName($relation->getForeignKeyName());
$foreignProperty = $right->getPropertyBySourceName($relation->getOwnerKeyName());
$localProperty = $this->getPropertyBySourceName(is_array($relation->getForeignKeyName()) ? $relation->getForeignKeyName()[0] : $relation->getForeignKeyName());
$foreignProperty = $right->getPropertyBySourceName(is_array($relation->getOwnerKeyName()) ? $relation->getOwnerKeyName()[0] : $relation->getOwnerKeyName());
break;

case $relation instanceof HasManyThrough:
$localProperty = $this->getPropertyBySourceName(is_array($relation->getLocalKeyName()) ? $relation->getLocalKeyName()[0] : $relation->getLocalKeyName());
$foreignProperty = $right->getPropertyBySourceName(is_array($relation->getForeignKeyName()) ? $relation->getForeignKeyName()[0] : $relation->getForeignKeyName());
break;
}

if ($localProperty && $foreignProperty) {
$referentialConstraint = new ReferentialConstraint($localProperty, $foreignProperty);
$referentialConstraint = new ReferentialConstraint($localProperty, $foreignProperty, $relation);
$navigationProperty->addConstraint($referentialConstraint);
}
}
Expand Down Expand Up @@ -813,4 +821,4 @@ public function discover(): self

return $this;
}
}
}
37 changes: 26 additions & 11 deletions src/Drivers/SQL/SQLExpression.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
use Flat3\Lodata\NavigationProperty;
use Flat3\Lodata\ReferentialConstraint;
use Flat3\Lodata\Type;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;

/**
* SQL Expression, with its associated parameters
Expand Down Expand Up @@ -1317,16 +1318,29 @@ protected function lambdaExpression(Lambda $node): void
$constraint = array_shift($constraints);

$field = $this->entitySet->propertyToExpression($constraint->getProperty());
$this->pushParameters($field->getParameters());

$this->pushStatement(
sprintf('( %s = %s ( SELECT %s from %s WHERE',
$field->getStatement(),
$node instanceof Lambda\Any ? 'ANY' : 'ALL',
$targetSet->propertyToExpression($constraint->getReferencedProperty())->getStatement(),
$targetSet->quoteSingleIdentifier($targetSet->getTable()),
)
);

$relation = $constraint->getRelation();
if (isset($relation) && $relation instanceof HasManyThrough) {
$constraint->getRelation()->select($relation->getQualifiedFirstKeyName());
$where = preg_replace('/\s+where\s+.*$/i', '', $constraint->getRelation()->toSql());
$this->pushStatement(
sprintf('( %s = %s ( %s WHERE',
$field->getStatement(),
$node instanceof Lambda\Any ? 'ANY' : 'ALL',
$where,
)
);
} else {
$this->pushParameters($field->getParameters());
$this->pushStatement(
sprintf('( %s = %s ( SELECT %s from %s WHERE',
$field->getStatement(),
$node instanceof Lambda\Any ? 'ANY' : 'ALL',
$targetSet->propertyToExpression($constraint->getReferencedProperty())->getStatement(),
$targetSet->quoteSingleIdentifier($targetSet->getTable()),
)
);
}

$operatingTargetSet = clone $targetSet;

Expand All @@ -1335,6 +1349,7 @@ protected function lambdaExpression(Lambda $node): void
$targetExpression->evaluate($lambdaExpression);
$parser->popEntitySet();


$this->pushStatement($targetExpression->getStatement());
$this->parameters = array_merge($this->parameters, $targetExpression->getParameters());

Expand All @@ -1345,4 +1360,4 @@ protected function lambdaExpression(Lambda $node): void
}
}
}
}
}
16 changes: 15 additions & 1 deletion src/ReferentialConstraint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace Flat3\Lodata;

use Illuminate\Database\Eloquent\Relations\Relation;

/**
* Referential Constraint
* @link https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530370
Expand All @@ -23,10 +25,13 @@ class ReferentialConstraint
*/
protected $referencedProperty;

public function __construct(Property $property, Property $referenced_property)
private $relation;

public function __construct(Property $property, Property $referenced_property, Relation $relation = null)
{
$this->property = $property;
$this->referencedProperty = $referenced_property;
$this->relation = $relation;
}

/**
Expand All @@ -47,6 +52,15 @@ public function getReferencedProperty(): Property
return $this->referencedProperty;
}

/**
* Get the referenced relation
* @return Relation|null
*/
public function getRelation(): ?Relation
{
return $this->relation;
}

/**
* @return string
*/
Expand Down