Reintroduce table name for links in xjson_plus format

Author: jedelbo

src/realm/to_json.cpp

@@ -252,41 +252,38 @@ void Obj::to_json(std::ostream& out, JSONOutputMode output_mode) const
         auto print_link = [&](const Mixed& val) {
             REALM_ASSERT(val.is_type(type_Link, type_TypedLink));
             TableRef tt = target_table;
-            auto obj_key = val.get<ObjKey>();
-
-            auto out_obj_key = [&] {
-                if (pk_col_key) {
-                    tt->get_primary_key(obj_key).to_json(out, output_mode);
-                }
-                else {
-                    out << obj_key.value;
-                }
-            };
+            bool typed_link = false;
             if (!tt) {
                 // It must be a typed link
                 tt = m_table->get_parent_group()->get_table(val.get_link().get_table_key());
-                pk_col_key = tt->get_primary_key_column();
-                out << "{ \"$link\": {";
+                typed_link = true;
+            }
+            auto obj_key = val.get<ObjKey>();
+            std::string closing;
 
-                out << "\"table\": \"" << tt->get_class_name() << "\", \"key\": ";
-                out_obj_key();
-                out << " }}";
+            if (tt->is_embedded()) {
+                if (output_mode == output_mode_xjson_plus) {
+                    out << "{ \"$embedded\": {";
+                    out << "\"table\": \"" << tt->get_name() << "\", \"value\": ";
+                    closing = "}}";
+                }
+                tt->get_object(obj_key).to_json(out, output_mode);
             }
             else {
-                if (tt->is_embedded()) {
-                    if (output_mode == output_mode_xjson_plus) {
-                        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 << "}}";
-                    }
+                pk_col_key = tt->get_primary_key_column();
+                if (output_mode == output_mode_xjson_plus || typed_link) {
+                    out << "{ \"$link\": {";
+                    out << "\"table\": \"" << tt->get_class_name() << "\", \"key\": ";
+                    closing = "}}";
+                }
+                if (pk_col_key) {
+                    tt->get_primary_key(obj_key).to_json(out, output_mode);
                 }
                 else {
-                    out_obj_key();
+                    out << obj_key.value;
                 }
             }
+            out << closing;
         };
 
         if (ck.is_collection()) {

test/expected_xjson_plus_link.json

@@ -2,7 +2,12 @@
   {
     "primaryKey": "t1o1",
     "str1": "hello",
-    "linkA": "t2o1"
+    "linkA": {
+      "$link": {
+        "table": "table2",
+        "key": "t2o1"
+      }
+    }
   },
   {
     "primaryKey": "t1o2",

test/expected_xjson_plus_linkdict1.json

@@ -6,7 +6,12 @@
     },
     "dict": {
       "$dictionary": {
-        "key1": "t2o2"
+        "key1": {
+          "$link": {
+            "table": "table2",
+            "key": "t2o2"
+          }
+        }
       }
     }
   },
@@ -26,8 +31,18 @@
     },
     "dict": {
       "$dictionary": {
-        "key2": "t2o2",
-        "key3": "t2o3",
+        "key2": {
+          "$link": {
+            "table": "table2",
+            "key": "t2o2"
+          }
+        },
+        "key3": {
+          "$link": {
+            "table": "table2",
+            "key": "t2o3"
+          }
+        },
         "key4": null,
         "key5": null
       }

test/expected_xjson_plus_linklist1.json

@@ -5,9 +5,19 @@
       "$numberLong": "100"
     },
     "linkA": [
-      "t2o2"
+      {
+        "$link": {
+          "table": "table2",
+          "key": "t2o2"
+        }
+      }
     ],
-    "linkB": "t2o1"
+    "linkB": {
+      "$link": {
+        "table": "table2",
+        "key": "t2o1"
+      }
+    }
   },
   {
     "primaryKey": "t1o3",
@@ -23,8 +33,18 @@
       "$numberLong": "200"
     },
     "linkA": [
-      "t2o2",
-      "t2o3"
+      {
+        "$link": {
+          "table": "table2",
+          "key": "t2o2"
+        }
+      },
+      {
+        "$link": {
+          "table": "table2",
+          "key": "t2o3"
+        }
+      }
     ],
     "linkB": null
   }

test/expected_xjson_plus_linkset1.json

@@ -5,7 +5,12 @@
       "$numberLong": "100"
     },
     "linkA": [
-      "t2o2"
+      {
+        "$link": {
+          "table": "table2",
+          "key": "t2o2"
+        }
+      }
     ]
   },
   {
@@ -21,8 +26,18 @@
       "$numberLong": "200"
     },
     "linkA": [
-      "t2o2",
-      "t2o3"
+      {
+        "$link": {
+          "table": "table2",
+          "key": "t2o2"
+        }
+      },
+      {
+        "$link": {
+          "table": "table2",
+          "key": "t2o3"
+        }
+      }
     ]
   }
 ]