Skip to content

Commit bcbc4f8

Browse files
committed
refactor(database): polish whereBetween helper internals
Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>
1 parent 565209b commit bcbc4f8

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

system/Database/BaseBuilder.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ public function orWhereNotBetween(?string $key = null, $values = null, ?bool $es
961961
*
962962
* @throws InvalidArgumentException
963963
*/
964-
protected function whereBetweenHaving(string $qbKey, ?string $key = null, $values = null, bool $not = false, string $type = 'AND ', ?bool $escape = null): static
964+
private function whereBetweenHaving(string $qbKey, ?string $key = null, $values = null, bool $not = false, string $type = 'AND ', ?bool $escape = null): static
965965
{
966966
if ($key === null || $key === '') {
967967
throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
@@ -973,10 +973,9 @@ protected function whereBetweenHaving(string $qbKey, ?string $key = null, $value
973973

974974
$escape ??= $this->db->protectIdentifiers;
975975
$values = array_values($values);
976-
$ok = $key;
977976

978-
$lowerBind = $this->setBind($ok, $values[0], $escape);
979-
$upperBind = $this->setBind($ok, $values[1], $escape);
977+
$lowerBind = $this->setBind($key, $values[0], $escape);
978+
$upperBind = $this->setBind($key, $values[1], $escape);
980979
$not = $not ? ' NOT' : '';
981980
$prefix = $this->{$qbKey} === [] ? $this->groupGetType('') : $this->groupGetType($type);
982981

0 commit comments

Comments
 (0)