wip

Author: brendt

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

@@ -37,6 +37,8 @@ final class SelectQueryBuilder implements BuildsQuery
 
     private SelectStatement $select;
 
+    private array $joins = [];
+
     private array $relations = [];
 
     private array $bindings = [];
@@ -170,6 +172,14 @@ public function offset(int $offset): self
         return $this;
     }
 
+    /** @return self<TModelClass> */
+    public function join(string ...$joins): self
+    {
+        $this->joins = [...$this->joins, ...$joins];
+
+        return $this;
+    }
+
     /** @return self<TModelClass> */
     public function with(string ...$relations): self
     {
@@ -203,6 +213,10 @@ public function build(mixed ...$bindings): Query
     {
         $resolvedRelations = $this->resolveRelations();
 
+        foreach ($this->joins as $join) {
+            $this->select->join[] = new JoinStatement($join);
+        }
+
         foreach ($resolvedRelations as $relation) {
             $this->select->columns = $this->select->columns->append(...$relation->getFieldDefinitions()->map(fn (FieldDefinition $field) => (string) $field->withAlias()));
             $this->select->join[] = new JoinStatement($relation->getStatement());

packages/database/src/QueryStatements/JoinStatement.php

@@ -4,15 +4,22 @@
 
 use Tempest\Database\Config\DatabaseDialect;
 use Tempest\Database\QueryStatement;
+use function Tempest\Support\str;
 
 final readonly class JoinStatement implements QueryStatement
 {
     public function __construct(
-        private string $join,
+        private string $statement,
     ) {}
 
     public function compile(DatabaseDialect $dialect): string
     {
-        return $this->join;
+        $statement = $this->statement;
+
+        if (! str($statement)->lower()->startsWith(['join', 'inner join', 'left join', 'right join', 'full join', 'full outer join', 'self join'])) {
+            $statement = sprintf('INNER JOIN %s', $statement);
+        }
+
+        return $statement;
     }
 }

packages/database/tests/QueryStatements/JoinStatementTest.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Tempest\Database\Tests\QueryStatements;
+
+use PHPUnit\Framework\TestCase;
+use Tempest\Database\Config\DatabaseDialect;
+use Tempest\Database\QueryStatements\JoinStatement;
+
+final class JoinStatementTest extends TestCase
+{
+    public function test_inner_join_is_added_when_needed(): void
+    {
+        $this->assertSame(
+            'INNER JOIN authors on authors.id = books.author_id',
+            new JoinStatement('authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+
+        $this->assertSame(
+            'inner join authors on authors.id = books.author_id',
+            new JoinStatement('inner join authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+
+        $this->assertSame(
+            'INNER JOIN authors on authors.id = books.author_id',
+            new JoinStatement('INNER JOIN authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+
+        $this->assertSame(
+            'LEFT JOIN authors on authors.id = books.author_id',
+            new JoinStatement('LEFT JOIN authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+
+        $this->assertSame(
+            'RIGHT JOIN authors on authors.id = books.author_id',
+            new JoinStatement('RIGHT JOIN authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+
+        $this->assertSame(
+            'FULL JOIN authors on authors.id = books.author_id',
+            new JoinStatement('FULL JOIN authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+
+        $this->assertSame(
+            'JOIN authors on authors.id = books.author_id',
+            new JoinStatement('JOIN authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+
+        $this->assertSame(
+            'FULL OUTER JOIN authors on authors.id = books.author_id',
+            new JoinStatement('FULL OUTER JOIN authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+
+        $this->assertSame(
+            'FULL JOIN authors on authors.id = books.author_id',
+            new JoinStatement('FULL JOIN authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+
+        $this->assertSame(
+            'SELF JOIN authors on authors.id = books.author_id',
+            new JoinStatement('SELF JOIN authors on authors.id = books.author_id')->compile(DatabaseDialect::MYSQL)
+        );
+    }
+}

tests/Integration/Database/Builder/SelectQueryBuilderTest.php

@@ -5,10 +5,7 @@
 namespace Tests\Tempest\Integration\Database\Builder;
 
 use Tempest\Database\Builder\QueryBuilders\SelectQueryBuilder;
-use Tempest\Database\Database;
 use Tempest\Database\Migrations\CreateMigrationsTable;
-use Tempest\Database\Query;
-use Tempest\Database\QueryStatements\CreateTableStatement;
 use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
@@ -95,6 +92,22 @@ public function test_where_statement(): void
         $this->assertSame('B', $book->title);
     }
 
+    public function test_join(): void
+    {
+        $this->migrate(
+            CreateMigrationsTable::class,
+            CreateAuthorTable::class,
+            CreateBookTable::class,
+        );
+
+        $author = Author::new(name: 'Brent')->save();
+        Book::new(title: 'A', author: $author)->save();
+
+        $query = query(Book::class)->select()->join('authors on authors.id = books.author_id')->first();
+
+        $this->assertSame('Brent', $query->author->name);
+    }
+
     public function test_order_by(): void
     {
         $this->migrate(