[Sqlalchemy-commits] [1495] sqlalchemy/branches/schema/doc/build/content: added after_delete mappere
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1495] sqlalchemy/branches/schema/doc/build/content: added after_delete mapperextension call
|
From: <co...@sq...> - 2006-05-24 16:16:57
|
<!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>[1495] sqlalchemy/branches/schema/doc/build/content: added after_delete mapperextension call</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1495</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-24 11:16:37 -0500 (Wed, 24 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>added after_delete mapperextension call</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemadocbuildcontentadv_datamappingtxt">sqlalchemy/branches/schema/doc/build/content/adv_datamapping.txt</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemadocbuildcontentadv_datamappingtxt"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/content/adv_datamapping.txt (1494 => 1495)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/content/adv_datamapping.txt 2006-05-24 02:22:42 UTC (rev 1494) +++ sqlalchemy/branches/schema/doc/build/content/adv_datamapping.txt 2006-05-24 16:16:37 UTC (rev 1495) </span><span class="lines">@@ -787,6 +787,8 @@ </span><span class="cx"> """called after an object instance has been INSERTed""" </span><span class="cx"> def before_delete(self, mapper, connection, instance): </span><span class="cx"> """called before an object instance is DELETEed""" </span><ins>+ def after_delete(self, mapper, connection, instance): + """called after an object instance is DELETEed""" </ins><span class="cx"> </span><span class="cx"> To use MapperExtension, make your own subclass of it and just send it off to a mapper: </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py (1494 => 1495)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-24 02:22:42 UTC (rev 1494) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-24 16:16:37 UTC (rev 1495) </span><span class="lines">@@ -680,6 +680,7 @@ </span><span class="cx"> if not self._has_pks(table): </span><span class="cx"> continue </span><span class="cx"> delete = [] </span><ins>+ deleted_objects = [] </ins><span class="cx"> for obj in objects: </span><span class="cx"> params = {} </span><span class="cx"> if not hasattr(obj, "_instance_key"): </span><span class="lines">@@ -691,6 +692,7 @@ </span><span class="cx"> if self.version_id_col is not None: </span><span class="cx"> params[self.version_id_col.key] = self._getattrbycolumn(obj, self.version_id_col) </span><span class="cx"> self.extension.before_delete(self, connection, obj) </span><ins>+ deleted_objects.append(obj) </ins><span class="cx"> if len(delete): </span><span class="cx"> clause = sql.and_() </span><span class="cx"> for col in self.pks_by_table[table]: </span><span class="lines">@@ -701,6 +703,8 @@ </span><span class="cx"> c = connection.execute(statement, delete) </span><span class="cx"> if c.supports_sane_rowcount() and c.rowcount != len(delete): </span><span class="cx"> raise exceptions.FlushError("ConcurrencyError - updated rowcount %d does not match number of objects updated %d" % (c.cursor.rowcount, len(delete))) </span><ins>+ for obj in deleted_objects: + self.extension.after_delete(self, connection, obj) </ins><span class="cx"> </span><span class="cx"> def _has_pks(self, table): </span><span class="cx"> try: </span><span class="lines">@@ -1076,6 +1080,10 @@ </span><span class="cx"> """called before an object instance is DELETEed""" </span><span class="cx"> if self.next is not None: </span><span class="cx"> self.next.before_delete(mapper, connection, instance) </span><ins>+ def after_delete(self, mapper, connection, instance): + """called after an object instance is DELETEed""" + if self.next is not None: + self.next.after_delete(mapper, connection, instance) </ins><span class="cx"> </span><span class="cx"> class TranslatingDict(dict): </span><span class="cx"> """a dictionary that stores ColumnElement objects as keys. incoming ColumnElement </span></span></pre> </div> </div> </body> </html> |
