-Fixed join order in queries
This commit is contained in:
parent
486077b2d4
commit
e14a3670fc
|
@ -406,7 +406,7 @@ class QueryBuilder implements Query\QueryBuilderInterface
|
||||||
$sql = [];
|
$sql = [];
|
||||||
|
|
||||||
usort($this->queryStack, function($q1, $q2) {
|
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) {
|
foreach($this->queryStack as $fragment) {
|
||||||
|
|
|
@ -287,7 +287,6 @@ class Repository
|
||||||
public function generateDatasetDiff(object $entity, bool $oldValues = false) : array
|
public function generateDatasetDiff(object $entity, bool $oldValues = false) : array
|
||||||
{
|
{
|
||||||
$array = array_change_key_case($entity->toArray());
|
$array = array_change_key_case($entity->toArray());
|
||||||
|
|
||||||
$dataset = array_change_key_case($entity->entityGetDataset(false, true));
|
$dataset = array_change_key_case($entity->entityGetDataset(false, true));
|
||||||
|
|
||||||
return array_diff_assoc($oldValues ? $dataset : $array , $oldValues ? $array : $dataset );
|
return array_diff_assoc($oldValues ? $dataset : $array , $oldValues ? $array : $dataset );
|
||||||
|
|
Loading…
Reference in New Issue