improve has for nested relations

jarektkaczyk · jarektkaczyk · commit 43a313e9e5b2 · 2014-12-19T02:23:40.000+01:00
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -597,6 +597,11 @@ public function orWhere($column, $operator = null, $value = null)
 	 */
 	public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null)
 	{
+		if (strpos($relation, '.') !== false)
+		{
+			return $this->hasNested($relation, $operator, $count, $boolean, $callback);
+		}
+
 		$relation = $this->getHasRelationQuery($relation);
 
 		$query = $relation->getRelationCountQuery($relation->getRelated()->newQuery(), $this);
@@ -606,6 +611,41 @@ public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', C
 		return $this->addHasWhere($query, $relation, $operator, $count, $boolean);
 	}
 
+	/**
+	 * Add nested relationship count conditions to the query.
+	 * 
+	 * @param  string  $relations
+	 * @param  string  $operator
+	 * @param  integer $count
+	 * @param  string  $boolean
+	 * @param  \Closure  $callback
+	 * @return \Illuminate\Database\Eloquent\Builder|static
+	 */
+	protected function hasNested($relations, $operator = '>=', $count = 1, $boolean = 'and', $callback = null)
+	{
+		$relations = explode('.', $relations);
+
+		// In order to nest "has", we need to add count relation constraints
+		// on the callback closure. We will do this by simply passing to
+		// closure its own reference, so it calls itself recursively.
+		$closure = function ($q) use (&$closure, &$relations, $operator, $count, $boolean, $callback)
+		{
+			// If the "relation" is specified using dot notation, we will assume
+			// that developer wants to check simple "has" on the intermediate
+			// relations and add constraints only on the furthermost query.
+			if (count($relations) > 1)
+			{
+				$q->whereHas(array_shift($relations), $closure);
+			}
+			else
+			{
+				$q->has(array_shift($relations), $operator, $count, $boolean, $callback);
+			}
+		};
+
+		return $this->whereHas(array_shift($relations), $closure);
+	}
+
 	/**
 	 * Add a relationship count condition to the query.
 	 *
diff --git a/tests/Database/DatabaseEloquentBuilderTest.php b/tests/Database/DatabaseEloquentBuilderTest.php
@@ -487,6 +487,38 @@ public function testDeleteOverride()
 	}
 
 
+	public function testHasNestedWithConstraints()
+	{
+		$model = new EloquentBuilderTestModelParentStub;
+
+		$builder = $model->whereHas('foo', function ($q) {
+			$q->whereHas('bar', function ($q) {
+				$q->where('baz', 'bam');
+			});
+		})->toSql();
+
+		$result = $model->whereHas('foo.bar', function ($q) {
+			$q->where('baz', 'bam');
+		})->toSql();
+
+		$this->assertEquals($builder, $result);
+	}
+
+	
+	public function testHasNested()
+	{
+		$model = new EloquentBuilderTestModelParentStub;
+
+		$builder = $model->whereHas('foo', function ($q) {
+			$q->has('bar');
+		});
+
+		$result = $model->has('foo.bar')->toSql();
+
+		$this->assertEquals($builder->toSql(), $result);
+	}
+
+
 	protected function mockConnectionForModel($model, $database)
 	{
 		$grammarClass = 'Illuminate\Database\Query\Grammars\\'.$database.'Grammar';
@@ -556,3 +588,19 @@ public function __get($key)
 		return 'foo_' . $this->attributes[$key];
 	}
 }
+
+class EloquentBuilderTestModelParentStub extends Illuminate\Database\Eloquent\Model {
+	public function foo()
+	{
+		return $this->belongsTo('EloquentBuilderTestModelCloseRelatedStub');
+	}
+}
+
+class EloquentBuilderTestModelCloseRelatedStub extends Illuminate\Database\Eloquent\Model {
+	public function bar()
+	{
+		return $this->hasMany('EloquentBuilderTestModelFarRelatedStub');
+	}
+}
+
+class EloquentBuilderTestModelFarRelatedStub extends Illuminate\Database\Eloquent\Model {}
