Commit 28942f4c authored by Jeremy Mikola's avatar Jeremy Mikola

PHPLIB-229: Count and Distinct don't need Server to construct commands

This should have been done in 8dcc7784.
parent 95b61909
...@@ -130,7 +130,7 @@ class Count implements Executable ...@@ -130,7 +130,7 @@ class Count implements Executable
$readPreference = isset($this->options['readPreference']) ? $this->options['readPreference'] : null; $readPreference = isset($this->options['readPreference']) ? $this->options['readPreference'] : null;
$cursor = $server->executeCommand($this->databaseName, $this->createCommand($server), $readPreference); $cursor = $server->executeCommand($this->databaseName, $this->createCommand(), $readPreference);
$result = current($cursor->toArray()); $result = current($cursor->toArray());
// Older server versions may return a float // Older server versions may return a float
...@@ -144,10 +144,9 @@ class Count implements Executable ...@@ -144,10 +144,9 @@ class Count implements Executable
/** /**
* Create the count command. * Create the count command.
* *
* @param Server $server
* @return Command * @return Command
*/ */
private function createCommand(Server $server) private function createCommand()
{ {
$cmd = ['count' => $this->collectionName]; $cmd = ['count' => $this->collectionName];
......
...@@ -120,10 +120,9 @@ class Distinct implements Executable ...@@ -120,10 +120,9 @@ class Distinct implements Executable
/** /**
* Create the distinct command. * Create the distinct command.
* *
* @param Server $server
* @return Command * @return Command
*/ */
private function createCommand(Server $server) private function createCommand()
{ {
$cmd = [ $cmd = [
'distinct' => $this->collectionName, 'distinct' => $this->collectionName,
...@@ -142,7 +141,7 @@ class Distinct implements Executable ...@@ -142,7 +141,7 @@ class Distinct implements Executable
$cmd['maxTimeMS'] = $this->options['maxTimeMS']; $cmd['maxTimeMS'] = $this->options['maxTimeMS'];
} }
if (isset($this->options['readConcern']) && \MongoDB\server_supports_feature($server, self::$wireVersionForReadConcern)) { if (isset($this->options['readConcern'])) {
$cmd['readConcern'] = \MongoDB\read_concern_as_document($this->options['readConcern']); $cmd['readConcern'] = \MongoDB\read_concern_as_document($this->options['readConcern']);
} }
......
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