equal
deleted
inserted
replaced
539 if attr == 'eid': |
539 if attr == 'eid': |
540 eid_col = i |
540 eid_col = i |
541 else: |
541 else: |
542 attr_cols[attr] = i |
542 attr_cols[attr] = i |
543 else: |
543 else: |
544 rdef = eschema.rdef(attr, role) |
544 # XXX takefirst=True to remove warning triggered by ambiguous relations |
|
545 rdef = eschema.rdef(attr, role, takefirst=True) |
545 # only keep value if it can't be multivalued |
546 # only keep value if it can't be multivalued |
546 if rdef.role_cardinality(role) in '1?': |
547 if rdef.role_cardinality(role) in '1?': |
547 rel_cols[(attr, role)] = i |
548 rel_cols[(attr, role)] = i |
548 return eid_col, attr_cols, rel_cols |
549 return eid_col, attr_cols, rel_cols |
549 |
550 |