Fixed eager loading with scoping

Author: lazychaser

src/BaseRelation.php

@@ -79,7 +79,7 @@ abstract protected function relationExistenceCondition($hash, $table, $lft, $rgt
     public function getRelationExistenceQuery(EloquentBuilder $query, EloquentBuilder $parent,
                                               $columns = [ '*' ]
     ) {
-        $query = $this->getParent()->newInstance()->newScopedQuery()->select($columns);
+        $query = $this->getParent()->replicate()->newScopedQuery()->select($columns);
 
         $table = $query->getModel()->getTable();
 
@@ -154,14 +154,16 @@ public function getResults()
      */
     public function addEagerConstraints(array $models)
     {
+        $model = reset($models);
+
+        $this->query = $model->newScopedQuery();
+
         $this->query->whereNested(function (Builder $inner) use ($models) {
             // We will use this query in order to apply constraints to the
             // base query builder
-            $outer = $this->parent->newScopedQuery();
+            $outer = $this->parent->newQuery()->setQuery($inner);
 
             foreach ($models as $model) {
-                $outer->setQuery($inner);
-
                 $this->addEagerConstraint($outer, $model);
             }
         });

src/NodeTrait.php

@@ -7,10 +7,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Database\Query\Builder;
 use LogicException;
-use MongoDB\Driver\Query;
 
 trait NodeTrait
 {
@@ -934,9 +931,7 @@ public function getPrevNode(array $columns = [ '*' ])
      */
     public function getAncestors(array $columns = [ '*' ])
     {
-        return $this->newScopedQuery()
-            ->defaultOrder()
-            ->ancestorsOf($this, $columns);
+        return $this->ancestors()->get($columns);
     }
 
     /**

tests/NodeTest.php

@@ -332,6 +332,8 @@ public function testParentIdAttributeAccessorAppendsNode()
         $node->parent_id = null;
         $node->save();
 
+        $node->refreshNode();
+
         $this->assertEquals(null, $node->parent_id);
         $this->assertTrue($node->isRoot());
     }

tests/ScopedNodeTest.php

@@ -108,6 +108,13 @@ public function testAncestors()
 
         $this->assertEquals(1, $result->count());
         $this->assertEquals(2, $result->first()->getKey());
+
+        $node = MenuItem::with('ancestors')->find(5);
+
+        $result = $node->ancestors;
+
+        $this->assertEquals(1, $result->count());
+        $this->assertEquals(2, $result->first()->getKey());
     }
 
     public function testDepth()