Skip to content

Commit c242fea

Browse files
authored
Merge pull request #159 from skipperbent/v4-development
bugfixes
2 parents 22923ba + 60385cc commit c242fea

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/Pecee/Pixie/QueryBuilder/Adapters/BaseAdapter.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,10 @@ private function doInsert(array $statements, array $data, $type): array
443443
$keys[] = $key;
444444
if ($value instanceof Raw) {
445445
$values[] = (string)$value;
446-
$bindings[] = $value->getBindings();
446+
$bindings[] = (array)$value->getBindings();
447447
} else {
448448
$values[] = '?';
449-
$bindings[] = $value;
449+
$bindings[] = (array)$value;
450450
}
451451
}
452452

@@ -458,7 +458,7 @@ private function doInsert(array $statements, array $data, $type): array
458458
'(' . $this->arrayStr($values, ', ', false) . ')',
459459
];
460460

461-
$bindings = array_merge(...(array)$bindings);
461+
$bindings = array_merge(...$bindings);
462462

463463
if (isset($statements['onduplicate']) === true) {
464464

@@ -495,14 +495,14 @@ private function getUpdateStatement(array $data): array
495495

496496
if ($value instanceof Raw) {
497497
$statements[] = $statement . $value;
498-
$bindings[] = $value->getBindings();
498+
$bindings[] = (array)$value->getBindings();
499499
} else {
500500
$statements[] = $statement . '?';
501-
$bindings[] = $value;
501+
$bindings[] = (array)$value;
502502
}
503503
}
504504

505-
$bindings = array_merge(...(array)$bindings);
505+
$bindings = array_merge(...$bindings);
506506

507507
$statement = trim($this->arrayStr($statements, ', ', false));
508508

@@ -579,15 +579,15 @@ protected function setSelectStatement(array &$statements, array &$bindings): boo
579579

580580
foreach ((array)$statements['selects'] as $select) {
581581
if ($select instanceof Raw) {
582-
$bindings[] = $select->getBindings();
582+
$bindings[] = (array)$select->getBindings();
583583
}
584584
}
585585

586586
if (isset($statements['selects'])) {
587587
$statements['selects'] = array_unique($statements['selects']);
588588
}
589589

590-
$bindings = array_merge(...(array)$bindings);
590+
$bindings = array_merge(...$bindings);
591591

592592
return $hasDistincts;
593593
}

0 commit comments

Comments
 (0)