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

Merge branch 'master' of https://git.mcnd.ca/mcndave/ulmus

Browse Source
This commit is contained in:
mcndave committed 2021-10-21 19:32:12 +00:00
2 parents 9ad2e94d12 dc5e088551
commit e4767f7c09
11 files changed
+178 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Repository/ConditionTrait.php
+1 -1
View File
@@ -53,7 +53,7 @@ trait ConditionTrait
return $this;
}
public function notWhere($field, $value, string $operator = Query\Where::OPERATOR_NOT_EQUAL) : self
public function notWhere($field, $value, string $operator = Query\Where::OPERATOR_EQUAL) : self
{
$this->queryBuilder->where($field, $value, $operator, Query\Where::CONDITION_AND, true);
src/Repository/RelationBuilder.php
+4 -3
View File
@@ -102,7 +102,7 @@ class RelationBuilder
protected function applyFilter(Repository $repository, string $name) : Repository
{
foreach($this->filters ?? [] as $filter) {
$repository = call_user_func_array([ $this->entity, $filter->method ], [ $repository, $name ]);
$repository = call_user_func_array([ $this->entity, $filter->method ], [ $repository, $name, false ]);
}
return $repository;
@@ -154,7 +154,8 @@ class RelationBuilder
$name = strtolower($name);
foreach($data ?: $this->entity->entityLoadedDataset as $key => $value) {
if ( $key === "{$name}\$collection" ) {
if ( $key === sprintf(static::SUBQUERY_FIELD_SUFFIX, strtolower($name)) ) {
if ($value) {
if ( null === ( $dataset = \json_decode($value, true) ) ) {
throw new \Exception(sprintf("JSON error '%s' from '%s'", \json_last_error_msg(), $value));
@@ -166,7 +167,7 @@ class RelationBuilder
return $entity::entityCollection();
}
}
elseif ( substr($key, 0, $len ) === "{$name}\$" ) {
elseif ( substr($key, 0, $len ) === sprintf(static::JOIN_FIELD_SEPARATOR, strtolower($name)) ) {
$vars[substr($key, $len)] = $value;
}
}