diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php index c378a27..10263db 100644 --- a/src/QueryBuilder.php +++ b/src/QueryBuilder.php @@ -406,7 +406,7 @@ class QueryBuilder implements Query\QueryBuilderInterface $sql = []; usort($this->queryStack, function($q1, $q2) { - return (float) $q1->order <=> (float) $q2->order; + return (float) $q1->order() <=> (float) $q2->order(); }); foreach($this->queryStack as $fragment) { diff --git a/src/Repository.php b/src/Repository.php index 6723f54..795ce36 100644 --- a/src/Repository.php +++ b/src/Repository.php @@ -287,7 +287,6 @@ class Repository public function generateDatasetDiff(object $entity, bool $oldValues = false) : array { $array = array_change_key_case($entity->toArray()); - $dataset = array_change_key_case($entity->entityGetDataset(false, true)); return array_diff_assoc($oldValues ? $dataset : $array , $oldValues ? $array : $dataset );