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

src/EntityTrait.php

@@ -158,7 +158,7 @@ trait EntityTrait {
             $annotation = $entityResolver->searchFieldAnnotation($key, [ Attribute\Property\Field::class, Field::class ]);
 
             if ( isset($this->$key) ) {
-                $dataset[$annotation->name ?? $key] = $rewriteValue?
+                $dataset[$annotation->name ?? $key] = $rewriteValue ?
                     static::repository()->adapter->adapter()->writableValue($this->$key)
                 :
                     $this->$key;
@@ -196,9 +196,9 @@ trait EntityTrait {
     }
 
     #[Ignore]
-    public function toArray($includeRelations = false, array $filterFields = null) : array
+    public function toArray($includeRelations = false, array $filterFields = null, bool $rewriteValue = true) : array
     {
-        $dataset = $this->entityGetDataset($includeRelations, false, false);
+        $dataset = $this->entityGetDataset($includeRelations, false, $rewriteValue);
 
         return $filterFields ? array_intersect_key($dataset, array_flip($filterFields)) : $dataset;
     }

src/QueryBuilder.php

@@ -528,6 +528,7 @@ class QueryBuilder implements Query\QueryBuilderInterface
     {
         $this->values = $values;
     }
+    
     protected function nextJoinOrder() : float
     {
         $next = 0;

src/Repository.php

@@ -450,7 +450,6 @@ class Repository
     public function values(array $dataset) : self
     {
         $this->queryBuilder->values($dataset);
-
         return $this;
     }
 

src/Repository/RelationBuilder.php

@@ -130,7 +130,7 @@ class RelationBuilder
 
                     $this->entity->eventExecute(Event\EntityRelationLoadInterface::class, $name, $this->repository);
 
-                    $results = call_user_func([ $this->repository, $relationRelation->function() ]);
+                    $results = call_user_func([ $this->repository, 'loadAll' /*$relationRelation->function()*/ ]);
 
                     if ($relation->bridgeField ?? false) {
                         $collection = $relation->bridge::entityCollection();