Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not inappropriately register bind when the value is a closure #5247

Merged
merged 8 commits into from
Nov 16, 2021
Merged

Do not inappropriately register bind when the value is a closure #5247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
699129b
Add variable $op, in order to not alter variable $k
vlakoff Oct 27, 2021
223ca28
Do not inappropriately register bind when the value is a closure
vlakoff Oct 27, 2021
0ae8a67
Code simplification
vlakoff Oct 27, 2021
abd0f7a
Another code simplification
vlakoff Oct 27, 2021
3e8903a
Do not append $op if it has not been removed from $k
vlakoff Oct 27, 2021
01dfc65
Adding a space in query
vlakoff Oct 27, 2021
65b8569
Micro-optimization
vlakoff Oct 27, 2021
68ad987
Add unit test for the case "$v === null and $k has operator"
vlakoff Oct 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions system/Database/BaseBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,34 +658,35 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type

$op = trim(current($op));

if (substr($k, -1 * strlen($op)) === $op) {
$k = rtrim(strrev(preg_replace(strrev('/' . $op . '/'), strrev(''), strrev($k), 1)));
if (substr($k, -strlen($op)) === $op) {
$k = rtrim(substr($k, 0, -strlen($op)));
$op = " {$op}";
} else {
$op = '';
}
}

$bind = $this->setBind($k, $v, $escape);

if (empty($op)) {
$k .= ' =';
} else {
$k .= " {$op}";
$op = ' =';
}

if ($v instanceof Closure) {
$builder = $this->cleanClone();
$v = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
$v = ' (' . strtr($v($builder)->getCompiledSelect(), "\n", ' ') . ')';
} else {
$v = " :{$bind}:";
$bind = $this->setBind($k, $v, $escape);
$v = " :{$bind}:";
}
} elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving') {
// value appears not to have been set, assign the test to IS NULL
$k .= ' IS NULL';
$op = ' IS NULL';
} elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE)) {
$k = substr($k, 0, $match[0][1]) . ($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
$k = substr($k, 0, $match[0][1]);
$op = $match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL';
} else {
$op = '';
}

$this->{$qbKey}[] = [
'condition' => $prefix . $k . $v,
'condition' => $prefix . $k . $op . $v,
'escape' => $escape,
];
}
Expand Down Expand Up @@ -841,7 +842,7 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal

if ($values instanceof Closure) {
$builder = $this->cleanClone();
$ok = str_replace("\n", ' ', $values($builder)->getCompiledSelect());
$ok = strtr($values($builder)->getCompiledSelect(), "\n", ' ');
} else {
$whereIn = array_values($values);
$ok = $this->setBind($ok, $whereIn, $escape);
Expand Down
16 changes: 16 additions & 0 deletions tests/system/Database/Builder/WhereTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,22 @@ public function testWhereAssociateArray()
$this->assertSame($expectedBinds, $builder->getBinds());
}

public function testWhereAssociateArrayKeyHasEqualValueIsNull()
{
$builder = $this->db->table('users');

$where = [
'deleted_at =' => null,
];

$expectedSQL = 'SELECT * FROM "users" WHERE "deleted_at" IS NULL';
$expectedBinds = [];

$builder->where($where);
$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
$this->assertSame($expectedBinds, $builder->getBinds());
}

public function testWhereCustomString()
{
$builder = $this->db->table('jobs');
Expand Down