[Sqlalchemy-commits] [1049] sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py: fixed exception
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1049] sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py: fixed exception import.
|
From: <co...@sq...> - 2006-02-26 19:09:52
|
<!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>[1049] sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py: fixed exception import.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1049</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-26 13:09:42 -0600 (Sun, 26 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>fixed exception import. check for objects being present in the identity map occurs not just at commit time but also when its logged as "dirty" or "deleted".</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingobjectstorepy">sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py (1048 => 1049)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py 2006-02-26 18:34:20 UTC (rev 1048) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py 2006-02-26 19:09:42 UTC (rev 1049) </span><span class="lines">@@ -13,6 +13,7 @@ </span><span class="cx"> import sqlalchemy </span><span class="cx"> import sqlalchemy.util as util </span><span class="cx"> import sqlalchemy.attributes as attributes </span><ins>+from sqlalchemy.exceptions import * </ins><span class="cx"> import topological </span><span class="cx"> import weakref </span><span class="cx"> import string </span><span class="lines">@@ -333,6 +334,12 @@ </span><span class="cx"> pass </span><span class="cx"> self.attributes.commit(obj) </span><span class="cx"> self.attributes.remove(obj) </span><ins>+ + def _validate_obj(self, obj): + """validates that dirty/delete/commit operations can occur upon the given object, by checking + if it has an instance key and that the instance key is present in the identity map.""" + if hasattr(obj, '_instance_key') and not self.identity_map.has_key(obj._instance_key): + raise InvalidRequestError("Detected a mapped object not present in the current thread's Identity Map: '%s'. Use objectstore.import_instance() to place deserialized instances or instances from other threads" % repr(obj._instance_key)) </ins><span class="cx"> </span><span class="cx"> def update(self, obj): </span><span class="cx"> """called to add an object to this UnitOfWork as though it were loaded from the DB, </span><span class="lines">@@ -365,6 +372,7 @@ </span><span class="cx"> self.new.append(obj) </span><span class="cx"> </span><span class="cx"> def register_dirty(self, obj): </span><ins>+ self._validate_obj(obj) </ins><span class="cx"> self.dirty.append(obj) </span><span class="cx"> </span><span class="cx"> def is_dirty(self, obj): </span><span class="lines">@@ -374,6 +382,7 @@ </span><span class="cx"> return True </span><span class="cx"> </span><span class="cx"> def register_deleted(self, obj): </span><ins>+ self._validate_obj(obj) </ins><span class="cx"> self.deleted.append(obj) </span><span class="cx"> mapper = object_mapper(obj) </span><span class="cx"> # TODO: should the cascading delete dependency thing </span><span class="lines">@@ -469,8 +478,7 @@ </span><span class="cx"> #print "REGISTER", repr(obj), repr(getattr(obj, '_instance_key', None)), str(isdelete), str(listonly) </span><span class="cx"> # things can get really confusing if theres duplicate instances floating around, </span><span class="cx"> # so make sure everything is OK </span><del>- if hasattr(obj, '_instance_key') and not self.uow.identity_map.has_key(obj._instance_key): - raise InvalidRequestError("Detected a mapped object not present in the current thread's Identity Map: '%s'. Use objectstore.import_instance() to place deserialized instances or instances from other threads" % repr(obj._instance_key)) </del><ins>+ self.uow._validate_obj(obj) </ins><span class="cx"> </span><span class="cx"> mapper = object_mapper(obj) </span><span class="cx"> self.mappers.append(mapper) </span></span></pre> </div> </div> </body> </html> |
