cubicweb: comparison server/repository.py

equal deleted inserted replaced

-:b8287e54b528
+:8bc6eac1fac1
 RepositoryError, typed_eid, onevent)
 from cubicweb import cwvreg, schema, server
 from cubicweb.server import utils, hook, pool, querier, sources
 from cubicweb.server.session import Session, InternalSession, InternalManager, \
 security_enabled
+from cubicweb.server.ssplanner import EditedEntity
 def del_existing_rel_if_needed(session, eidfrom, rtype, eidto):
 """delete existing relation when adding a new one if card is 1 or ?
 if isinstance(password, unicode):
 # password should *always* be utf8 encoded
 password = password.encode('UTF8')
 kwargs['login'] = login
 kwargs['upassword'] = password
-user.update(kwargs)
+self.glob_add_entity(session, EditedEntity(user, **kwargs))
-self.glob_add_entity(session, user)
 session.execute('SET X in_group G WHERE X eid %(x)s, G name "users"',
 {'x': user.eid})
 if email or '@' in login:
 d = {'login': login, 'email': email or login}
 if session.execute('EmailAddress X WHERE X address %(email)s', d,
 try:
 eid = self.system_source.create_eid(session)
 self._extid_cache[cachekey] = eid
 self._type_source_cache[eid] = (etype, source.uri, extid)
 entity = source.before_entity_insertion(session, extid, etype, eid)
-entity.edited_attributes = set(entity.cw_attr_cache)
 if source.should_call_hooks:
 self.hm.call_hooks('before_add_entity', session, entity=entity)
 # XXX call add_info with complete=False ?
 self.add_info(session, entity, source, extid)
 source.after_entity_insertion(session, extid, entity)
 extid = source.get_extid(entity)
 self._extid_cache[(str(extid), suri)] = entity.eid
 self._type_source_cache[entity.eid] = (entity.__regid__, suri, extid)
 return extid
-def glob_add_entity(self, session, entity):
+def glob_add_entity(self, session, edited):
 """add an entity to the repository
 the entity eid should originaly be None and a unique eid is assigned to
 the entity instance
 """
+entity = edited.entity
+entity._cw_is_saved = False # entity has an eid but is not yet saved
 # init edited_attributes before calling before_add_entity hooks
-entity._cw_is_saved = False # entity has an eid but is not yet saved
+entity.cw_edited = edited
-entity.edited_attributes = set(entity.cw_attr_cache) # XXX cw_edited_attributes
 eschema = entity.e_schema
 source = self.locate_etype_source(entity.__regid__)
 # allocate an eid to the entity before calling hooks
 entity.eid = self.system_source.create_eid(session)
 # set caches asap
 if server.DEBUG & server.DBG_REPO:
 print 'ADD entity', self, entity.__regid__, entity.eid, entity.cw_attr_cache
 relations = []
 if source.should_call_hooks:
 self.hm.call_hooks('before_add_entity', session, entity=entity)
-# XXX use entity.keys here since edited_attributes is not updated for
+for attr in edited.iterkeys():
-# inline relations XXX not true, right? (see edited_attributes
-# affectation above)
-for attr in entity.cw_attr_cache.iterkeys():
 rschema = eschema.subjrels[attr]
 if not rschema.final: # inlined relation
-relations.append((attr, entity[attr]))
+relations.append((attr, edited[attr]))
-entity._cw_set_defaults()
+edited.set_defaults()
 if session.is_hook_category_activated('integrity'):
-entity._cw_check(creation=True)
+edited.check(creation=True)
 source.add_entity(session, entity)
+edited.saved = True
 self.add_info(session, entity, source, extid, complete=False)
 entity._cw_is_saved = True # entity has an eid and is saved
 # prefill entity relation caches
 for rschema in eschema.subject_relations():
 rtype = str(rschema)
 if rtype in schema.VIRTUAL_RTYPES:
 continue
 if rschema.final:
-entity.setdefault(rtype, None)
+entity.cw_attr_cache.setdefault(rtype, None)
 else:
 entity.cw_set_relation_cache(rtype, 'subject',
 session.empty_rset())
 for rschema in eschema.object_relations():
 rtype = str(rschema)
 eidfrom=entity.eid, rtype=attr, eidto=value)
 self.hm.call_hooks('after_add_relation', session,
 eidfrom=entity.eid, rtype=attr, eidto=value)
 return entity.eid
-def glob_update_entity(self, session, entity, edited_attributes):
+def glob_update_entity(self, session, edited):
 """replace an entity in the repository
 the type and the eid of an entity must not be changed
 """
+entity = edited.entity
 if server.DEBUG & server.DBG_REPO:
 print 'UPDATE entity', entity.__regid__, entity.eid, \
-entity.cw_attr_cache, edited_attributes
+entity.cw_attr_cache, edited
 hm = self.hm
 eschema = entity.e_schema
 session.set_entity_cache(entity)
-orig_edited_attributes = getattr(entity, 'edited_attributes', None)
+orig_edited = getattr(entity, 'cw_edited', None)
-entity.edited_attributes = edited_attributes
+entity.cw_edited = edited
 try:
 only_inline_rels, need_fti_update = True, False
 relations = []
 source = self.source_from_eid(entity.eid, session)
-for attr in list(edited_attributes):
+for attr in list(edited):
 if attr == 'eid':
 continue
 rschema = eschema.subjrels[attr]
 if rschema.final:
 if getattr(eschema.rdef(attr), 'fulltextindexed', False):
 else:
 # inlined relation
 previous_value = entity.related(attr) or None
 if previous_value is not None:
 previous_value = previous_value[0][0] # got a result set
-if previous_value == entity[attr]:
+if previous_value == entity.cw_attr_cache[attr]:
 previous_value = None
 elif source.should_call_hooks:
 hm.call_hooks('before_delete_relation', session,
 eidfrom=entity.eid, rtype=attr,
 eidto=previous_value)
-relations.append((attr, entity[attr], previous_value))
+relations.append((attr, edited[attr], previous_value))
 if source.should_call_hooks:
 # call hooks for inlined relations
 for attr, value, _ in relations:
 hm.call_hooks('before_add_relation', session,
 eidfrom=entity.eid, rtype=attr, eidto=value)
 if not only_inline_rels:
 hm.call_hooks('before_update_entity', session, entity=entity)
 if session.is_hook_category_activated('integrity'):
-entity._cw_check()
+edited.check()
 source.update_entity(session, entity)
+edited.saved = True
 self.system_source.update_info(session, entity, need_fti_update)
 if source.should_call_hooks:
 if not only_inline_rels:
 hm.call_hooks('after_update_entity', session, entity=entity)
 for attr, value, prevvalue in relations:
 entity.cw_set_relation_cache(attr, 'subject',
 session.eid_rset(value))
 hm.call_hooks('after_add_relation', session,
 eidfrom=entity.eid, rtype=attr, eidto=value)
 finally:
-if orig_edited_attributes is not None:
+if orig_edited is not None:
-entity.edited_attributes = orig_edited_attributes
+entity.cw_edited = orig_edited
 def glob_delete_entity(self, session, eid):
 """delete an entity and all related entities from the repository"""
 entity = session.entity_from_eid(eid)
 etype, sourceuri, extid = self.type_and_source_from_eid(eid, session)

changeset 6142	8bc6eac1fac1
parent 6139	f76599a96238
child 6225	a176e68b7d0d