PHPC-245: Allow embedding objects in updates

Author: bjori

php_bson.h

@@ -34,6 +34,7 @@ typedef enum {
 	PHONGO_BSON_ADD_ID    = 0x01,
 	PHONGO_BSON_RETURN_ID = 0x02,
 	PHONGO_BSON_ADD_ODS   = 0x04,
+	PHONGO_BSON_ADD_CHILD_ODS = 0x08
 } phongo_bson_flags_t;
 
 PHONGO_API void zval_to_bson(zval *data, phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC);

src/MongoDB/BulkWrite.c

@@ -97,7 +97,7 @@ PHP_METHOD(BulkWrite, insert)
 	if (return_value_used) {
 		bson_flags |= PHONGO_BSON_RETURN_ID;
 	}
-	bson_flags |= PHONGO_BSON_ADD_ODS;
+	bson_flags |= PHONGO_BSON_ADD_ODS|PHONGO_BSON_ADD_CHILD_ODS;
 
 	bson = bson_new();
 	zval_to_bson(document, bson_flags, bson, &bson_out TSRMLS_CC);

src/MongoDB/Manager.c

@@ -172,7 +172,7 @@ PHP_METHOD(Manager, executeInsert)
 
 
 	bson = bson_new();
-	zval_to_bson(document, PHONGO_BSON_ADD_ODS, bson, NULL TSRMLS_CC);
+	zval_to_bson(document, PHONGO_BSON_ADD_ODS|PHONGO_BSON_ADD_CHILD_ODS, bson, NULL TSRMLS_CC);
 	phongo_execute_single_insert(intern->client, namespace, bson, phongo_write_concern_from_zval(zwrite_concern TSRMLS_CC), -1, return_value, return_value_used TSRMLS_CC);
 	bson_clear(&bson);
 }
@@ -204,7 +204,7 @@ PHP_METHOD(Manager, executeUpdate)
 	query = bson_new();
 	update = bson_new();
 	zval_to_bson(zquery, PHONGO_BSON_NONE, query, NULL TSRMLS_CC);
-	zval_to_bson(newObj, PHONGO_BSON_NONE, update, NULL TSRMLS_CC);
+	zval_to_bson(newObj, PHONGO_BSON_ADD_CHILD_ODS, update, NULL TSRMLS_CC);
 
 	if (updateOptions) {
 		flags |= php_array_fetch_bool(updateOptions, "multi") ? MONGOC_UPDATE_MULTI_UPDATE : 0 ;

src/bson.c

@@ -591,7 +591,7 @@ void object_to_bson(zval *object, phongo_bson_flags_t flags, const char *key, lo
 
 				bson_append_document_begin(bson, key, key_len, &child);
 				if (instanceof_function(Z_OBJCE_P(object), php_phongo_persistable_ce TSRMLS_CC)) {
-					if (flags & PHONGO_BSON_ADD_ODS) {
+					if (flags & PHONGO_BSON_ADD_CHILD_ODS) {
 						bson_append_binary(&child, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(object)->name, strlen(Z_OBJCE_P(object)->name));
 					}
 				}
@@ -889,7 +889,7 @@ PHP_FUNCTION(fromArray)
 	}
 
 	bson = bson_new();
-	zval_to_bson(data, PHONGO_BSON_ADD_ODS, bson, NULL TSRMLS_CC);
+	zval_to_bson(data, PHONGO_BSON_ADD_ODS|PHONGO_BSON_ADD_CHILD_ODS, bson, NULL TSRMLS_CC);
 
 	RETVAL_STRINGL((const char *) bson_get_data(bson), bson->len, 1);
 	bson_destroy(bson);