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

src/Repository/RelationBuilder.php

@@ -118,7 +118,7 @@ class RelationBuilder
             $this->repository->open();
 
             foreach($this->wheres as $condition) {
-                $this->repository->where($condition->field, $condition->value, $condition->operator);
+                $this->repository->where($condition->field, is_callable($condition->value) ? call_user_func_array($condition->value, [ $this->entity ]) : $condition->value, $condition->operator);
             }
 
             $this->repository->close();
@@ -155,7 +155,10 @@ class RelationBuilder
                 $entity = $annotation->entity ?? $this->resolver->properties[$name]['type'];
             }
 
+            $name = strtolower($name);
+
             foreach($data ?: $this->entity->entityLoadedDataset as $key => $value) {
+
                 if ( $key === sprintf(static::SUBQUERY_FIELD_SUFFIX, strtolower($name)) ) {
                     if ($value) {
                         if ( null === ( $dataset = \json_decode($value, true) ) ) {
@@ -227,6 +230,11 @@ class RelationBuilder
 
             })->where( $this->entity::field($bridgeRelation->foreignKey, $relationAlias), is_string($this->entity) ? $this->entity::field($bridgeRelation->foreignKey) : $this->entity->{$bridgeRelation->foreignKey} );
 
+
+        $this->applyWhere();
+
+        $this->applyOrderBy();
+
         if ($selectBridgeField && $relation->bridgeField) {
             $this->repository->selectEntity($relation->bridge, $bridgeAlias, $bridgeAlias);
         }