diff options
Diffstat (limited to 'lib/sqlalchemy/orm/unitofwork.py')
| -rw-r--r-- | lib/sqlalchemy/orm/unitofwork.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py index c0423939f..84c9f647c 100644 --- a/lib/sqlalchemy/orm/unitofwork.py +++ b/lib/sqlalchemy/orm/unitofwork.py @@ -29,6 +29,9 @@ def track_cascade_events(descriptor, prop): # process "save_update" cascade rules for when # an instance is appended to the list of another instance + if item is None: + return + sess = sessionlib._state_session(state) if sess: prop = state.manager.mapper._props[key] @@ -40,6 +43,9 @@ def track_cascade_events(descriptor, prop): return item def remove(state, item, initiator): + if item is None: + return + sess = sessionlib._state_session(state) if sess: prop = state.manager.mapper._props[key] |