Removed $escape = false; again

Added another test where this makes a difference.
codeigniter4 · Jan 18, 2023 · 8d0e216 · 8d0e216
1 parent a79f8b3
commit 8d0e216
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -737,7 +737,6 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
             } else {
                 $keyValue = [(string) $key => $value];
             }
-            $escape = false;
         } elseif (! is_array($key)) {
             $keyValue = [$key => $value];
         } else {

diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
@@ -189,6 +189,21 @@ public function testWhereValueRawSql()
         $this->assertSame($expected, $sql);
     }
 
+    public function testWhereKeyOnlyRawSql()
+    {
+        $sql = $this->db->table('auth_bearer')
+            ->select('*')
+            ->where(new RawSql('DATE_ADD(NOW(), INTERVAL 2 HOUR)'), '2023-01-01')
+            ->getCompiledSelect(true);
+
+        $expected = <<<'SQL'
+            SELECT *
+            FROM "auth_bearer"
+            WHERE DATE_ADD(NOW(), INTERVAL 2 HOUR) = '2023-01-01'
+            SQL;
+        $this->assertSame($expected, $sql);
+    }
+
     public function testWhereKeyAndValueRawSql()
     {
         $sql = $this->db->table('auth_bearer')