[Sqlalchemy-commits] [1389] sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py: save_obj/delete_obj n
Brought to you by:
zzzeek
From: <co...@sq...> - 2006-05-04 20:27:28
|
<!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>[1389] sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py: save_obj/delete_obj need to specify column types to binds for primary key criterion</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1389</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-04 15:27:18 -0500 (Thu, 04 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>save_obj/delete_obj need to specify column types to binds for primary key criterion</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1388 => 1389)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-05-04 19:18:24 UTC (rev 1388) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-05-04 20:27:18 UTC (rev 1389) </span><span class="lines">@@ -580,9 +580,9 @@ </span><span class="cx"> if len(update): </span><span class="cx"> clause = sql.and_() </span><span class="cx"> for col in self.pks_by_table[table]: </span><del>- clause.clauses.append(col == sql.bindparam(col._label)) </del><ins>+ clause.clauses.append(col == sql.bindparam(col._label, type=col.type)) </ins><span class="cx"> if self.version_id_col is not None: </span><del>- clause.clauses.append(self.version_id_col == sql.bindparam(self.version_id_col._label)) </del><ins>+ clause.clauses.append(self.version_id_col == sql.bindparam(self.version_id_col._label, type=col.type)) </ins><span class="cx"> statement = table.update(clause) </span><span class="cx"> rows = 0 </span><span class="cx"> for rec in update: </span><span class="lines">@@ -654,9 +654,9 @@ </span><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><del>- clause.clauses.append(col == sql.bindparam(col.key)) </del><ins>+ clause.clauses.append(col == sql.bindparam(col.key, type=col.type)) </ins><span class="cx"> if self.version_id_col is not None: </span><del>- clause.clauses.append(self.version_id_col == sql.bindparam(self.version_id_col.key)) </del><ins>+ clause.clauses.append(self.version_id_col == sql.bindparam(self.version_id_col.key, type=self.version_id_col.type)) </ins><span class="cx"> statement = table.delete(clause) </span><span class="cx"> c = statement.execute(*delete) </span><span class="cx"> if c.supports_sane_rowcount() and c.rowcount != len(delete): </span></span></pre> </div> </div> </body> </html> |