From acab934f6ff42193d032c1bcf801652d38745a1e Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <dave.mcnicoll@cslsj.qc.ca>
Date: Wed, 8 Nov 2023 09:27:03 -0500
Subject: [PATCH] - Some bugfixes applied live

---
 src/Adapter/SqlAdapterTrait.php    | 2 +-
 src/EntityTrait.php                | 6 +++---
 src/Query/Values.php               | 2 +-
 src/QueryBuilder.php               | 1 +
 src/Repository.php                 | 1 -
 src/Repository/RelationBuilder.php | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Adapter/SqlAdapterTrait.php b/src/Adapter/SqlAdapterTrait.php
index a1860de..bf2a2b5 100644
--- a/src/Adapter/SqlAdapterTrait.php
+++ b/src/Adapter/SqlAdapterTrait.php
@@ -125,7 +125,7 @@ trait SqlAdapterTrait
         ]);
     }
 
-    public function writableValue(mixed  $value) : mixed
+    public function writableValue(mixed $value) : mixed
     {
         switch (true) {
             case $value instanceof \UnitEnum:
diff --git a/src/EntityTrait.php b/src/EntityTrait.php
index dddb375..a054319 100644
--- a/src/EntityTrait.php
+++ b/src/EntityTrait.php
@@ -157,7 +157,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;
@@ -195,9 +195,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;
     }
diff --git a/src/Query/Values.php b/src/Query/Values.php
index 45fc348..1bd11f4 100644
--- a/src/Query/Values.php
+++ b/src/Query/Values.php
@@ -42,7 +42,7 @@ class Values extends Fragment {
     public function renderParameterPlaceholders() : string 
     {
         $return = [];
-        
+
         foreach($this->rows as $row) {
             if ($this->fieldCount === null) {
             }
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
index c8745ec..138ce2c 100644
--- a/src/QueryBuilder.php
+++ b/src/QueryBuilder.php
@@ -528,6 +528,7 @@ class QueryBuilder implements Query\QueryBuilderInterface
     {
         $this->values = $values;
     }
+    
     protected function nextJoinOrder() : float
     {
         $next = 0;
diff --git a/src/Repository.php b/src/Repository.php
index 1dcb8b4..535d353 100644
--- a/src/Repository.php
+++ b/src/Repository.php
@@ -450,7 +450,6 @@ class Repository
     public function values(array $dataset) : self
     {
         $this->queryBuilder->values($dataset);
-
         return $this;
     }
 
diff --git a/src/Repository/RelationBuilder.php b/src/Repository/RelationBuilder.php
index 498d2e0..6dc8669 100644
--- a/src/Repository/RelationBuilder.php
+++ b/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();