Add support for eager loading specific columns to withWhereHas (#45168)

* Add eager loading specific columns support to withWhereHas

* Add tests

Author: diaafares

src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php

@@ -165,7 +165,7 @@ public function whereHas($relation, Closure $callback = null, $operator = '>=',
      */
     public function withWhereHas($relation, Closure $callback = null, $operator = '>=', $count = 1)
     {
-        return $this->whereHas($relation, $callback, $operator, $count)
+        return $this->whereHas(Str::before($relation, ':'), $callback, $operator, $count)
             ->with($callback ? [$relation => fn ($query) => $callback($query)] : $relation);
     }
 

tests/Database/DatabaseEloquentModelTest.php

@@ -494,6 +494,17 @@ public function testEagerLoadingWithColumns()
         $closure($builder);
     }
 
+    public function testWithWhereHasWithSpecificColumns()
+    {
+        $model = new EloquentModelWithWhereHasStub;
+        $instance = $model->newInstance()->newQuery()->withWhereHas('foo:diaa,fares');
+        $builder = m::mock(Builder::class);
+        $builder->shouldReceive('select')->once()->with(['diaa', 'fares']);
+        $this->assertNotNull($instance->getEagerLoads()['foo']);
+        $closure = $instance->getEagerLoads()['foo'];
+        $closure($builder);
+    }
+
     public function testWithMethodCallsQueryBuilderCorrectlyWithArray()
     {
         $result = EloquentModelWithStub::with(['foo', 'bar']);
@@ -2858,6 +2869,14 @@ public function newQuery()
     }
 }
 
+class EloquentModelWithWhereHasStub extends Model
+{
+    public function foo()
+    {
+        return $this->hasMany(EloquentModelStub::class);
+    }
+}
+
 class EloquentModelWithoutRelationStub extends Model
 {
     public $with = ['foo'];