Skip to content

Commit 8d0e216

Browse files
committed
Removed $escape = false; again
Added another test where this makes a difference.
1 parent a79f8b3 commit 8d0e216

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

system/Database/BaseBuilder.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,6 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
737737
} else {
738738
$keyValue = [(string) $key => $value];
739739
}
740-
$escape = false;
741740
} elseif (! is_array($key)) {
742741
$keyValue = [$key => $value];
743742
} else {

tests/system/Database/Builder/WhereTest.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,21 @@ public function testWhereValueRawSql()
189189
$this->assertSame($expected, $sql);
190190
}
191191

192+
public function testWhereKeyOnlyRawSql()
193+
{
194+
$sql = $this->db->table('auth_bearer')
195+
->select('*')
196+
->where(new RawSql('DATE_ADD(NOW(), INTERVAL 2 HOUR)'), '2023-01-01')
197+
->getCompiledSelect(true);
198+
199+
$expected = <<<'SQL'
200+
SELECT *
201+
FROM "auth_bearer"
202+
WHERE DATE_ADD(NOW(), INTERVAL 2 HOUR) = '2023-01-01'
203+
SQL;
204+
$this->assertSame($expected, $sql);
205+
}
206+
192207
public function testWhereKeyAndValueRawSql()
193208
{
194209
$sql = $this->db->table('auth_bearer')

0 commit comments

Comments
 (0)