Skip to content

Use with in exists validator #59

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
mattrenner wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use with in exists validator #59

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
3180949
Set default value for a relation when loaded using with()
phindmarsh Mar 14, 2023
aa07191
Add support for eager loading relations via `exists` constraint in va…
phindmarsh Mar 14, 2023
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
16 changes: 16 additions & 0 deletions src/Wave/DB/Model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,22 @@ public function _getJoinedObjects() {
return $this->_joined_objects;
}

public function _setRelationDefault($relation_name)
{
$relation = static::_getRelation($relation_name);

switch($relation['relation_type']) {
case Relation::ONE_TO_ONE:
case Relation::MANY_TO_ONE:
$this->_data[$relation_name] = null;
break;
case Relation::ONE_TO_MANY:
case Relation::MANY_TO_MANY:
$this->_data[$relation_name] = array();
break;
}
}

/**
* Returns the joined objects for a given class name. Looks for the class in the list
* of aliases used when registering joined objects against this model
Expand Down
17 changes: 13 additions & 4 deletions src/Wave/DB/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

use Wave;
use Wave\Config;
use Wave\Inflector;

/**
* @method \Wave\DB\Query and () and ($condition, mixed $params = array())
Expand Down Expand Up @@ -158,7 +159,8 @@ public function with($relation, &$alias = null) {
//this needs recording so the object can be added as a relation, not a join
$this->with[$alias] = array(
'relation_type' => $relation_data['relation_type'],
'relation_name' => Wave\Inflector::singularize($relation)
'relation_name' => $relation,
'singular_name' => Wave\Inflector::singularize($relation)
);

return $this;
Expand Down Expand Up @@ -743,8 +745,15 @@ public function fetchRow($parse_objects = true, $debug = false) {


//if there's no instance of the main class, create a new one.
if(!isset($object_instances[$this->from_alias]))
if(!isset($object_instances[$this->from_alias])) {
$object_instances[$this->from_alias] = $this->buildClassInstance($this->from_alias);

if($object_instances[$this->from_alias] !== null && !empty($this->with)) {
foreach($this->with as $with) {
$object_instances[$this->from_alias]->_setRelationDefault($with['relation_name']);
}
}
}

if($object_instances[$this->from_alias] === null) {
trigger_error('Insufficient data in SELECT to build object instance.');
Expand Down Expand Up @@ -785,11 +794,11 @@ public function fetchRow($parse_objects = true, $debug = false) {
switch($this->with[$join['table_alias']]['relation_type']) {
case Wave\DB\Relation::ONE_TO_ONE:
case Wave\DB\Relation::MANY_TO_ONE:
$object_instances[$join['target_alias']]->{'set' . $this->with[$join['table_alias']]['relation_name']}($object_instances[$join['table_alias']], false);
$object_instances[$join['target_alias']]->{'set' . $this->with[$join['table_alias']]['singular_name']}($object_instances[$join['table_alias']], false);
break;
case Wave\DB\Relation::ONE_TO_MANY:
case Wave\DB\Relation::MANY_TO_MANY:
$object_instances[$join['target_alias']]->{'add' . $this->with[$join['table_alias']]['relation_name']}($object_instances[$join['table_alias']], false);
$object_instances[$join['target_alias']]->{'add' . $this->with[$join['table_alias']]['singular_name']}($object_instances[$join['table_alias']], false);
break;
}
} else {
Expand Down
11 changes: 9 additions & 2 deletions src/Wave/Validator/Constraints/ExistsConstraint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class ExistsConstraint extends AbstractConstraint implements CleanerInterface {
protected $type = 'exists';
protected $message = null;
private $match_fields = array();
private $with_relations = array();
private $instance = null;

public function __construct($property, $arguments, Validator &$validator) {
Expand All @@ -29,6 +30,8 @@ public function __construct($property, $arguments, Validator &$validator) {
$this->match_fields = array($arguments['property'] => $property);
}

$this->with_relations = $arguments['with'] ?? [];

if(empty($this->match_fields))
throw new \InvalidArgumentException("[$this->type] constraint requires at least one property to match");

Expand All @@ -39,10 +42,14 @@ public function __construct($property, $arguments, Validator &$validator) {
* @return bool
*/
public function evaluate() {
$statement = DB::get()->from($this->arguments['model']);
$statement = DB::get()->from($this->arguments['model'], $alias);

foreach($this->with_relations as $relation_name) {
$statement->with($relation_name);
}

foreach($this->match_fields as $column => $input_key) {
$statement->where($column . ' = ?', $this->validator[$input_key]);
$statement->where("$alias.$column = ?", $this->validator[$input_key]);
}

$this->instance = $statement->fetchRow();
Expand Down