Bug#35046616 XDevAPI: Collection.modify().set("$",...) does not work.

If modify() receives string, it will be reported as string.
To set whole document, user should pass DbDoc() object on
modify("$",DbDoc());

Change-Id: I68a656a6e0ec0ba1b3a21869ba0156a9547a65a8

Author: silvakid

common/op_impl.h

@@ -2490,18 +2490,26 @@ class Op_collection_modify
       : m_op(op), m_field(field), m_val(val)
     {}
 
-    void process(Processor &prc) const
-    {
-      if (m_expr)
-        return m_expr->process(prc);
-
-      if(m_field == "$")
-      {
-        Value_expr doc(m_val, parser::Parser_mode::DOCUMENT);
-
-        Extract_id expr_id;
-        Insert_id id(doc, expr_id);
-        id.process(prc);
+    void process(Processor &prc) const {
+      if (m_expr) return m_expr->process(prc);
+
+      // We send document given by a JSON string as an SQL expression
+      // `JSON_INSERT(val, '$', '{}')` to force server to interpret it as JSON
+      // value. Otherwise it would be interpreted as a literal string value,
+      // not a document.
+      if (Value::JSON == m_val.get_type()) {
+        struct : cdk::api::Object_ref {
+          const cdk::api::Schema_ref *schema() const override {
+            return nullptr;
+          }
+          const cdk::string name() const override { return "JSON_INSERT"; }
+        } json_insert;
+        auto json_set_args = safe_prc(prc.scalar()->call(json_insert));
+        json_set_args->list_begin();
+        json_set_args->list_el()->scalar()->val()->str(m_val.get_string());
+        json_set_args->list_el()->scalar()->val()->str("$");
+        json_set_args->list_el()->scalar()->val()->str("{}");
+        json_set_args->list_end();
       } else {
         Value::Access::process(parser::Parser_mode::DOCUMENT, m_val, prc);
       }

devapi/crud.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as

devapi/document.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -47,6 +47,19 @@
 using namespace ::mysqlx;
 using std::endl;
 
+// Value::get specialization to allow convertion to common::Value type
+// --------------------
+
+// We need to export this template instantiation
+template PUBLIC_API common::Value Value::get<common::Value>() const;
+
+template <>
+common::Value Value::get<common::Value>() const {
+  if (getType() == DOCUMENT) {
+    return common::Value::Access::mk_json(m_doc.get_json());
+  }
+  return *this;
+}
 
 // DbDoc implementation
 // --------------------

devapi/tests/bugs-t.cc

@@ -972,9 +972,13 @@ TEST_F(Bugs, Bug35046616) {
   cout << "Inserting documents..." << endl;
 
   coll.remove("true").execute();
+
   auto ids = {"1", "MYID1", "MYID2"};
+
   for (auto _id : ids) {
-    coll.addOrReplaceOne(_id, R"({ "name": "foo", "age": 1 })");
+    coll.add(std::string(R"({ "_id": ")") + _id +
+             R"(", "name": "foo", "age": 1 })")
+        .execute();
   }
 
   auto find_id = coll.find("_id = :id");
@@ -989,12 +993,10 @@ TEST_F(Bugs, Bug35046616) {
   cout << "Updating document..." << endl;
 
   auto modify = coll.modify("_id = :id")
-                    .set("$", R"({ "_id": "DISCARDED", "name": "bar"})");
+                    .set("$",expr( R"({ "_id": "DISCARDED", "name": "bar"})"));
   for (auto _id : ids) {
     modify.bind("id", _id).execute();
-  }
 
-  for (auto _id : ids) {
     EXPECT_EQ(std::string("bar"), find_id.bind("id", _id)
                                       .execute()
                                       .fetchOne()["name"]
@@ -1003,7 +1005,7 @@ TEST_F(Bugs, Bug35046616) {
 
   // Changing all documents of the collection setting name to baz
   coll.modify("true")
-      .set("$", R"({ "_id": "DISCARDED", "name": "baz"})")
+      .set("$", DbDoc(R"({ "_id": "DISCARDED", "name": "baz"})"))
       .execute();
 
   for (auto _id : ids) {
@@ -1012,4 +1014,29 @@ TEST_F(Bugs, Bug35046616) {
                                       .fetchOne()["name"]
                                       .get<std::string>());
   }
+
+  // Changing all documents of the collection setting name to a document
+  // {first: last:}
+  coll.modify("true")
+      .set("$.name", DbDoc(R"({"first": "foo", "last": "bar"})"))
+      .execute();
+
+  for (auto _id : ids) {
+    auto doc = find_id.bind("id", _id).execute().fetchOne();
+    EXPECT_EQ(Value::DOCUMENT, doc["name"].getType());
+    EXPECT_EQ(std::string("foo"), doc["name"]["first"].get<std::string>());
+  }
+
+  // Changing all documents of the collection setting name to a string with a
+  // JSON. JSON should not be processed.
+  coll.modify("true")
+      .set("$.name", R"({"first": "foo", "last": "bar"})")
+      .execute();
+
+  for (auto _id : ids) {
+    auto doc = find_id.bind("id", _id).execute().fetchOne();
+    EXPECT_EQ(Value::STRING, doc["name"].getType());
+    EXPECT_EQ(std::string(R"({"first": "foo", "last": "bar"})"),
+              doc["name"].get<std::string>());
+  }
 }

include/mysqlx/devapi/collection_crud.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -82,6 +82,8 @@ class Session;
 class Collection;
 class Table;
 
+template<>
+common::Value Value::get<common::Value>() const;
 
 // ----------------------------------------------------------------------
 
@@ -435,19 +437,19 @@ struct Collection_modify_base
 /**
   An operation which modifies all or selected documents in a collection.
 
-  Note that in operations such as `set()`, `unset()`, `arrayInsert()` and 
-  `arrayAppend()` the field argument is specified as a document path. It can be 
+  Note that in operations such as `set()`, `unset()`, `arrayInsert()` and
+  `arrayAppend()` the field argument is specified as a document path. It can be
   a simple field name, but it can be a more complex expression like
-  `$.foo.bar[3]`. One consequence of this is that document field names that 
-  contain spaces or other special characters need to be quoted, for example one 
+  `$.foo.bar[3]`. One consequence of this is that document field names that
+  contain spaces or other special characters need to be quoted, for example one
   needs to use this form
   ```
     .unset("\"field name with spaces\"")
   ```
-  as `.unset("field name with spaces")` would be an invalid document path 
+  as `.unset("field name with spaces")` would be an invalid document path
   expression.
-  
-  Note also that wildcard paths that use `*` or `**` are not valid for these 
+
+  Note also that wildcard paths that use `*` or `**` are not valid for these
   operations that modify documents.
 
   See [MySQL Reference Manual](https://dev.mysql.com/doc/refman/en/json.html#json-path-syntax)
@@ -494,16 +496,15 @@ class CollectionModify
     Set the given field in a document to the given value.
 
     The field is given by a document path. The value can be either a direct
-    literal or an expression given as `expr(<string>)`, to be evaluated on
-    the server.
+    literal, `DbDoc` instance or an expression given as `expr(<string>)`, to be
+    evaluated on the server.
   */
 
   CollectionModify& set(const Field &field, const Value &val)
   {
     try {
-      get_impl()->add_operation(
-        Impl::SET, field, (const common::Value&)val
-      );
+      get_impl()->add_operation(Impl::SET, field,
+                                val.get<common::Value>());
       return *this;
     }
     CATCH_AND_WRAP
@@ -534,11 +535,8 @@ class CollectionModify
   CollectionModify& arrayInsert(const Field &field, const Value &val)
   {
     try {
-      get_impl()->add_operation(
-        Impl::ARRAY_INSERT,
-        field,
-        (const common::Value&)val
-      );
+      get_impl()->add_operation(Impl::ARRAY_INSERT, field,
+                                val.get<common::Value>());
       return *this;
     }
     CATCH_AND_WRAP
@@ -555,11 +553,8 @@ class CollectionModify
   CollectionModify& arrayAppend(const Field &field, const Value &val)
   {
     try {
-      get_impl()->add_operation(
-        Impl::ARRAY_APPEND,
-        field,
-        (const common::Value&)val
-      );
+      get_impl()->add_operation(Impl::ARRAY_APPEND, field,
+                                val.get<common::Value>());
       return *this;
     }
     CATCH_AND_WRAP

include/mysqlx/devapi/crud.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as