Merge pull request laravel#8246 from jarektkaczyk/5.0-parent-softDeletes-on-hasManyThrough

taylorotwell · taylorotwell · commit 34a164fdd578 · 2015-04-04T09:27:42.000-05:00
[5.0] Ignore soft deleted close parents on HasManyThrough
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
@@ -97,6 +97,21 @@ protected function setJoin(Builder $query = null)
 		$foreignKey = $this->related->getTable().'.'.$this->secondKey;
 
 		$query->join($this->parent->getTable(), $this->getQualifiedParentKeyName(), '=', $foreignKey);
+
+		if ($this->parentSoftDeletes())
+		{
+			$query->whereNull($this->parent->getQualifiedDeletedAtColumn());
+		}
+	}
+
+	/**
+	 * Determine whether close parent of the relation uses Soft Deletes.
+	 *
+	 * @return bool
+	 */
+	public function parentSoftDeletes()
+	{
+		return in_array('Illuminate\Database\Eloquent\SoftDeletes', class_uses_recursive(get_class($this->parent)));
 	}
 
 	/**
diff --git a/tests/Database/DatabaseEloquentHasManyThroughTest.php b/tests/Database/DatabaseEloquentHasManyThroughTest.php
@@ -3,6 +3,7 @@
 use Mockery as m;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class DatabaseEloquentHasManyThroughTest extends PHPUnit_Framework_TestCase {
 
@@ -139,6 +140,17 @@ public function testFindManyMethod()
 	}
 
 
+	public function testIgnoreSoftDeletingParent()
+	{
+		list($builder, $country,, $firstKey, $secondKey) = $this->getRelationArguments();
+		$user = new EloquentHasManyThroughSoftDeletingModelStub;
+		
+		$builder->shouldReceive('whereNull')->with('users.deleted_at')->once()->andReturn($builder);
+
+		$relation = new HasManyThrough($builder, $country, $user, $firstKey, $secondKey);
+	}
+
+
 	protected function getRelation()
 	{
 		list($builder, $country, $user, $firstKey, $secondKey) = $this->getRelationArguments();
@@ -176,3 +188,8 @@ protected function getRelationArguments()
 class EloquentHasManyThroughModelStub extends Illuminate\Database\Eloquent\Model {
 	public $country_id = 'foreign.value';
 }
+
+class EloquentHasManyThroughSoftDeletingModelStub extends Illuminate\Database\Eloquent\Model {
+	use SoftDeletes;
+	public $table = 'users';
+}
