[8.x] Add nested relationships to whereRelation function (laravel#39064)

* Add nested relationships to whereRelation function * Removed 2 spaces * formatting * Update QueriesRelationships.php Co-authored-by: Jose María Gómez Martín <[email protected]> Co-authored-by: Taylor Otwell <[email protected]>
chu121su12 · Oct 6, 2021 · bc92a96 · bc92a96
1 parent f0acffe
commit bc92a96
Showing 1 changed file with 34 additions and 6 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
@@ -362,9 +362,23 @@ public function orWhereDoesntHaveMorph($relation, $types, Closure $callback = nu
      */
     public function whereRelation($relation, $column, $operator = null, $value = null)
     {
-        return $this->whereHas($relation, function ($query) use ($column, $operator, $value) {
-            $query->where($column, $operator, $value);
-        });
+        $relations = collect(explode('.', $relation));
+
+        return $this->when(
+            $relations->count() == 1,
+            function($query) use ($relations, $column, $operator, $value) {
+                $query->whereHas($relations->first(), function ($query) use ($column, $operator, $value) {
+                    $query->where($column, $operator, $value);
+                });
+            },
+            function($query) use ($relations, $column, $operator, $value) {
+                $query->whereHas($relations->first(), function ($query) use ($relations, $column, $operator, $value) {
+                    $relations->shift();
+
+                    $query->whereRelation($relations->implode('.'), $column, $operator, $value);
+                });
+            }
+        );
     }
 
     /**
@@ -378,9 +392,23 @@ public function whereRelation($relation, $column, $operator = null, $value = nul
      */
     public function orWhereRelation($relation, $column, $operator = null, $value = null)
     {
-        return $this->orWhereHas($relation, function ($query) use ($column, $operator, $value) {
-            $query->where($column, $operator, $value);
-        });
+        $relations = collect(explode('.', $relation));
+
+        return $this->when(
+            $relations->count() == 1,
+            function($query) use ($relations, $column, $operator, $value) {
+                $query->orWhereHas($relations->first(), function ($query) use ($column, $operator, $value) {
+                    $query->where($column, $operator, $value);
+                });
+            },
+            function($query) use ($relations, $column, $operator, $value) {
+                $query->orWhereHas($relations->first(), function ($query) use ($relations, $column, $operator, $value) {
+                    $relations->shift();
+
+                    $query->orWhereRelation($relations->implode('.'), $column, $operator, $value);
+                });
+            }
+        );
     }
 
     /**