Merge pull request #8 from biiiiiigmonster/fix/whereRelation

fix(whereRelation): closure case.
biiiiiigmonster · Sep 1, 2022 · 1b250fb · 1b250fb
2 parents 082381e + 8938583
commit 1b250fb
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Database/Eloquent/BuilderMixin.php b/src/Database/Eloquent/BuilderMixin.php
@@ -325,7 +325,11 @@ public function whereRelationIn(): Closure
     {
         return function ($relation, $column, $operator = null, $value = null): Builder {
             return $this->whereHasIn($relation, function ($query) use ($column, $operator, $value) {
-                $query->where($column, $operator, $value);
+                if ($column instanceof Closure) {
+                    $column($query);
+                } else {
+                    $query->where($column, $operator, $value);
+                }
             });
         };
     }
@@ -339,7 +343,11 @@ public function orWhereRelationIn(): Closure
     {
         return function ($relation, $column, $operator = null, $value = null): Builder {
             return $this->orWhereHasIn($relation, function ($query) use ($column, $operator, $value) {
-                $query->where($column, $operator, $value);
+                if ($column instanceof Closure) {
+                    $column($query);
+                } else {
+                    $query->where($column, $operator, $value);
+                }
             });
         };
     }