diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2009-09-24 02:11:56 +0000 |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2009-09-24 02:11:56 +0000 |
| commit | 5a9c1b8824bb84aaf8baccdfa2780a94af5c0f44 (patch) | |
| tree | abb0eed7f59567b73b0087d2f1e68c89254f7d2a /test/orm/inheritance/test_basic.py | |
| parent | 79ce8e89bd0537d26c8c3594557b2aa4c67f8f90 (diff) | |
| download | sqlalchemy-5a9c1b8824bb84aaf8baccdfa2780a94af5c0f44.tar.gz | |
merge from branches/clauseelement-nonzero
adds a __nonzero__ to _BinaryExpression to avoid faulty comparisons during hash
collisions (which only occur on Jython)
fixes #1547
Diffstat (limited to 'test/orm/inheritance/test_basic.py')
| -rw-r--r-- | test/orm/inheritance/test_basic.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py index 4f329a91d..a682d38cb 100644 --- a/test/orm/inheritance/test_basic.py +++ b/test/orm/inheritance/test_basic.py @@ -912,8 +912,8 @@ class OverrideColKeyTest(_base.MappedTest): # gets joined normally with the extra column. eq_( - class_mapper(Sub).get_property('id').columns, - [base.c.base_id, subtable.c.base_id] + set(class_mapper(Sub).get_property('id').columns), + set([base.c.base_id, subtable.c.base_id]) ) s1 = Sub() |