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
e107901e
Commit
e107901e
authored
Oct 11, 2017
by
pimlie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for returning incorrect builder in hybrid relations
parent
b9d99c61
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
HybridRelations.php
src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
+6
-1
User.php
tests/models/User.php
+2
-0
No files found.
src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
View file @
e107901e
...
@@ -5,6 +5,7 @@ namespace Jenssegers\Mongodb\Eloquent;
...
@@ -5,6 +5,7 @@ namespace Jenssegers\Mongodb\Eloquent;
use
Illuminate\Database\Eloquent\Relations\MorphMany
;
use
Illuminate\Database\Eloquent\Relations\MorphMany
;
use
Illuminate\Database\Eloquent\Relations\MorphOne
;
use
Illuminate\Database\Eloquent\Relations\MorphOne
;
use
Illuminate\Support\Str
;
use
Illuminate\Support\Str
;
use
Jenssegers\Mongodb\Eloquent\Builder
;
use
Jenssegers\Mongodb\Helpers\EloquentBuilder
;
use
Jenssegers\Mongodb\Helpers\EloquentBuilder
;
use
Jenssegers\Mongodb\Relations\BelongsTo
;
use
Jenssegers\Mongodb\Relations\BelongsTo
;
use
Jenssegers\Mongodb\Relations\BelongsToMany
;
use
Jenssegers\Mongodb\Relations\BelongsToMany
;
...
@@ -300,6 +301,10 @@ trait HybridRelations
...
@@ -300,6 +301,10 @@ trait HybridRelations
*/
*/
public
function
newEloquentBuilder
(
$query
)
public
function
newEloquentBuilder
(
$query
)
{
{
if
(
is_subclass_of
(
$this
,
\Jenssegers\Mongodb\Eloquent\Model
::
class
))
{
return
new
Builder
(
$query
);
}
else
{
return
new
EloquentBuilder
(
$query
);
return
new
EloquentBuilder
(
$query
);
}
}
}
}
}
tests/models/User.php
View file @
e107901e
<?php
<?php
use
Jenssegers\Mongodb\Eloquent\Model
as
Eloquent
;
use
Jenssegers\Mongodb\Eloquent\Model
as
Eloquent
;
use
Jenssegers\Mongodb\Eloquent\HybridRelations
;
use
Illuminate\Auth\Authenticatable
;
use
Illuminate\Auth\Authenticatable
;
use
Illuminate\Auth\Passwords\CanResetPassword
;
use
Illuminate\Auth\Passwords\CanResetPassword
;
use
Illuminate\Contracts\Auth\Authenticatable
as
AuthenticatableContract
;
use
Illuminate\Contracts\Auth\Authenticatable
as
AuthenticatableContract
;
...
@@ -9,6 +10,7 @@ use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
...
@@ -9,6 +10,7 @@ use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
class
User
extends
Eloquent
implements
AuthenticatableContract
,
CanResetPasswordContract
class
User
extends
Eloquent
implements
AuthenticatableContract
,
CanResetPasswordContract
{
{
use
Authenticatable
,
CanResetPassword
;
use
Authenticatable
,
CanResetPassword
;
use
HybridRelations
;
protected
$connection
=
'mongodb'
;
protected
$connection
=
'mongodb'
;
protected
$dates
=
[
'birthday'
,
'entry.date'
];
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