[Sqlalchemy-commits] [1011] sqlalchemy/trunk/test: working on postupdate idea, refactoring to depend
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1011] sqlalchemy/trunk/test: working on postupdate idea, refactoring to dependency processing
|
From: <co...@sq...> - 2006-02-22 07:46:32
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[1011] sqlalchemy/trunk/test: working on postupdate idea, refactoring to dependency processing</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1011</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-20 20:57:38 -0600 (Mon, 20 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>working on postupdate idea, refactoring to dependency processing</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymapping__init__py">sqlalchemy/trunk/lib/sqlalchemy/mapping/__init__.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingobjectstorepy">sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemytrunktestcyclespy">sqlalchemy/trunk/test/cycles.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymapping__init__py"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/__init__.py (1010 => 1011)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/__init__.py 2006-02-20 19:45:08 UTC (rev 1010) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/__init__.py 2006-02-21 02:57:38 UTC (rev 1011) </span><span class="lines">@@ -88,23 +88,8 @@ </span><span class="cx"> name into a non-deferred (regular column) load. Used with mapper.options.""" </span><span class="cx"> return DeferredOption(name, defer=False) </span><span class="cx"> </span><del>-def object_mapper(object): - """given an object, returns the primary Mapper associated with the object - or the object's class.""" - return class_mapper(object.__class__) </del><span class="cx"> </span><del>-def class_mapper(class_): - """given a class, returns the primary Mapper associated with the class.""" - return mapper_registry[class_] - try: - return mapper_registry[class_] - except KeyError: - pass - except AttributeError: - pass - raise InvalidRequestError("Class '%s' has no mapper associated with it" % class_.__name__) </del><span class="cx"> </span><del>- </del><span class="cx"> def assign_mapper(class_, *args, **params): </span><span class="cx"> params.setdefault("is_primary", True) </span><span class="cx"> if not isinstance(getattr(class_, '__init__'), types.MethodType): </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1010 => 1011)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-02-20 19:45:08 UTC (rev 1010) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-02-21 02:57:38 UTC (rev 1011) </span><span class="lines">@@ -893,6 +893,22 @@ </span><span class="cx"> return obj.hash_key() </span><span class="cx"> else: </span><span class="cx"> return repr(obj) </span><ins>+ +def object_mapper(object): + """given an object, returns the primary Mapper associated with the object + or the object's class.""" + return class_mapper(object.__class__) + +def class_mapper(class_): + """given a class, returns the primary Mapper associated with the class.""" + return mapper_registry[class_] + try: + return mapper_registry[class_] + except KeyError: + pass + except AttributeError: + pass + raise InvalidRequestError("Class '%s' has no mapper associated with it" % class_.__name__) </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py (1010 => 1011)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py 2006-02-20 19:45:08 UTC (rev 1010) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py 2006-02-21 02:57:38 UTC (rev 1011) </span><span class="lines">@@ -454,8 +454,9 @@ </span><span class="cx"> self.dependencies = {} </span><span class="cx"> self.tasks = {} </span><span class="cx"> self.saved_histories = util.HashSet() </span><del>- - def register_object(self, obj, isdelete = False, listonly = False, **kwargs): </del><ins>+ self.__modified = False + + def register_object(self, obj, isdelete = False, listonly = False, postupdate=False, **kwargs): </ins><span class="cx"> """adds an object to this UOWTransaction to be updated in the database. </span><span class="cx"> </span><span class="cx"> 'isdelete' indicates whether the object is to be deleted or saved (update/inserted). </span><span class="lines">@@ -474,15 +475,19 @@ </span><span class="cx"> self.mappers.append(mapper) </span><span class="cx"> task = self.get_task_by_mapper(mapper) </span><span class="cx"> </span><ins>+ if postupdate: + mod = task.append_postupdate(obj) + self.__modified = self.__modified or mod + return + </ins><span class="cx"> # for a cyclical task, things need to be sorted out already, </span><span class="cx"> # so this object should have already been added to the appropriate sub-task </span><span class="cx"> # can put an assertion here to make sure.... </span><span class="cx"> if task.circular: </span><span class="cx"> return </span><span class="cx"> </span><del>- if obj not in task.objects: - self.__modified = True - task.append(obj, listonly, isdelete=isdelete, **kwargs) </del><ins>+ mod = task.append(obj, listonly, isdelete=isdelete, **kwargs) + self.__modified = self.__modified or mod </ins><span class="cx"> </span><span class="cx"> def unregister_object(self, obj): </span><span class="cx"> mapper = object_mapper(obj) </span><span class="lines">@@ -665,16 +670,24 @@ </span><span class="cx"> dependent operations at the per-object instead of per-task level. """ </span><span class="cx"> try: </span><span class="cx"> rec = self.objects[obj] </span><ins>+ retval = False </ins><span class="cx"> except KeyError: </span><span class="cx"> rec = UOWTaskElement(obj) </span><span class="cx"> self.objects[obj] = rec </span><ins>+ retval = True </ins><span class="cx"> if not listonly: </span><span class="cx"> rec.listonly = False </span><span class="cx"> if childtask: </span><span class="cx"> rec.childtasks.append(childtask) </span><span class="cx"> if isdelete: </span><span class="cx"> rec.isdelete = True </span><del>- </del><ins>+ return retval + + def append_postupdate(self, obj): + # postupdates are UPDATED immeditely (for now) + self.mapper.save_obj([obj], self.uowtransaction, postupdate=True) + return True + </ins><span class="cx"> def delete(self, obj): </span><span class="cx"> try: </span><span class="cx"> del self.objects[obj] </span><span class="lines">@@ -974,6 +987,9 @@ </span><span class="cx"> for child in self.childtasks: </span><span class="cx"> header(buf, _indent() + " |- Child tasks\n") </span><span class="cx"> child._dump(buf, indent + 1) </span><ins>+# for obj in self.postupdate: +# header(buf, _indent() + " |- Post Update objects\n") +# buf.write(_repr(obj) + "\n") </ins><span class="cx"> for element in self.todelete_elements(): </span><span class="cx"> for task in element.childtasks: </span><span class="cx"> header(buf, _indent() + " |- Delete subelements of UOWTaskElement(%s)\n" % id(element)) </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py (1010 => 1011)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-02-20 19:45:08 UTC (rev 1010) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-02-21 02:57:38 UTC (rev 1011) </span><span class="lines">@@ -358,14 +358,20 @@ </span><span class="cx"> uowcommit.register_processor(stub, self, self.parent, True) </span><span class="cx"> elif self.direction == PropertyLoader.ONETOMANY: </span><span class="cx"> if self.post_update: </span><del>- raise InvalidRequestError("post_update not yet supported with one-to-many relation") - uowcommit.register_dependency(self.parent, self.mapper) - uowcommit.register_processor(self.parent, self, self.parent, False) - uowcommit.register_processor(self.parent, self, self.parent, True) </del><ins>+ stub = PropertyLoader.MapperStub(self.mapper) + uowcommit.register_dependency(self.mapper, stub) + uowcommit.register_dependency(self.parent, stub) + uowcommit.register_processor(stub, self, self.parent, False) + uowcommit.register_processor(stub, self, self.parent, True) + else: + uowcommit.register_dependency(self.parent, self.mapper) + uowcommit.register_processor(self.parent, self, self.parent, False) + uowcommit.register_processor(self.parent, self, self.parent, True) </ins><span class="cx"> elif self.direction == PropertyLoader.MANYTOONE: </span><span class="cx"> if self.post_update: </span><span class="cx"> stub = PropertyLoader.MapperStub(self.mapper) </span><span class="cx"> uowcommit.register_dependency(self.mapper, stub) </span><ins>+ uowcommit.register_dependency(self.parent, stub) </ins><span class="cx"> uowcommit.register_processor(stub, self, self.parent, False) </span><span class="cx"> uowcommit.register_processor(stub, self, self.parent, True) </span><span class="cx"> else: </span><span class="lines">@@ -433,12 +439,12 @@ </span><span class="cx"> statement = self.secondary.insert() </span><span class="cx"> statement.execute(*secondary_insert) </span><span class="cx"> elif self.direction == PropertyLoader.MANYTOONE and delete: </span><del>- # head object is being deleted, and we manage a foreign key object. - # dont have to do anything to it. </del><span class="cx"> if self.post_update: </span><ins>+ # post_update means we have to update our row to not reference the child object + # before we can DELETE the row </ins><span class="cx"> for obj in deplist: </span><span class="cx"> self._synchronize(obj, None, None, True) </span><del>- task.mapper.save_obj([obj], uowcommit, postupdate=True) </del><ins>+ uowcommit.register_object(obj, postupdate=True) </ins><span class="cx"> elif self.direction == PropertyLoader.ONETOMANY and delete: </span><span class="cx"> # head object is being deleted, and we manage its list of child objects </span><span class="cx"> # the child objects have to have their foreign key to the parent set to NULL </span><span class="lines">@@ -450,7 +456,7 @@ </span><span class="cx"> childlist = getlist(obj, False) </span><span class="cx"> for child in childlist.deleted_items() + childlist.unchanged_items(): </span><span class="cx"> self._synchronize(obj, child, None, True) </span><del>- uowcommit.register_object(child) </del><ins>+ uowcommit.register_object(child, postupdate=self.post_update) </ins><span class="cx"> elif self.association is not None: </span><span class="cx"> # manage association objects. </span><span class="cx"> for obj in deplist: </span><span class="lines">@@ -488,21 +494,16 @@ </span><span class="cx"> #print "DELETE ASSOC OBJ", repr(child) </span><span class="cx"> uowcommit.register_object(child, isdelete=True) </span><span class="cx"> else: </span><del>- for obj in deplist: </del><ins>+ for obj in deplist: + childlist = getlist(obj, passive=True) + if childlist is not None: + for child in childlist.added_items(): + self._synchronize(obj, child, None, False) + if self.direction == PropertyLoader.ONETOMANY and child is not None: + uowcommit.register_object(child, postupdate=self.post_update) </ins><span class="cx"> if self.direction == PropertyLoader.MANYTOONE: </span><del>- uowcommit.register_object(obj) - childlist = getlist(obj, passive=True) - if childlist is None: continue - for child in childlist.added_items(): - self._synchronize(obj, child, None, False) - if self.direction == PropertyLoader.ONETOMANY and child is not None: - if self.post_update: - task.mapper.save_obj([child],uowcommit, postupdate=True) - else: - uowcommit.register_object(child) - if self.post_update: - task.mapper.save_obj([obj], uowcommit, postupdate=True) - if self.direction != PropertyLoader.MANYTOONE or len(childlist.added_items()) == 0: </del><ins>+ uowcommit.register_object(obj, postupdate=self.post_update) + if self.direction != PropertyLoader.MANYTOONE: </ins><span class="cx"> for child in childlist.deleted_items(): </span><span class="cx"> if not self.private: </span><span class="cx"> self._synchronize(obj, child, None, True) </span></span></pre></div> <a id="sqlalchemytrunktestcyclespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/cycles.py (1010 => 1011)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/cycles.py 2006-02-20 19:45:08 UTC (rev 1010) +++ sqlalchemy/trunk/test/cycles.py 2006-02-21 02:57:38 UTC (rev 1011) </span><span class="lines">@@ -238,8 +238,8 @@ </span><span class="cx"> </span><span class="cx"> Ball.mapper = mapper(Ball, ball) </span><span class="cx"> Person.mapper = mapper(Person, person, properties= dict( </span><del>- balls = relation(Ball.mapper, primaryjoin=ball.c.person_id==person.c.id, foreignkey=ball.c.person_id), - favorateBall = relation(Ball.mapper, primaryjoin=person.c.favoriteBall_id==ball.c.id, foreignkey=person.c.favoriteBall_id), </del><ins>+ balls = relation(Ball.mapper, primaryjoin=ball.c.person_id==person.c.id, foreignkey=ball.c.person_id, post_update=False, private=True), + favorateBall = relation(Ball.mapper, primaryjoin=person.c.favoriteBall_id==ball.c.id, foreignkey=person.c.favoriteBall_id, post_update=True), </ins><span class="cx"> ) </span><span class="cx"> ) </span><span class="cx"> </span><span class="lines">@@ -248,8 +248,14 @@ </span><span class="cx"> b = Ball() </span><span class="cx"> p = Person() </span><span class="cx"> p.balls.append(b) </span><ins>+ p.balls.append(Ball()) + p.balls.append(Ball()) + p.balls.append(Ball()) </ins><span class="cx"> p.favorateBall = b </span><span class="cx"> objectstore.commit() </span><ins>+ + objectstore.delete(p) + objectstore.commit() </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> if __name__ == "__main__": </span></span></pre> </div> </div> </body> </html> |
