prepare_next_rel

ormar/models/mixins/merge_mixin.py

@@ -83,6 +83,7 @@ class MergeModelMixin:
                 setattr(other, field_name, value_to_set)
             elif (
                 isinstance(current_field, ormar.Model)
+                and isinstance(other_value, ormar.Model)
                 and current_field.pk == other_value.pk
             ):
                 setattr(

ormar/models/newbasemodel.py

@@ -909,7 +909,7 @@ class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass
             return base64.b64encode(value).decode()
         return value
 
-    def _convert_json(self, column_name: str, value: Any) -> Union[str, Dict]:
+    def _convert_json(self, column_name: str, value: Any) -> Union[str, Dict, None]:
         """
         Converts value to/from json if needed (for Json columns).