Merge pull request #7147 from sclubricants/FixBuilderWhere

Bug Fix: [QueryBuilder] where() generates incorrect SQL when using RawSql

Author: kenjis

system/Database/BaseBuilder.php

@@ -728,9 +728,15 @@ public function orWhere($key, $value = null, ?bool $escape = null)
      */
     protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', ?bool $escape = null)
     {
+        $rawSqlOnly = false;
+
         if ($key instanceof RawSql) {
-            $keyValue = [(string) $key => $key];
-            $escape   = false;
+            if ($value === null) {
+                $keyValue   = [(string) $key => $key];
+                $rawSqlOnly = true;
+            } else {
+                $keyValue = [(string) $key => $value];
+            }
         } elseif (! is_array($key)) {
             $keyValue = [$key => $value];
         } else {
@@ -745,7 +751,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
         foreach ($keyValue as $k => $v) {
             $prefix = empty($this->{$qbKey}) ? $this->groupGetType('') : $this->groupGetType($type);
 
-            if ($v instanceof RawSql) {
+            if ($rawSqlOnly === true) {
                 $k  = '';
                 $op = '';
             } elseif ($v !== null) {

tests/system/Database/Builder/WhereTest.php

@@ -174,6 +174,66 @@ public function testWhereRawSql()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
+    public function testWhereValueRawSql()
+    {
+        $sql = $this->db->table('auth_bearer')
+            ->select('*')
+            ->where('expires', new RawSql('DATE_ADD(NOW(), INTERVAL 2 HOUR)'))
+            ->getCompiledSelect(true);
+
+        $expected = <<<'SQL'
+            SELECT *
+            FROM "auth_bearer"
+            WHERE "expires" = DATE_ADD(NOW(), INTERVAL 2 HOUR)
+            SQL;
+        $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')
+            ->select('*')
+            ->where(new RawSql('CURRENT_TIMESTAMP()'), new RawSql('DATE_ADD(column, INTERVAL 2 HOUR)'))
+            ->getCompiledSelect(true);
+
+        $expected = <<<'SQL'
+            SELECT *
+            FROM "auth_bearer"
+            WHERE CURRENT_TIMESTAMP() = DATE_ADD(column, INTERVAL 2 HOUR)
+            SQL;
+        $this->assertSame($expected, $sql);
+    }
+
+    public function testWhereKeyAndValueRawSqlWithOperator()
+    {
+        $sql = $this->db->table('auth_bearer')
+            ->select('*')
+            ->where(new RawSql('CURRENT_TIMESTAMP() >='), new RawSql('DATE_ADD(column, INTERVAL 2 HOUR)'))
+            ->getCompiledSelect(true);
+
+        $expected = <<<'SQL'
+            SELECT *
+            FROM "auth_bearer"
+            WHERE CURRENT_TIMESTAMP() >= DATE_ADD(column, INTERVAL 2 HOUR)
+            SQL;
+        $this->assertSame($expected, $sql);
+    }
+
     public function testWhereValueSubQuery()
     {
         $expectedSQL = 'SELECT * FROM "neworder" WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)';