增加whereOrJsonContains方法

top-think · Sep 4, 2024 · fd9ca44 · fd9ca44
1 parent 2dbbe9e
commit fd9ca44
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/db/concern/WhereQuery.php b/src/db/concern/WhereQuery.php
@@ -288,9 +288,16 @@ public function whereJsonContains(string $field, $condition, string $logic = 'AN
             [$field1, $field2] = explode('->', $field);
             $field             = 'json_extract(' . $field1 . ',\'$.' . $field2 . '\')';
         }
-
-        $value = is_string($condition) ? '"' . $condition . '"' : $condition;
-        return $this->whereRaw('json_contains(' . $field . ',\'' . $value . '\')');
+
+        $value       = is_string($condition) ? '"' . $condition . '"' : $condition;
+        $name        = $this->bindValue($value);
+        $bind[$name] = $value;
+        return $this->whereRaw('json_contains(' . $field . ',:' . $name . ')', $bind, $logic);
+    }
+
+    public function whereOrJsonContains(string $field, $condition)
+    {
+        return $this->whereJsonContains($field, $condition, 'OR');
     }
 
     /**