Merge pull request laravel#7079 from bryceray1121/forceRelationQueryWithNoScopes

taylorotwell · taylorotwell · commit 0fe9031249ac · 2015-02-11T14:10:47.000-06:00
[4.2] Ignore parent global scopes when relation grabs its parent's query builder in order to avoid loop
diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -266,7 +266,7 @@ public function relatedUpdatedAt()
 	 */
 	public function wrap($value)
 	{
-		return $this->parent->getQuery()->getGrammar()->wrap($value);
+		return $this->parent->newQueryWithoutScopes()->getQuery()->getGrammar()->wrap($value);
 	}
 
 	/**
diff --git a/tests/Database/DatabaseEloquentHasOneTest.php b/tests/Database/DatabaseEloquentHasOneTest.php
@@ -102,7 +102,7 @@ public function testRelationCountQueryCanBeBuilt()
 		$query->shouldReceive('select')->once()->with(m::type('Illuminate\Database\Query\Expression'));
 		$relation->getParent()->shouldReceive('getTable')->andReturn('table');
 		$query->shouldReceive('where')->once()->with('table.foreign_key', '=', m::type('Illuminate\Database\Query\Expression'));
-		$relation->getParent()->shouldReceive('getQuery')->andReturn($parentQuery = m::mock('StdClass'));
+		$relation->getQuery()->shouldReceive('getQuery')->andReturn($parentQuery = m::mock('StdClass'));
 		$parentQuery->shouldReceive('getGrammar')->once()->andReturn($grammar = m::mock('StdClass'));
 		$grammar->shouldReceive('wrap')->once()->with('table.id');
 
@@ -120,6 +120,7 @@ protected function getRelation()
 		$parent->shouldReceive('getAttribute')->with('id')->andReturn(1);
 		$parent->shouldReceive('getCreatedAtColumn')->andReturn('created_at');
 		$parent->shouldReceive('getUpdatedAtColumn')->andReturn('updated_at');
+		$parent->shouldReceive('newQueryWithoutScopes')->andReturn($builder);
 		return new HasOne($builder, $parent, 'table.foreign_key', 'id');
 	}
 
diff --git a/tests/Database/DatabaseEloquentRelationTest.php b/tests/Database/DatabaseEloquentRelationTest.php
@@ -37,9 +37,42 @@ public function testTouchMethodUpdatesRelatedTimestamps()
 		$relation->touch();
 	}
 
+	/**
+	 * Testing to ensure loop does not occur during relational queries in global scopes
+	 *
+	 * Executing parent model's global scopes could result in an infinite loop when the
+	 * parent model's global scope utilizes a relation in a query like has or whereHas
+	 */
+	public function testDonNotRunParentModelGlobalScopes()
+	{
+		/** @var Mockery\MockInterface $parent */
+		$eloquentBuilder = m::mock('Illuminate\Database\Eloquent\Builder');
+		$queryBuilder = m::mock('Illuminate\Database\Query\Builder');
+		$parent = m::mock('EloquentRelationResetModelStub')->makePartial();
+		$grammar = m::mock('\Illuminate\Database\Grammar');
+
+		$eloquentBuilder->shouldReceive('getModel')->andReturn($related = m::mock('StdClass'));
+		$eloquentBuilder->shouldReceive('getQuery')->andReturn($queryBuilder);
+		$queryBuilder->shouldReceive('getGrammar')->andReturn($grammar);
+		$grammar->shouldReceive('wrap');
+		$parent->shouldReceive('newQueryWithoutScopes')->andReturn($eloquentBuilder);
+
+		//Test Condition
+		$parent->shouldReceive('applyGlobalScopes')->andReturn($eloquentBuilder)->never();
+
+		$relation = new EloquentRelationStub($eloquentBuilder, $parent);
+		$relation->wrap('test');
+	}
+
 }
 
-class EloquentRelationResetModelStub extends Illuminate\Database\Eloquent\Model {}
+class EloquentRelationResetModelStub extends Illuminate\Database\Eloquent\Model {
+	//Override method call which would normally go through __call()
+	public function getQuery()
+	{
+		return $this->newQuery()->getQuery();
+	}
+}
 
 
 class EloquentRelationResetStub extends Illuminate\Database\Eloquent\Builder {
@@ -51,3 +84,11 @@ public function getModel() { return new EloquentRelationResetModelStub; }
 class EloquentRelationQueryStub extends Illuminate\Database\Query\Builder {
 	public function __construct() {}
 }
+
+class EloquentRelationStub extends \Illuminate\Database\Eloquent\Relations\Relation {
+	public function addConstraints() {}
+	public function addEagerConstraints(array $models) {}
+	public function initRelation(array $models, $relation) {}
+	public function match(array $models, \Illuminate\Database\Eloquent\Collection $results, $relation) {}
+	public function getResults() {}
+}

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public function relatedUpdatedAt()`
`266`	`266`	`*/`
`267`	`267`	`public function wrap($value)`
`268`	`268`	`{`
`269`		`- return $this->parent->getQuery()->getGrammar()->wrap($value);`
	`269`	`+ return $this->parent->newQueryWithoutScopes()->getQuery()->getGrammar()->wrap($value);`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`/**`