[Sqlalchemy-commits] [1443] sqlalchemy/branches/schema/lib/sqlalchemy: redundant class_mapper/object
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1443] sqlalchemy/branches/schema/lib/sqlalchemy: redundant class_mapper/object_mapper declaration in __ALL__, fixes to tutorial assertions, added !=None support trans
<!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>[1443] sqlalchemy/branches/schema/lib/sqlalchemy: redundant class_mapper/object_mapper declaration in __ALL__, fixes to tutorial assertions, added !=None support trans</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1443</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-12 12:13:17 -0500 (Fri, 12 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>redundant class_mapper/object_mapper declaration in __ALL__, fixes to tutorial assertions, added !=None support trans late to "IS NOT NULL"</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemadocbuildcontenttutorialtxt">sqlalchemy/branches/schema/doc/build/content/tutorial.txt</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyorm__init__py">sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemysqlpy">sqlalchemy/branches/schema/lib/sqlalchemy/sql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemadocbuildcontenttutorialtxt"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/content/tutorial.txt (1442 => 1443)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/content/tutorial.txt 2006-05-12 17:11:46 UTC (rev 1442) +++ sqlalchemy/branches/schema/doc/build/content/tutorial.txt 2006-05-12 17:13:17 UTC (rev 1443) </span><span class="lines">@@ -132,11 +132,13 @@ </span><span class="cx"> >>> i.execute(user_name='Mary', password='secure') # doctest:+ELLIPSIS </span><span class="cx"> INSERT INTO users (user_name, password) VALUES (?, ?) </span><span class="cx"> ['Mary', 'secure'] </span><ins>+ COMMIT </ins><span class="cx"> <sqlalchemy.engine.base.ResultProxy instance at 0x...> </span><span class="cx"> </span><span class="cx"> >>> i.execute({'user_name':'Tom'}, {'user_name':'Fred'}, {'user_name':'Harry'}) # doctest:+ELLIPSIS,+NORMALIZE_WHITESPACE </span><span class="cx"> INSERT INTO users (user_name) VALUES (?) </span><span class="cx"> [['Tom'], ['Fred'], ['Harry']] </span><ins>+ COMMIT </ins><span class="cx"> <sqlalchemy.engine.base.ResultProxy instance at 0x...> </span><span class="cx"> </span><span class="cx"> </span><span class="lines">@@ -235,6 +237,7 @@ </span><span class="cx"> ... {'email_address':'ma...@ma...', 'user_id':1}) #doctest:+ELLIPSIS </span><span class="cx"> INSERT INTO email_addresses (email_address, user_id) VALUES (?, ?) </span><span class="cx"> [['to...@to...', 2], ['ma...@ma...', 1]] </span><ins>+ COMMIT </ins><span class="cx"> <sqlalchemy.engine.base.ResultProxy instance at 0x...> </span><span class="cx"> </span><span class="cx"> With two related tables, we can now construct a join amongst them using the `join` method: </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyorm__init__py"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py (1442 => 1443)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py 2006-05-12 17:11:46 UTC (rev 1442) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py 2006-05-12 17:13:17 UTC (rev 1443) </span><span class="lines">@@ -19,7 +19,7 @@ </span><span class="cx"> </span><span class="cx"> __all__ = ['relation', 'backref', 'eagerload', 'lazyload', 'noload', 'deferred', 'defer', 'undefer', </span><span class="cx"> 'mapper', 'clear_mappers', 'sql', 'extension', 'class_mapper', 'object_mapper', 'MapperExtension', 'Query', </span><del>- 'cascade_mappers', 'polymorphic_union', 'current_session', 'create_session', 'class_mapper', 'object_mapper' </del><ins>+ 'cascade_mappers', 'polymorphic_union', 'current_session', 'create_session', </ins><span class="cx"> ] </span><span class="cx"> </span><span class="cx"> def relation(*args, **kwargs): </span><span class="lines">@@ -46,10 +46,7 @@ </span><span class="cx"> return properties.DeferredColumnProperty(*columns, **kwargs) </span><span class="cx"> </span><span class="cx"> def mapper(class_, table=None, *args, **params): </span><del>- """returns a new or already cached Mapper object.""" - if table is None: - return class_mapper(class_) - </del><ins>+ """returns a newMapper object.""" </ins><span class="cx"> return Mapper(class_, table, *args, **params) </span><span class="cx"> </span><span class="cx"> def clear_mappers(): </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/sql.py (1442 => 1443)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-12 17:11:46 UTC (rev 1442) +++ sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-12 17:13:17 UTC (rev 1443) </span><span class="lines">@@ -561,9 +561,12 @@ </span><span class="cx"> def _compare(self, operator, obj): </span><span class="cx"> if _is_literal(obj): </span><span class="cx"> if obj is None: </span><del>- if operator != '=': - raise exceptions.ArgumentError("Only '=' operator can be used with NULL") - return BooleanExpression(self._compare_self(), null(), 'IS') </del><ins>+ 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") </ins><span class="cx"> else: </span><span class="cx"> obj = self._bind_param(obj) </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |
