revil-O/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Make the recursive entity merger/column set logic more resilient against ObjectDeletedError

Browse source
This commit is contained in:
Fabio Manganiello 2023-04-22 10:40:26 +02:00
parent 98a300c4b1
commit d473b5d836
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
platypush/entities/_engine/repo/merger.py
View file

@ -1,11 +1,15 @@
import logging
from typing import Iterable, List, Optional from typing import Iterable, List, Optional
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from sqlalchemy.orm.exc import ObjectDeletedError
from platypush.entities._base import Entity, EntityMapping from platypush.entities._base import Entity, EntityMapping
from .helpers import get_parent from .helpers import get_parent
logger = logging.getLogger(__name__)
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods
class EntitiesMerger: class EntitiesMerger:
@ -180,7 +184,13 @@ class EntitiesMerger:
**(entity.meta or {}), # type: ignore **(entity.meta or {}), # type: ignore
} }
elif col not in ('id', 'created_at'): elif col not in ('id', 'created_at'):
setattr(existing_entity, col, getattr(entity, col)) try:
setattr(existing_entity, col, getattr(entity, col))
except ObjectDeletedError as e:
logger.warning(
'Could not set %s on entity <%s>: %s',
col, existing_entity.entity_key, e
)
# Recursive call to merge the columns of the children too # Recursive call to merge the columns of the children too
if include_children: if include_children: