Rename getRelationQuery to getRelationExistenceQuery for Laravel 5.4 …

…compatibility. Removed usage of moved wrap() method (#22)
staudenmeir · Mar 27, 2017 · b888044 · b888044
1 parent 91fccbf
commit b888044
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Relations/BelongsToThrough.php b/src/Relations/BelongsToThrough.php
@@ -191,7 +191,11 @@ protected function setRelationQueryConstraints(Builder $query)
             $one = $model->getQualifiedKeyName();
         }
 
-        $key = $this->wrap($this->getQualifiedParentKeyName());
+        $key = $this->parent
+            ->newQueryWithoutScopes()
+            ->getQuery()
+            ->getGrammar()
+            ->wrap($this->getQualifiedParentKeyName());
 
         $query->where(new Expression($alias.'.'.$this->getParent()->getKeyName()), '=', new Expression($key));
     }
@@ -205,7 +209,7 @@ protected function setRelationQueryConstraints(Builder $query)
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*'])
+    public function getRelationExistenceQuery(Builder $query, Builder $parent, $columns = ['*'])
     {
         $query->select($columns);