[8.x] Fix one-of-many bindings (laravel#37616)

* fix * test * formatting * formatting * formatting
lukeb · Jun 7, 2021 · 0613654 · 0613654
1 parent 4edad7b
commit 0613654
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php b/src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php
@@ -205,6 +205,8 @@ protected function newOneOfManySubQuery($groupBy, $column = null, $aggregate = n
     protected function addOneOfManyJoinSubQuery(Builder $parent, Builder $subQuery, $on)
     {
         $parent->beforeQuery(function ($parent) use ($subQuery, $on) {
+            $subQuery->applyBeforeQueryCallbacks();
+
             $parent->joinSub($subQuery, $this->relationName, function ($join) use ($on) {
                 $join->on($this->qualifySubSelectColumn($on), '=', $this->qualifyRelatedColumn($on));
 

diff --git a/tests/Database/DatabaseEloquentHasOneOfManyTest.php b/tests/Database/DatabaseEloquentHasOneOfManyTest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Eloquent\Model as Eloquent;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
@@ -41,6 +42,7 @@ public function createSchema()
         $this->schema()->create('logins', function ($table) {
             $table->increments('id');
             $table->foreignId('user_id');
+            $table->dateTime('deleted_at')->nullable();
         });
 
         $this->schema()->create('states', function ($table) {
@@ -379,6 +381,14 @@ public function testWithExistsWithConstraintsInJoinSubSelect()
         $this->assertTrue($user->foo_state_exists);
     }
 
+    public function testWithSoftDeletes()
+    {
+        $user = HasOneOfManyTestUser::create();
+        $user->logins()->create();
+        $user->latest_login_with_soft_deletes;
+        $this->assertNotNull($user->latest_login_with_soft_deletes);
+    }
+
     /**
      * Get a database connection instance.
      *
@@ -419,6 +429,11 @@ public function latest_login()
         return $this->hasOne(HasOneOfManyTestLogin::class, 'user_id')->ofMany();
     }
 
+    public function latest_login_with_soft_deletes()
+    {
+        return $this->hasOne(HasOneOfManyTestLoginWithSoftDeletes::class, 'user_id')->ofMany();
+    }
+
     public function latest_login_with_shortcut()
     {
         return $this->hasOne(HasOneOfManyTestLogin::class, 'user_id')->latestOfMany();
@@ -490,6 +505,15 @@ class HasOneOfManyTestLogin extends Eloquent
     public $timestamps = false;
 }
 
+class HasOneOfManyTestLoginWithSoftDeletes extends Eloquent
+{
+    use SoftDeletes;
+
+    protected $table = 'logins';
+    protected $guarded = [];
+    public $timestamps = false;
+}
+
 class HasOneOfManyTestState extends Eloquent
 {
     protected $table = 'states';