Merge pull request #1005

Author: alcaeus

config.w32

@@ -148,6 +148,7 @@ if (PHP_MONGODB != "no") {
     MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE: 0,
     MONGOC_ENABLE_COMPRESSION_SNAPPY: 0,
     MONGOC_ENABLE_COMPRESSION_ZLIB: 0,
+    MONGOC_ENABLE_COMPRESSION_ZSTD: 0,
     MONGOC_ENABLE_COMPRESSION: 0,
     MONGOC_ENABLE_SASL: 0,
     MONGOC_ENABLE_SASL_CYRUS: 0,

scripts/autotools/libmongoc/CheckCompression.m4

@@ -64,3 +64,5 @@ else
   AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZLIB, 0)
   AC_SUBST(MONGOC_ENABLE_COMPRESSION_SNAPPY, 0)
 fi
+
+AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZSTD, 0)

src/libmongoc

@@ -34,5 +34,5 @@ OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 invalid argument for update: corrupt BSON
 
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Invalid key 'z': update only works with $ operators
+Invalid key 'z': update only works with $ operators and pipelines
 ===DONE===

tests/bulk/bulkwrite-update_error-002.phpt

@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeCommand() options (MONGO_CMD_RAW)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
+<?php skip_if_standalone(); ?>
 <?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--

tests/server/server-executeCommand-006.phpt

@@ -0,0 +1,51 @@
+--TEST--
+MongoDB\Driver\Server::executeCommand() does not send read preference to standalone
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_live(); ?>
+<?php skip_if_not_standalone(); ?>
+<?php skip_if_not_clean(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+require_once __DIR__ . "/../utils/observer.php";
+
+$manager = new MongoDB\Driver\Manager(URI);
+$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY));
+
+(new CommandObserver)->observe(
+    function() use ($server) {
+        $command = new MongoDB\Driver\Command([
+            'ping' => true,
+        ]);
+
+        try {
+            $server->executeCommand(
+                DATABASE_NAME,
+                $command,
+                [
+                    'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::RP_SECONDARY),
+                    'readConcern' => new \MongoDB\Driver\ReadConcern(\MongoDB\Driver\ReadConcern::LOCAL),
+                    'writeConcern' => new \MongoDB\Driver\WriteConcern(\MongoDB\Driver\WriteConcern::MAJORITY),
+                ]
+            );
+        } catch ( Exception $e ) {
+            // Ignore exception that ping doesn't support writeConcern
+        }
+    },
+    function(stdClass $command) {
+        echo isset($command->{'$readPreference'}) ? 'Read preference set' : 'No read preference set', "\n";
+        echo "Read Concern: ", $command->readConcern->level, "\n";
+        echo "Write Concern: ", $command->writeConcern->w, "\n";
+    }
+);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+No read preference set
+Read Concern: local
+Write Concern: majority
+===DONE===