Add support whereRawJoin and orWhereRawJoin

Author: admin

src/EloquentJoinBuilder.php

@@ -87,6 +87,26 @@ public function orWhereJoin($column, $operator, $value)
         return $this->orWhere($column, $operator, $value);
     }
 
+    public function whereRawJoin($column, $sql, $bindings = [], $boolean = 'and')
+    {
+        $query = $this->baseBuilder ? $this->baseBuilder : $this;
+        $column = $query->performJoin($column);
+
+        $raw = $this->replaceColumnKey($sql, $column);
+
+        return $this->whereRaw($raw, $bindings, $boolean);
+    }
+
+    public function orWhereRawJoin($column, $sql, $bindings = [], $boolean = 'and')
+    {
+        $query = $this->baseBuilder ? $this->baseBuilder : $this;
+        $column = $query->performJoin($column);
+
+        $raw = $this->replaceColumnKey($sql, $column);
+
+        return $this->orWhereRaw($raw, $bindings, $boolean);
+    }
+
     public function whereInJoin($column, $values, $boolean = 'and', $not = false)
     {
         $query = $this->baseBuilder ? $this->baseBuilder : $this;
@@ -290,6 +310,22 @@ protected function joinQuery($join, $relation, $relatedTableAlias)
         }
     }
 
+    private function replaceColumnKey($sql, $column)
+    {
+        return str_replace(':column', $this->prepareColumn($column), $sql);
+    }
+
+    private function prepareColumn($column)
+    {
+        $parts = explode('.', $column);
+
+        $parts = array_map(function ($value) {
+            return '"'.$value.'"';
+        }, $parts);
+
+        return implode('.', $parts);
+    }
+
     private function applyClauseOnRelation(JoinClause $join, string $method, array $params, string $relatedTableAlias)
     {
         if (in_array($method, ['where', 'orWhere'])) {

tests/Tests/Clauses/OrWhereRawTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Fico7489\Laravel\EloquentJoin\Tests\Tests\Clauses;
+
+use Fico7489\Laravel\EloquentJoin\Tests\Models\Order;
+use Fico7489\Laravel\EloquentJoin\Tests\TestCase;
+
+class OrWhereRawTest extends TestCase
+{
+    public function testWhere()
+    {
+        Order::joinRelations('seller')
+            ->whereRawJoin('seller.id', ':column = ?', [1])
+            ->orWhereRawJoin('seller.id', ':column = ?', [2])
+            ->get();
+
+        $queryTest = 'select orders.* 
+            from "orders" 
+            left join "sellers" on "sellers"."id" = "orders"."seller_id" 
+            where ("sellers"."id" = 1 or "sellers"."id" = 2) 
+            and "orders"."deleted_at" is null 
+            group by "orders"."id"';
+
+        $this->assertQueryMatches($queryTest, $this->fetchQuery());
+    }
+}

tests/Tests/Clauses/WhereRawTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Fico7489\Laravel\EloquentJoin\Tests\Tests\Clauses;
+
+use Fico7489\Laravel\EloquentJoin\Tests\Models\Order;
+use Fico7489\Laravel\EloquentJoin\Tests\TestCase;
+
+class WhereRawTest extends TestCase
+{
+    public function testWhere()
+    {
+        Order::joinRelations('seller')
+            ->whereRawJoin('seller.id', ':column = ?', [1])
+            ->get();
+
+        $queryTest = 'select orders.* 
+            from "orders" 
+            left join "sellers" on "sellers"."id" = "orders"."seller_id" 
+            where "sellers"."id" = 1 
+            and "orders"."deleted_at" is null 
+            group by "orders"."id"';
+
+        $this->assertQueryMatches($queryTest, $this->fetchQuery());
+    }
+}