wip

Author: brendt

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

@@ -19,10 +19,10 @@
 use Tempest\Database\QueryStatements\WhereStatement;
 use Tempest\Support\Arr\ImmutableArray;
 use Tempest\Support\Conditions\HasConditions;
-use UnitEnum;
 
 use function Tempest\Database\model;
 use function Tempest\map;
+use function Tempest\Support\str;
 
 /**
  * @template TModelClass of object
@@ -123,7 +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()) {
+        if (
+            $this->select->where->isNotEmpty()
+            && ! str($where)->trim()->startsWith(['AND', 'OR'])
+        ) {
             return $this->andWhere($where, ...$bindings);
         }
 
@@ -136,11 +139,7 @@ public function where(string $where, mixed ...$bindings): self
 
     public function andWhere(string $where, mixed ...$bindings): self
     {
-        $this->select->where[] = new WhereStatement("AND {$where}");
-
-        $this->bind(...$bindings);
-
-        return $this;
+        return $this->where("AND {$where}", ...$bindings);
     }
 
     public function orWhere(string $where, mixed ...$bindings): self

packages/database/src/QueryStatements/SelectStatement.php

@@ -3,7 +3,6 @@
 namespace Tempest\Database\QueryStatements;
 
 use Stringable;
-use Tempest\Database\Builder\FieldDefinition;
 use Tempest\Database\Builder\TableDefinition;
 use Tempest\Database\Config\DatabaseDialect;
 use Tempest\Database\QueryStatement;

tests/Integration/Database/Builder/SelectQueryBuilderTest.php

@@ -85,13 +85,17 @@ public function test_multiple_where(): void
         $sql = query('books')->select()
             ->where('title = ?', 'a')
             ->where('author_id = ?', 1)
+            ->where('OR author_id = ?', 2)
+            ->where('AND author_id <> NULL')
             ->toSql();
 
         $expected = <<<SQL
         SELECT *
         FROM `books`
         WHERE title = ?
         AND author_id = ?
+        OR author_id = ?
+        AND author_id <> NULL
         SQL;
 
         $this->assertSameWithoutBackticks($expected, $sql);