equal
deleted
inserted
replaced
471 for rtype, rorder, value in self.rdefs: |
471 for rtype, rorder, value in self.rdefs: |
472 if value is _FROM_SUBSTEP: |
472 if value is _FROM_SUBSTEP: |
473 value = row[index] |
473 value = row[index] |
474 index += 1 |
474 index += 1 |
475 if rorder == InsertRelationsStep.FINAL: |
475 if rorder == InsertRelationsStep.FINAL: |
476 edef[rtype] = value |
476 edef.rql_set_value(rtype, value) |
477 elif rorder == InsertRelationsStep.RELATION: |
477 elif rorder == InsertRelationsStep.RELATION: |
478 self.plan.add_relation_def( (edef, rtype, value) ) |
478 self.plan.add_relation_def( (edef, rtype, value) ) |
479 edef.querier_pending_relations[(rtype, 'subject')] = value |
479 edef.querier_pending_relations[(rtype, 'subject')] = value |
480 else: |
480 else: |
481 self.plan.add_relation_def( (value, rtype, edef) ) |
481 self.plan.add_relation_def( (value, rtype, edef) ) |
562 eid = typed_eid(lhsval) |
562 eid = typed_eid(lhsval) |
563 try: |
563 try: |
564 edef = edefs[eid] |
564 edef = edefs[eid] |
565 except KeyError: |
565 except KeyError: |
566 edefs[eid] = edef = session.entity_from_eid(eid) |
566 edefs[eid] = edef = session.entity_from_eid(eid) |
567 edef[str(rschema)] = rhsval |
567 edef.rql_set_value(str(rschema), rhsval) |
568 else: |
568 else: |
569 repo.glob_add_relation(session, lhsval, str(rschema), rhsval) |
569 repo.glob_add_relation(session, lhsval, str(rschema), rhsval) |
570 result[i] = newrow |
570 result[i] = newrow |
571 # update entities |
571 # update entities |
572 for eid, edef in edefs.iteritems(): |
572 for eid, edef in edefs.iteritems(): |