Merged pull request #880

Author: derickr

php_phongo.c

@@ -764,9 +764,10 @@ bool phongo_execute_bulk_write(mongoc_client_t* client, const char* namespace, p
 	if (!success) {
 		if (error.domain == MONGOC_ERROR_SERVER || error.domain == MONGOC_ERROR_WRITE_CONCERN) {
 			zend_throw_exception(php_phongo_bulkwriteexception_ce, error.message, error.code TSRMLS_CC);
+			phongo_exception_add_error_labels(&reply TSRMLS_CC);
 			phongo_add_exception_prop(ZEND_STRL("writeResult"), return_value TSRMLS_CC);
 		} else {
-			phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
+			phongo_throw_exception_from_bson_error_and_reply_t(&error, &reply TSRMLS_CC);
 		}
 	}
 

tests/session/transaction-integration-003.phpt

@@ -0,0 +1,58 @@
+--TEST--
+MongoDB\Driver\Session::startTransaction() Transient Error Test
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME); ?>
+<?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '4.0'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(URI);
+
+/* Create collections as that can't be (automatically) done in a transaction */
+$cmd = new \MongoDB\Driver\Command([
+    'create' => COLLECTION_NAME,
+]);
+$manager->executeCommand(DATABASE_NAME, $cmd);
+
+/* Insert Data */
+$bw = new \MongoDB\Driver\BulkWrite();
+$bw->insert( [ '_id' => 0, 'msg' => 'Initial Value' ] );
+$manager->executeBulkWrite(NS, $bw);
+
+/* First 'thread', try to update document, but don't close transaction */
+$sessionA = $manager->startSession();
+$sessionA->startTransaction( [
+    'readConcern' => new \MongoDB\Driver\ReadConcern( "snapshot" ),
+    'writeConcern' => new \MongoDB\Driver\WriteConcern( \MongoDB\Driver\WriteConcern::MAJORITY )
+] );
+
+$bw = new \MongoDB\Driver\BulkWrite();
+$bw->update( [ '_id' => 0 ], [ '$set' => [ 'msg' => 'Update from session A' ] ] );
+$manager->executeBulkWrite(NS, $bw, ['session' => $sessionA]);
+ 
+
+/* Second 'thread', try to update the same document, should trigger exception. In handler, commit
+ * first settion, verify result, and redo this transaction. */
+$sessionB = $manager->startSession();
+$sessionB->startTransaction( [
+    'readConcern' => new \MongoDB\Driver\ReadConcern( "snapshot" ),
+    'writeConcern' => new \MongoDB\Driver\WriteConcern( \MongoDB\Driver\WriteConcern::MAJORITY )
+] );
+
+try {
+    $bw = new \MongoDB\Driver\BulkWrite();
+    $bw->update( [ '_id' => 0 ], [ '$set' => [ 'msg' => 'Update from session B' ] ] );
+    $manager->executeBulkWrite(NS, $bw, ['session' => $sessionB]);
+} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
+    echo $e->hasErrorLabel('TransientTransactionError') ?
+        "found a TransientTransactionError" : "did NOT get a TransientTransactionError", "\n";
+}
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+found a TransientTransactionError
+===DONE===