Reintroduce table name for embedded tables in xjson_plus format

Author: jedelbo

src/realm/to_json.cpp

@@ -275,11 +275,12 @@ void Obj::to_json(std::ostream& out, JSONOutputMode output_mode) const
             else {
                 if (tt->is_embedded()) {
                     if (output_mode == output_mode_xjson_plus) {
-                        out << "{ \"$embedded\": ";
+                        out << "{ \"$embedded\": {";
+                        out << "\"table\": \"" << tt->get_name() << "\", \"value\": ";
                     }
                     tt->get_object(obj_key).to_json(out, output_mode);
                     if (output_mode == output_mode_xjson_plus) {
-                        out << "}";
+                        out << "}}";
                     }
                 }
                 else {

test/expected_xjson_plus_embeddeddict1.json

@@ -9,8 +9,11 @@
       "$dictionary": {
         "key1": {
           "$embedded": {
-            "int2": {
-              "$numberLong": "111"
+            "table": "table2",
+            "value": {
+              "int2": {
+                "$numberLong": "111"
+              }
             }
           }
         }
@@ -24,8 +27,11 @@
     },
     "embedded": {
       "$embedded": {
-        "int2": {
-          "$numberLong": "123"
+        "table": "table2",
+        "value": {
+          "int2": {
+            "$numberLong": "123"
+          }
         }
       }
     },
@@ -43,15 +49,21 @@
       "$dictionary": {
         "key2": {
           "$embedded": {
-            "int2": {
-              "$numberLong": "222"
+            "table": "table2",
+            "value": {
+                "int2": {
+                "$numberLong": "222"
+              }
             }
           }
         },
         "key3": {
           "$embedded": {
-            "int2": {
-              "$numberLong": "333"
+            "table": "table2",
+            "value": {
+                "int2": {
+                "$numberLong": "333"
+              }
             }
           }
         }