From e107901ea3fb3de7c28397f6523bd7da6c7e112f Mon Sep 17 00:00:00 2001
From: pimlie <pimlie@hotmail.com>
Date: Wed, 11 Oct 2017 13:59:27 +0200
Subject: [PATCH 1/2] fix for returning incorrect builder in hybrid relations

---
 src/Jenssegers/Mongodb/Eloquent/HybridRelations.php | 7 ++++++-
 tests/models/User.php                               | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php b/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
index 1f707fd05..8fb46e268 100644
--- a/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
+++ b/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Str;
+use Jenssegers\Mongodb\Eloquent\Builder;
 use Jenssegers\Mongodb\Helpers\EloquentBuilder;
 use Jenssegers\Mongodb\Relations\BelongsTo;
 use Jenssegers\Mongodb\Relations\BelongsToMany;
@@ -300,6 +301,10 @@ protected function guessBelongsToManyRelation()
      */
     public function newEloquentBuilder($query)
     {
-        return new EloquentBuilder($query);
+        if (is_subclass_of($this, \Jenssegers\Mongodb\Eloquent\Model::class)) {
+            return new Builder($query);
+        } else {
+            return new EloquentBuilder($query);
+        }
     }
 }
diff --git a/tests/models/User.php b/tests/models/User.php
index 2d34dd8b1..8e5161bbf 100644
--- a/tests/models/User.php
+++ b/tests/models/User.php
@@ -1,6 +1,7 @@
 <?php
 
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\HybridRelations;
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
@@ -9,6 +10,7 @@
 class User extends Eloquent implements AuthenticatableContract, CanResetPasswordContract
 {
     use Authenticatable, CanResetPassword;
+    use HybridRelations;
 
     protected $connection = 'mongodb';
     protected $dates = ['birthday', 'entry.date'];

From 23e842309ac5b42fdfeb40d69afbed4032b9cdb8 Mon Sep 17 00:00:00 2001
From: pimlie <pimlie@hotmail.com>
Date: Tue, 7 Nov 2017 10:12:22 +0100
Subject: [PATCH 2/2] fix ci, remove use from current namespace

---
 src/Jenssegers/Mongodb/Eloquent/HybridRelations.php | 1 -
 tests/models/User.php                               | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php b/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
index 8fb46e268..7f9b511ae 100644
--- a/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
+++ b/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Str;
-use Jenssegers\Mongodb\Eloquent\Builder;
 use Jenssegers\Mongodb\Helpers\EloquentBuilder;
 use Jenssegers\Mongodb\Relations\BelongsTo;
 use Jenssegers\Mongodb\Relations\BelongsToMany;
diff --git a/tests/models/User.php b/tests/models/User.php
index 8e5161bbf..ded0a3966 100644
--- a/tests/models/User.php
+++ b/tests/models/User.php
@@ -9,8 +9,7 @@
 
 class User extends Eloquent implements AuthenticatableContract, CanResetPasswordContract
 {
-    use Authenticatable, CanResetPassword;
-    use HybridRelations;
+    use Authenticatable, CanResetPassword, HybridRelations;
 
     protected $connection = 'mongodb';
     protected $dates = ['birthday', 'entry.date'];