[Sqlalchemy-commits] [1096] sqlalchemy/trunk/test: got mapper to receive the onupdates after updatin
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1096] sqlalchemy/trunk/test: got mapper to receive the onupdates after updating an instance (also properly receives defaults on inserts)...
|
From: <co...@sq...> - 2006-03-05 21:01:34
|
<!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>[1096] sqlalchemy/trunk/test: got mapper to receive the onupdates after updating an instance (also properly receives defaults on inserts)...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1096</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-05 15:01:21 -0600 (Sun, 05 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>got mapper to receive the onupdates after updating an instance (also properly receives defaults on inserts)...</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyenginepy">sqlalchemy/trunk/lib/sqlalchemy/engine.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> <li><a href="#sqlalchemytrunktestobjectstorepy">sqlalchemy/trunk/test/objectstore.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyenginepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/engine.py (1095 => 1096)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/engine.py 2006-03-05 20:31:44 UTC (rev 1095) +++ sqlalchemy/trunk/lib/sqlalchemy/engine.py 2006-03-05 21:01:21 UTC (rev 1096) </span><span class="lines">@@ -484,20 +484,33 @@ </span><span class="cx"> self.context.last_inserted_ids = None </span><span class="cx"> else: </span><span class="cx"> self.context.last_inserted_ids = last_inserted_ids </span><ins>+ self.context.last_inserted_params = param </ins><span class="cx"> elif getattr(compiled, 'isupdate', False): </span><span class="cx"> if isinstance(parameters, list): </span><span class="cx"> plist = parameters </span><span class="cx"> else: </span><span class="cx"> plist = [parameters] </span><span class="cx"> drunner = self.defaultrunner(proxy) </span><ins>+ self.context.lastrow_has_defaults = False </ins><span class="cx"> for param in plist: </span><span class="cx"> for c in compiled.statement.table.c: </span><span class="cx"> if c.onupdate is not None and (not param.has_key(c.name) or param[c.name] is None): </span><span class="cx"> value = drunner.get_column_onupdate(c) </span><span class="cx"> if value is not None: </span><span class="cx"> param[c.name] = value </span><del>- </del><ins>+ self.context.last_updated_params = param + + def last_inserted_params(self): + """returns a dictionary of the full parameter dictionary for the last compiled INSERT statement, + including any ColumnDefaults or Sequences that were pre-executed. this value is thread-local.""" + return self.context.last_inserted_params + def last_updated_params(self): + """returns a dictionary of the full parameter dictionary for the last compiled UPDATE statement, + including any ColumnDefaults that were pre-executed. this value is thread-local.""" + return self.context.last_updated_params </ins><span class="cx"> def lastrow_has_defaults(self): </span><ins>+ """returns True if the last row INSERTED via a compiled insert statement contained PassiveDefaults, + indicating that the database inserted data beyond that which we gave it. this value is thread-local.""" </ins><span class="cx"> return self.context.lastrow_has_defaults </span><span class="cx"> </span><span class="cx"> def pre_exec(self, proxy, compiled, parameters, **kwargs): </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1095 => 1096)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-05 20:31:44 UTC (rev 1095) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-05 21:01:21 UTC (rev 1096) </span><span class="lines">@@ -591,6 +591,7 @@ </span><span class="cx"> for rec in update: </span><span class="cx"> (obj, params) = rec </span><span class="cx"> c = statement.execute(params) </span><ins>+ self._postfetch(table, obj, table.engine.last_updated_params()) </ins><span class="cx"> self.extension.after_update(self, obj) </span><span class="cx"> rows += c.cursor.rowcount </span><span class="cx"> if table.engine.supports_sane_rowcount() and rows != len(update): </span><span class="lines">@@ -608,18 +609,30 @@ </span><span class="cx"> if self._getattrbycolumn(obj, col) is None: </span><span class="cx"> self._setattrbycolumn(obj, col, primary_key[i]) </span><span class="cx"> i+=1 </span><del>- if table.engine.lastrow_has_defaults(): - clause = sql.and_() - for p in self.pks_by_table[table]: - clause.clauses.append(p == self._getattrbycolumn(obj, p)) - row = table.select(clause).execute().fetchone() - for c in table.c: - if self._getattrbycolumn(obj, c) is None: - self._setattrbycolumn(obj, c, row[c]) </del><ins>+ self._postfetch(table, obj, table.engine.last_inserted_params()) </ins><span class="cx"> if self._synchronizer is not None: </span><span class="cx"> self._synchronizer.execute(obj, obj) </span><span class="cx"> self.extension.after_insert(self, obj) </span><del>- </del><ins>+ + def _postfetch(self, table, obj, params): + """after an INSERT or UPDATE, asks the engine if PassiveDefaults fired off on the database side + which need to be post-fetched, *or* if pre-exec defaults like ColumnDefaults were fired off + and should be populated into the instance. this is only for non-primary key columns.""" + if table.engine.lastrow_has_defaults(): + clause = sql.and_() + for p in self.pks_by_table[table]: + clause.clauses.append(p == self._getattrbycolumn(obj, p)) + row = table.select(clause).execute().fetchone() + for c in table.c: + if self._getattrbycolumn(obj, c) is None: + self._setattrbycolumn(obj, c, row[c]) + else: + for c in table.c: + if c.primary_key or not params.has_key(c.name): + continue + if self._getattrbycolumn(obj, c) != params[c.name]: + self._setattrbycolumn(obj, c, params[c.name]) + </ins><span class="cx"> def delete_obj(self, objects, uow): </span><span class="cx"> """called by a UnitOfWork object to delete objects, which involves a </span><span class="cx"> DELETE statement for each table used by this mapper, for each object in the list.""" </span></span></pre></div> <a id="sqlalchemytrunktestobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/objectstore.py (1095 => 1096)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/objectstore.py 2006-03-05 20:31:44 UTC (rev 1095) +++ sqlalchemy/trunk/test/objectstore.py 2006-03-05 21:01:21 UTC (rev 1096) </span><span class="lines">@@ -229,11 +229,13 @@ </span><span class="cx"> Column('id', Integer, Sequence("dt_seq", optional=True), primary_key=True), </span><span class="cx"> Column('hoho', hohotype, PassiveDefault(str(self.hohoval))), </span><span class="cx"> Column('counter', Integer, PassiveDefault("7")), </span><del>- Column('foober', String(30), default="im foober") </del><ins>+ Column('foober', String(30), default="im foober", onupdate="im the update") </ins><span class="cx"> ) </span><span class="cx"> self.table.create() </span><span class="cx"> def tearDownAll(self): </span><span class="cx"> self.table.drop() </span><ins>+ def setUp(self): + self.table = Table('default_test', db) </ins><span class="cx"> def testbasic(self): </span><span class="cx"> </span><span class="cx"> class Hoho(object):pass </span><span class="lines">@@ -261,7 +263,17 @@ </span><span class="cx"> self.assert_(h1.counter == h4.counter==h5.counter==7) </span><span class="cx"> self.assert_(h2.foober == h3.foober == h4.foober == 'im foober') </span><span class="cx"> self.assert_(h5.foober=='im the new foober') </span><del>- </del><ins>+ + def testupdate(self): + class Hoho(object):pass + assign_mapper(Hoho, self.table) + h1 = Hoho() + objectstore.commit() + self.assert_(h1.foober == 'im foober') + h1.counter = 19 + objectstore.commit() + self.assert_(h1.foober == 'im the update') + </ins><span class="cx"> class SaveTest(AssertMixin): </span><span class="cx"> </span><span class="cx"> def setUpAll(self): </span></span></pre> </div> </div> </body> </html> |
