Merge branch 'f-fix-merge-key-word' into 'dev'

F fix merge key word

See merge request !70

src/caosdb/apiutils.py

@@ -338,11 +338,13 @@ def merge_entities(entity_a: Entity, entity_b: Entity):
                 raise NotImplementedError()
 
             for attribute in ("datatype", "unit", "value"):
-                if diff_r1["properties"][key][attribute] is None:
-                    setattr(entity_a.get_property(key), attribute,
-                            diff_r2["properties"][key][attribute])
-                else:
-                    raise RuntimeError("Merge conflict.")
+                if (attribute in diff_r2["properties"][key] and
+                        diff_r2["properties"][key][attribute] is not None):
+                    if (diff_r1["properties"][key][attribute] is None):
+                        setattr(entity_a.get_property(key), attribute,
+                                diff_r2["properties"][key][attribute])
+                    else:
+                        raise RuntimeError("Merge conflict.")
         else:
             # TODO: This is a temporary FIX for
             #       https://gitlab.indiscale.com/caosdb/src/caosdb-pylib/-/issues/105

unittests/test_apiutils.py

@@ -296,6 +296,19 @@ def test_merge_entities():
     assert r2.get_property("F").value == "text"
 
 
+def test_merge_bug_conflict():
+    r = db.Record()
+    r.add_property(name="C", value=4)
+    r2 = db.Record()
+    r2.add_property(name="C", value=4, datatype="TEXT")
+    merge_entities(r, r2)
+
+    r3 = db.Record()
+    r3.add_property(name="C", value=4, datatype="INTEGER")
+    with pytest.raises(RuntimeError) as excinfo:
+        merge_entities(r3, r2)
+
+
 def test_merge_bug_109():
     rt = db.RecordType(name="TestBug")
     p = db.Property(name="test_bug_property", datatype=db.LIST(db.INTEGER))