Skip to content

Commit e592063

Browse files
committed
model: fix searching for Assoc. Set without NS
Adapted commit of FedorSelitsky <[email protected]> from PR #14 --- Tests by Jakub Filak <[email protected]>
1 parent 36cb45f commit e592063

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

pyodata/v2/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ def association_set_by_association(self, association_name, namespace=None):
729729
association_name, namespace))
730730
for decl in list(self._decls.values()):
731731
for association_set in list(decl.association_sets.values()):
732-
if association_set.association_type == association_name:
732+
if association_set.association_type.name == association_name:
733733
return association_set
734734
raise KeyError('Association set with association type {} does not exist'.format(association_name))
735735

tests/test_model_v2.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,14 @@ def test_edmx_associations(schema):
196196
assert association_set.association_type.name == 'toDataEntity'
197197
assert association_set.end_roles == {'DataValueHelp': 'ToRole_toDataEntity', 'MasterEntities': 'FromRole_toDataEntity'}
198198

199+
# with namespace
200+
association_set = schema.association_set_by_association('CustomerOrders', namespace='EXAMPLE_SRV_SETS')
201+
assert str(association_set) == 'AssociationSet(CustomerOrder_AssocSet)'
202+
203+
# without namespace
204+
association_set = schema.association_set_by_association('CustomerOrders')
205+
assert str(association_set) == 'AssociationSet(CustomerOrder_AssocSet)'
206+
199207

200208
def test_edmx_navigation_properties(schema):
201209
"""Test parsing of navigation properties"""

0 commit comments

Comments
 (0)