Skip to content
Snippets Groups Projects

F merge missing list datatype

Merged Florian Spreckelsen requested to merge f-merge-missing-list-datatype into dev
2 unresolved threads
3 files
+ 5
14
Compare changes
  • Side-by-side
  • Inline

Files

+ 0
10
@@ -442,16 +442,6 @@ def merge_entities(entity_a: Entity, entity_b: Entity, merge_references_with_emp
setattr(entity_a.get_property(key), attribute,
diff_r2["properties"][key][attribute])
elif force:
if attribute == "value":
# Very special case of a property that has a scalar
# datatype being fored to a list value without
# having been assigned the correct datatype before.
if isinstance(diff_r2["properties"][key][attribute], list):
if ((entity_a.get_property(key).datatype is not None) and
(not entity_a.get_property(key).datatype.startswith("LIST<"))):
entity_a.get_property(key).datatype = LIST(
entity_a.get_property(key).datatype)
setattr(entity_a.get_property(key), attribute,
diff_r2["properties"][key][attribute])
else:
Loading