diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-12-07 13:24:11 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-12-07 13:24:11 -0500 |
| commit | f79c9a221fca87d405b81453888d63e85c201452 (patch) | |
| tree | 440abad523d2e0cf554dc3454cdf610c2c9cef27 /lib/sqlalchemy/orm/descriptor_props.py | |
| parent | c718ad227efe4b389c09f167a375c57969cf4bb4 (diff) | |
| download | sqlalchemy-f79c9a221fca87d405b81453888d63e85c201452.tar.gz | |
- [bug] Fixed bug in get_history() when referring
to a composite attribute that has no value;
added coverage for get_history() regarding
composites which is otherwise just a userland
function.
Diffstat (limited to 'lib/sqlalchemy/orm/descriptor_props.py')
| -rw-r--r-- | lib/sqlalchemy/orm/descriptor_props.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py index c4d59defa..6b971376a 100644 --- a/lib/sqlalchemy/orm/descriptor_props.py +++ b/lib/sqlalchemy/orm/descriptor_props.py @@ -253,7 +253,11 @@ class CompositeProperty(DescriptorProperty): if hist.has_changes(): has_history = True - added.extend(hist.non_deleted()) + non_deleted = hist.non_deleted() + if non_deleted: + added.extend(non_deleted) + else: + added.append(None) if hist.deleted: deleted.extend(hist.deleted) else: |