Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
L
laravel-mongodb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sinan
laravel-mongodb
Commits
60c5329a
Unverified
Commit
60c5329a
authored
Jan 08, 2018
by
Jens Segers
Committed by
GitHub
Jan 08, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1326 from pimlie/master
fix for returning incorrect builder in hybrid relations
parents
5a876398
23e84230
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
HybridRelations.php
src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
+5
-1
User.php
tests/models/User.php
+2
-1
No files found.
src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
View file @
60c5329a
...
...
@@ -300,6 +300,10 @@ trait HybridRelations
*/
public
function
newEloquentBuilder
(
$query
)
{
if
(
is_subclass_of
(
$this
,
\Jenssegers\Mongodb\Eloquent\Model
::
class
))
{
return
new
Builder
(
$query
);
}
else
{
return
new
EloquentBuilder
(
$query
);
}
}
}
tests/models/User.php
View file @
60c5329a
<?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'
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment