Commit 4514964

GromNaNalcaeus

authored and

committed

PHPORM-50 PHPORM-65 Remove call to deprecated Collection::count for countDocuments (#18)

1 parent e045fab commit 4514964Copy full SHA for 4514964

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.`
`11`	`11`	- Throw an exception when `Query\Builder::orderBy()` is used with invalid direction [#7](https://github.com/GromNaN/laravel-mongodb-private/pull/7) by [@GromNaN](https://github.com/GromNaN).
`12`	`12`	- Throw an exception when `Query\Builder::push()` is used incorrectly [#5](https://github.com/GromNaN/laravel-mongodb-private/pull/5) by [@GromNaN](https://github.com/GromNaN).
`13`	`13`	- Remove public property `Query\Builder::$paginating` [#15](https://github.com/GromNaN/laravel-mongodb-private/pull/15) by [@GromNaN](https://github.com/GromNaN).
	`14`	+- Remove call to deprecated `Collection::count` for `countDocuments` [#18](https://github.com/GromNaN/laravel-mongodb-private/pull/18) by [@GromNaN](https://github.com/GromNaN).
`14`	`15`
`15`	`16`	`## [3.9.2] - 2022年09月01日`
`16`	`17`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,9 @@ public function toMql(): array`
`266`	`266`	`$aggregations = blank($this->aggregate['columns']) ? [] : $this->aggregate['columns'];`
`267`	`267`
`268`	`268`	`if (in_array('*', $aggregations) && $function == 'count') {`
`269`		`- return ['count' => [$wheres, []]];`
	`269`	`+ $options = $this->inheritConnectionOptions();`
	`270`	`+`
	`271`	`+ return ['countDocuments' => [$wheres, $options]];`
`270`	`272`	`} elseif ($function == 'count') {`
`271`	`273`	`// Translate count into sum.`
`272`	`274`	`$group['aggregate'] = ['$sum' => 1];`
`@@ -329,7 +331,7 @@ public function toMql(): array`
`329`	`331`
`330`	`332`	`$options = $this->inheritConnectionOptions();`
`331`	`333`
`332`		`- return ['distinct' => [$column, $wheres ?: [], $options]];`
	`334`	`+ return ['distinct' => [$column, $wheres, $options]];`
`333`	`335`	`} // Normal query`
`334`	`336`	`else {`
`335`	`337`	`// Convert select columns to simple projections.`
`@@ -396,7 +398,7 @@ public function getFresh($columns = [], $returnLazy = false)`
`396`	`398`	`$this->columns = [];`
`397`	`399`	`}`
`398`	`400`
`399`		`- $command = $this->toMql($columns);`
	`401`	`+ $command = $this->toMql();`
`400`	`402`	`assert(count($command) >= 1, 'At least one method call is required to execute a query');`
`401`	`403`
`402`	`404`	`$result = $this->collection;`

Comments

(0)