wip

Author: brendt

packages/database/src/Builder/QueryBuilders/SelectQueryBuilder.php

@@ -123,6 +123,10 @@ public function chunk(Closure $closure, int $amountPerChunk = 200): void
     /** @return self<TModelClass> */
     public function where(string $where, mixed ...$bindings): self
     {
+        if ($this->select->where->isNotEmpty()) {
+            return $this->andWhere($where, ...$bindings);
+        }
+
         $this->select->where[] = new WhereStatement($where);
 
         $this->bind(...$bindings);
@@ -132,7 +136,11 @@ public function where(string $where, mixed ...$bindings): self
 
     public function andWhere(string $where, mixed ...$bindings): self
     {
-        return $this->where("AND {$where}", ...$bindings);
+        $this->select->where[] = new WhereStatement("AND {$where}");
+
+        $this->bind(...$bindings);
+
+        return $this;
     }
 
     public function orWhere(string $where, mixed ...$bindings): self

tests/Integration/Database/Builder/SelectQueryBuilderTest.php

@@ -80,6 +80,40 @@ public function test_select_from_model(): void
         $this->assertSameWithoutBackticks($expected, $sql);
     }
 
+    public function test_multiple_where(): void
+    {
+        $sql = query('books')->select()
+            ->where('title = ?', 'a')
+            ->where('author_id = ?', 1)
+            ->toSql();
+
+        $expected = <<<SQL
+        SELECT *
+        FROM `books`
+        WHERE title = ?
+        AND author_id = ?
+        SQL;
+
+        $this->assertSameWithoutBackticks($expected, $sql);
+    }
+
+    public function test_multiple_where_field(): void
+    {
+        $sql = query('books')->select()
+            ->whereField('title', 'a')
+            ->whereField('author_id', 1)
+            ->toSql();
+
+        $expected = <<<SQL
+        SELECT *
+        FROM `books`
+        WHERE books.title = :title
+        AND books.author_id = :author_id
+        SQL;
+
+        $this->assertSameWithoutBackticks($expected, $sql);
+    }
+
     public function test_where_statement(): void
     {
         $this->migrate(