eee

Base/ActiveQueryInterface.php

@@ -221,10 +221,11 @@ interface ActiveQueryInterface
     public function whereNotBetween(string $column, int|float $start, int|float $end): QueryTrait;
 
     /**
-     * @param array $column
+     * @param array|string $column
+     * @param mixed|null $value
      * @return QueryTrait
      */
-    public function where(array $column): QueryTrait;
+    public function where(array|string $column, mixed $value = null): QueryTrait;
 
 
     /**

Traits/QueryTrait.php

@@ -27,20 +27,20 @@ use Kiri\Abstracts\Component;
  */
 abstract class QueryTrait extends Component implements ActiveQueryInterface, ISqlBuilder
 {
-    public array         $where  = [];
+    protected array      $where  = [];
-    public array         $select = ['*'];
+    protected array      $select = ['*'];
-    public array         $join   = [];
+    protected array      $join   = [];
-    public array         $order  = [];
+    protected array      $order  = [];
-    public int           $offset = -1;
+    protected int        $offset = -1;
-    public int           $limit  = -1;
+    protected int        $limit  = -1;
-    public string        $group  = '';
+    protected string     $group  = '';
-    public string        $from   = '';
+    protected string     $from   = '';
-    public string        $alias  = 't1';
+    protected string     $alias  = 't1';
     protected array      $filter = [];
     protected bool       $lock   = false;
     protected SqlBuilder $builder;
-    public array         $params = [];
+    protected array      $params = [];
-    private array        $_alias = ['t1'];
+    protected array      $_alias = ['t1'];
 
 
     /**
@@ -623,10 +623,14 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array|string $column
+     * @param mixed $value
      * @return $this
      */
-    public function where(array|string $column): static
+    public function where(array|string $column, mixed $value = null): static
     {
+        if (func_num_args() === 2) {
+            return $this->addArray([$column => $value]);
+        }
         if (is_string($column)) {
             return $this->whereRaw($column);
         } else {