Allow array or document for updateOne/Many update arg

Author: jmikola

src/libmongoc/tests/bsonutil/bson-parser.c

@@ -27,6 +27,7 @@ typedef enum {
    BSON_PARSER_BOOL,
    BSON_PARSER_DOC,
    BSON_PARSER_ARRAY,
+   BSON_PARSER_ARRAY_OR_DOC,
    BSON_PARSER_ANY,
    BSON_PARSER_WRITE_CONCERN,
    BSON_PARSER_READ_CONCERN,
@@ -62,6 +63,8 @@ parser_type_to_string (bson_parser_type_t ptype)
       return "DOC";
    case BSON_PARSER_ARRAY:
       return "ARRAY";
+   case BSON_PARSER_ARRAY_OR_DOC:
+      return "ARRAY or DOC";
    case BSON_PARSER_ANY:
       return "ANY";
    case BSON_PARSER_WRITE_CONCERN:
@@ -240,7 +243,8 @@ bson_parser_entry_destroy (bson_parser_entry_t *entry, bool with_parsed_fields)
 {
    if (with_parsed_fields) {
       if (entry->ptype == BSON_PARSER_DOC ||
-          entry->ptype == BSON_PARSER_ARRAY) {
+          entry->ptype == BSON_PARSER_ARRAY ||
+          entry->ptype == BSON_PARSER_ARRAY_OR_DOC) {
          bson_t **out;
 
          out = (bson_t **) entry->out;
@@ -399,6 +403,23 @@ bson_parser_array_optional (bson_parser_t *parser,
    bson_parser_add_entry (parser, key, (void *) out, BSON_PARSER_ARRAY, true);
 }
 
+void
+bson_parser_array_or_doc (bson_parser_t *parser, const char *key, bson_t **out)
+{
+   *out = NULL;
+   bson_parser_add_entry (
+      parser, key, (void *) out, BSON_PARSER_ARRAY_OR_DOC, false);
+}
+void
+bson_parser_array_or_doc_optional (bson_parser_t *parser,
+                                   const char *key,
+                                   bson_t **out)
+{
+   *out = NULL;
+   bson_parser_add_entry (
+      parser, key, (void *) out, BSON_PARSER_ARRAY_OR_DOC, true);
+}
+
 void
 bson_parser_bool (bson_parser_t *parser, const char *key, bool **out)
 {
@@ -579,6 +600,19 @@ entry_marshal (bson_parser_entry_t *entry,
       *out = bson_copy (&tmp);
    }
 
+   else if (ptype == BSON_PARSER_ARRAY_OR_DOC) {
+      bson_t tmp;
+      bson_t **out = (bson_t **) entry->out;
+
+      if (btype != BSON_TYPE_ARRAY && btype != BSON_TYPE_DOCUMENT) {
+         marshal_error (key, btype, ptype, error);
+         goto done;
+      }
+
+      bson_iter_bson (iter, &tmp);
+      *out = bson_copy (&tmp);
+   }
+
    else if (ptype == BSON_PARSER_ANY) {
       bson_val_t **out = (bson_val_t **) entry->out;
 

src/libmongoc/tests/bsonutil/bson-parser.h

@@ -81,6 +81,13 @@ bson_parser_array (bson_parser_t *bp, const char *key, bson_t **out);
 void
 bson_parser_array_optional (bson_parser_t *bp, const char *key, bson_t **out);
 
+void
+bson_parser_array_or_doc (bson_parser_t *bp, const char *key, bson_t **out);
+void
+bson_parser_array_or_doc_optional (bson_parser_t *bp,
+                                   const char *key,
+                                   bson_t **out);
+
 void
 bson_parser_bool (bson_parser_t *bp, const char *key, bool **out);
 void

src/libmongoc/tests/unified/operation.c

@@ -422,7 +422,7 @@ bulk_op_append (mongoc_bulk_operation_t *bulk,
       }
    } else if (0 == strcmp (op_type, "updateOne")) {
       bson_parser_doc (parser, "filter", &filter);
-      bson_parser_doc (parser, "update", &update);
+      bson_parser_array_or_doc (parser, "update", &update);
       if (!bson_parser_parse (parser, &request_doc, error)) {
          goto done;
       }
@@ -432,7 +432,7 @@ bulk_op_append (mongoc_bulk_operation_t *bulk,
       }
    } else if (0 == strcmp (op_type, "updateMany")) {
       bson_parser_doc (parser, "filter", &filter);
-      bson_parser_doc (parser, "update", &update);
+      bson_parser_array_or_doc (parser, "update", &update);
       if (!bson_parser_parse (parser, &request_doc, error)) {
          goto done;
       }
@@ -1209,7 +1209,7 @@ operation_update_one (test_t *test,
    parser = bson_parser_new ();
    bson_parser_allow_extra (parser, true);
    bson_parser_doc (parser, "filter", &filter);
-   bson_parser_doc (parser, "update", &update);
+   bson_parser_array_or_doc (parser, "update", &update);
    if (!bson_parser_parse (parser, op->arguments, error)) {
       goto done;
    }
@@ -1253,7 +1253,7 @@ operation_update_many (test_t *test,
    parser = bson_parser_new ();
    bson_parser_allow_extra (parser, true);
    bson_parser_doc (parser, "filter", &filter);
-   bson_parser_doc (parser, "update", &update);
+   bson_parser_array_or_doc (parser, "update", &update);
    if (!bson_parser_parse (parser, op->arguments, error)) {
       goto done;
    }