[Sqlalchemy-commits] [1497] sqlalchemy/trunk/lib/sqlalchemy: added explicit check for "==null()" to
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1497] sqlalchemy/trunk/lib/sqlalchemy: added explicit check for "==null()" to produce IS NULL, documnted "==None", "==null()", [ticket:187]
|
From: <co...@sq...> - 2006-05-24 16:35:46
|
<!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>[1497] sqlalchemy/trunk/lib/sqlalchemy: added explicit check for "==null()" to produce IS NULL, documnted "==None", "==null()", [ticket:187]</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1497</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-24 11:35:30 -0500 (Wed, 24 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>added explicit check for "==null()" to produce IS NULL, documnted "==None", "==null()", [ticket:187]</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkdocbuildcontentsqlconstructiontxt">sqlalchemy/trunk/doc/build/content/sqlconstruction.txt</a></li> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkdocbuildcontentsqlconstructiontxt"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/doc/build/content/sqlconstruction.txt (1496 => 1497)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/doc/build/content/sqlconstruction.txt 2006-05-24 16:30:56 UTC (rev 1496) +++ sqlalchemy/trunk/doc/build/content/sqlconstruction.txt 2006-05-24 16:35:30 UTC (rev 1497) </span><span class="lines">@@ -274,6 +274,18 @@ </span><span class="cx"> # any custom operator </span><span class="cx"> select([users.c.user_name.op('||')('_category')]) </span><span class="cx"> </span><ins>+ # "null" comparison via == (converts to IS) + {sql}users.select(users.c.user_name==None).execute() + SELECT users.user_id, users.user_name, users.password + FROM users + WHERE users.user_name IS NULL + + # or via explicit null() construct + {sql}users.select(users.c.user_name==null()).execute() + SELECT users.user_id, users.user_name, users.password + FROM users + WHERE users.user_name IS NULL + </ins><span class="cx"> #### Specifying the Engine {@name=engine} </span><span class="cx"> </span><span class="cx"> For queries that don't contain any tables, the SQLEngine can be specified to any constructed statement via the `engine` keyword parameter: </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1496 => 1497)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-05-24 16:30:56 UTC (rev 1496) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-05-24 16:35:30 UTC (rev 1497) </span><span class="lines">@@ -549,17 +549,16 @@ </span><span class="cx"> def _bind_param(self, obj): </span><span class="cx"> return BindParamClause('literal', obj, shortname=None, type=self.type) </span><span class="cx"> def _compare(self, operator, obj): </span><del>- if _is_literal(obj): - if obj is None: - if operator == '=': - return BooleanExpression(self._compare_self(), null(), 'IS') - elif operator == '!=': - return BooleanExpression(self._compare_self(), null(), 'IS NOT') - else: - raise exceptions.ArgumentError("Only '='/'!=' operators can be used with NULL") </del><ins>+ if obj is None or isinstance(obj, Null): + if operator == '=': </ins><span class="cx"> return BooleanExpression(self._compare_self(), null(), 'IS') </span><ins>+ elif operator == '!=': + return BooleanExpression(self._compare_self(), null(), 'IS NOT') + return BooleanExpression(self._compare_self(), null(), 'IS') </ins><span class="cx"> else: </span><del>- obj = self._bind_param(obj) </del><ins>+ raise exceptions.ArgumentError("Only '='/'!=' operators can be used with NULL") + elif _is_literal(obj): + obj = self._bind_param(obj) </ins><span class="cx"> return BooleanExpression(self._compare_self(), obj, operator, type=self._compare_type(obj)) </span><span class="cx"> def _operate(self, operator, obj): </span><span class="cx"> if _is_literal(obj): </span></span></pre> </div> </div> </body> </html> |
