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
dfc16134
Commit
dfc16134
authored
Aug 27, 2016
by
pi0
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better useCollections
parent
fa8f9aa2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
Builder.php
src/Jenssegers/Mongodb/Query/Builder.php
+6
-7
No files found.
src/Jenssegers/Mongodb/Query/Builder.php
View file @
dfc16134
...
...
@@ -83,7 +83,7 @@ class Builder extends BaseBuilder
*
* @var boolean
*/
protected
$use
_collection
;
protected
$use
Collections
;
/**
* Create a new query builder instance.
...
...
@@ -96,8 +96,7 @@ class Builder extends BaseBuilder
$this
->
grammar
=
new
Grammar
;
$this
->
connection
=
$connection
;
$this
->
processor
=
$processor
;
$s
=
explode
(
'.'
,
\Illuminate\Foundation\Application
::
VERSION
);
$this
->
use_collection
=
(
10
*
$s
[
0
]
+
$s
[
1
])
>=
53
;
$this
->
useCollections
=
version_compare
(
\Illuminate\Foundation\Application
::
VERSION
,
'5.3.0'
,
'>='
);
}
/**
...
...
@@ -268,7 +267,7 @@ class Builder extends BaseBuilder
$results
=
iterator_to_array
(
$this
->
collection
->
aggregate
(
$pipeline
,
$options
));
// Return results
return
$this
->
use
_collection
?
new
Collection
(
$results
)
:
$results
;
return
$this
->
use
Collections
?
new
Collection
(
$results
)
:
$results
;
}
// Distinct query
...
...
@@ -283,7 +282,7 @@ class Builder extends BaseBuilder
$result
=
$this
->
collection
->
distinct
(
$column
);
}
return
$this
->
use
_collection
?
new
Collection
(
$result
)
:
$result
;
return
$this
->
use
Collections
?
new
Collection
(
$result
)
:
$result
;
}
// Normal query
...
...
@@ -327,7 +326,7 @@ class Builder extends BaseBuilder
// Return results as an array with numeric keys
$results
=
iterator_to_array
(
$cursor
,
false
);
return
$this
->
use
_collection
?
new
Collection
(
$results
)
:
$results
;
return
$this
->
use
Collections
?
new
Collection
(
$results
)
:
$results
;
}
}
...
...
@@ -578,7 +577,7 @@ class Builder extends BaseBuilder
{
$results
=
$this
->
get
(
is_null
(
$key
)
?
[
$column
]
:
[
$column
,
$key
]);
return
$this
->
use
_collection
?
$results
->
pluck
(
$column
,
$key
)
:
Arr
::
pluck
(
$results
,
$column
,
$key
);
return
$this
->
use
Collections
?
$results
->
pluck
(
$column
,
$key
)
:
Arr
::
pluck
(
$results
,
$column
,
$key
);
}
/**
...
...
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