Unverified Commit 60c5329a authored by Jens Segers's avatar Jens Segers Committed by GitHub

Merge pull request #1326 from pimlie/master

fix for returning incorrect builder in hybrid relations
parents 5a876398 23e84230
......@@ -300,6 +300,10 @@ trait HybridRelations
*/
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);
}
}
}
<?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;
......@@ -8,7 +9,7 @@ use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
class User extends Eloquent implements AuthenticatableContract, CanResetPasswordContract
{
use Authenticatable, CanResetPassword;
use Authenticatable, CanResetPassword, HybridRelations;
protected $connection = 'mongodb';
protected $dates = ['birthday', 'entry.date'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment