Allow parseSub to operate on EloquentBuilder. Add test (#24788)

Author: snags88

src/Illuminate/Database/Query/Builder.php

@@ -319,7 +319,7 @@ protected function createSub($query)
      */
     protected function parseSub($query)
     {
-        if ($query instanceof self) {
+        if ($query instanceof self || $query instanceof EloquentBuilder) {
             return [$query->toSql(), $query->getBindings()];
         } elseif (is_string($query)) {
             return [$query, []];

tests/Database/DatabaseQueryBuilderTest.php

@@ -8,6 +8,7 @@
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Query\Expression as Raw;
 use Illuminate\Pagination\AbstractPaginator as Paginator;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 
 class DatabaseQueryBuilderTest extends TestCase
 {
@@ -1371,6 +1372,11 @@ public function testJoinSub()
         }, 'sub', 'users.id', '=', 'sub.id');
         $this->assertEquals('select * from "users" inner join (select * from "contacts") as "sub" on "users"."id" = "sub"."id"', $builder->toSql());
 
+        $builder = $this->getBuilder();
+        $eloquentBuilder = new EloquentBuilder($this->getBuilder()->from('contacts'));
+        $builder->from('users')->joinSub($eloquentBuilder, 'sub', 'users.id', '=', 'sub.id');
+        $this->assertEquals('select * from "users" inner join (select * from "contacts") as "sub" on "users"."id" = "sub"."id"', $builder->toSql());
+
         $builder = $this->getBuilder();
         $sub1 = $this->getBuilder()->from('contacts')->where('name', 'foo');
         $sub2 = $this->getBuilder()->from('contacts')->where('name', 'bar');