[Sqlalchemy-commits] [2458] sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py: better explicit PK
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [2458] sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py: better explicit PK insert checking
|
From: <co...@sq...> - 2007-03-28 22:33:07
|
<!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><meta http-equiv="content-type" content="text/html; charset=utf-8" /><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, #header, #footer { 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; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #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>[2458] sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py: better explicit PK insert checking</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2458</dd> <dt>Author</dt> <dd>ram</dd> <dt>Date</dt> <dd>2007-03-28 18:32:23 -0400 (Wed, 28 Mar 2007)</dd> </dl> <h3>Log Message</h3> <pre>better explicit PK insert checking</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesmssqlpy">sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemydatabasesmssqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py (2457 => 2458)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py 2007-03-28 19:13:03 UTC (rev 2457) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py 2007-03-28 22:32:23 UTC (rev 2458) </span><span class="lines">@@ -236,7 +236,7 @@ </span><span class="cx"> if getattr(compiled, "isinsert", False): </span><span class="cx"> tbl = compiled.statement.table </span><span class="cx"> if not hasattr(tbl, 'has_sequence'): </span><del>- tbl.has_sequence = False </del><ins>+ tbl.has_sequence = None </ins><span class="cx"> for column in tbl.c: </span><span class="cx"> if getattr(column, 'sequence', False) or self._has_implicit_sequence(column): </span><span class="cx"> tbl.has_sequence = column </span><span class="lines">@@ -245,9 +245,9 @@ </span><span class="cx"> self.HASIDENT = bool(tbl.has_sequence) </span><span class="cx"> if engine.dialect.auto_identity_insert and self.HASIDENT: </span><span class="cx"> if isinstance(parameters, list): </span><del>- self.IINSERT = hasattr(parameters[0], tbl.has_sequence.key) </del><ins>+ self.IINSERT = tbl.has_sequence.key in parameters[0] </ins><span class="cx"> else: </span><del>- self.IINSERT = hasattr(parameters, tbl.has_sequence.key) </del><ins>+ self.IINSERT = tbl.has_sequence.key in parameters </ins><span class="cx"> else: </span><span class="cx"> self.IINSERT = False </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |