[Sqlalchemy-commits] [1292] sqlalchemy/branches/schema/test: dev, mods work through straight import
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1292] sqlalchemy/branches/schema/test: dev, mods work through straight import now
|
From: <co...@sq...> - 2006-04-19 02:00:29
|
<!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>[1292] sqlalchemy/branches/schema/test: dev, mods work through straight import now</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1292</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-18 21:00:16 -0500 (Tue, 18 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>dev, mods work through straight import now</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemy__init__py">sqlalchemy/branches/schema/lib/sqlalchemy/__init__.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemymods__init__py">sqlalchemy/branches/schema/lib/sqlalchemy/mods/__init__.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemymodslegacy_sessionpy">sqlalchemy/branches/schema/lib/sqlalchemy/mods/legacy_session.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemymodsselectresultspy">sqlalchemy/branches/schema/lib/sqlalchemy/mods/selectresults.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemymodsthreadlocalpy">sqlalchemy/branches/schema/lib/sqlalchemy/mods/threadlocal.py</a></li> <li><a href="#sqlalchemybranchesschematestcyclespy">sqlalchemy/branches/schema/test/cycles.py</a></li> <li><a href="#sqlalchemybranchesschematestobjectstorepy">sqlalchemy/branches/schema/test/objectstore.py</a></li> <li><a href="#sqlalchemybranchesschematesttestbasepy">sqlalchemy/branches/schema/test/testbase.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemy__init__py"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/__init__.py (1291 => 1292)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/__init__.py 2006-04-19 01:32:30 UTC (rev 1291) +++ sqlalchemy/branches/schema/lib/sqlalchemy/__init__.py 2006-04-19 02:00:16 UTC (rev 1292) </span><span class="lines">@@ -18,9 +18,7 @@ </span><span class="cx"> </span><span class="cx"> create_engine = sqlalchemy.engine.create_engine </span><span class="cx"> </span><del>-from sqlalchemy.mods import install_mods </del><span class="cx"> </span><del>- </del><span class="cx"> def global_connect(*args, **kwargs): </span><span class="cx"> sqlalchemy.schema.default_metadata.connect(*args, **kwargs) </span><span class="cx"> </span><span class="cx">\ No newline at end of file </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemymods__init__py"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mods/__init__.py (1291 => 1292)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mods/__init__.py 2006-04-19 01:32:30 UTC (rev 1291) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mods/__init__.py 2006-04-19 02:00:16 UTC (rev 1292) </span><span class="lines">@@ -1,15 +0,0 @@ </span><del>-import sets - -def install_mods(*mods): - for mod in mods: - if isinstance(mod, str): - _mod = getattr(__import__('sqlalchemy.mods.%s' % mod).mods, mod) - if _mod not in installed_mods: - _mod.install_plugin() - installed_mods.add(_mod) - else: - if mod not in installed_mods: - mod.install_plugin() - installed_mods.add(mod) - -installed_mods = sets.Set() </del><span class="cx">\ No newline at end of file </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemymodslegacy_sessionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mods/legacy_session.py (1291 => 1292)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mods/legacy_session.py 2006-04-19 01:32:30 UTC (rev 1291) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mods/legacy_session.py 2006-04-19 02:00:16 UTC (rev 1292) </span><span class="lines">@@ -4,7 +4,7 @@ </span><span class="cx"> import sqlalchemy.util as util </span><span class="cx"> import sqlalchemy </span><span class="cx"> </span><del>-sqlalchemy.install_mods('threadlocal') </del><ins>+import sqlalchemy.mods.threadlocal </ins><span class="cx"> </span><span class="cx"> class LegacySession(objectstore.Session): </span><span class="cx"> def __init__(self, nest_on=None, hash_key=None, **kwargs): </span><span class="lines">@@ -135,4 +135,5 @@ </span><span class="cx"> objectstore.uow = uow </span><span class="cx"> objectstore.push_session = push_session </span><span class="cx"> objectstore.pop_session = pop_session </span><del>- objectstore.using_session = using_session </del><span class="cx">\ No newline at end of file </span><ins>+ objectstore.using_session = using_session +install_plugin() </ins></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemymodsselectresultspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mods/selectresults.py (1291 => 1292)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mods/selectresults.py 2006-04-19 01:32:30 UTC (rev 1291) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mods/selectresults.py 2006-04-19 02:00:16 UTC (rev 1292) </span><span class="lines">@@ -2,8 +2,6 @@ </span><span class="cx"> </span><span class="cx"> import sqlalchemy.mapping as mapping </span><span class="cx"> </span><del>-def install_plugin(): - mapping.global_extensions.append(SelectResultsExt) </del><span class="cx"> </span><span class="cx"> class SelectResultsExt(mapping.MapperExtension): </span><span class="cx"> def select_by(self, query, *args, **params): </span><span class="lines">@@ -84,3 +82,7 @@ </span><span class="cx"> </span><span class="cx"> def __iter__(self): </span><span class="cx"> return iter(self._query.select_whereclause(self._clause, **self._ops)) </span><ins>+ +def install_plugin(): + mapping.global_extensions.append(SelectResultsExt) +install_plugin() </ins></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemymodsthreadlocalpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mods/threadlocal.py (1291 => 1292)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mods/threadlocal.py 2006-04-19 01:32:30 UTC (rev 1291) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mods/threadlocal.py 2006-04-19 02:00:16 UTC (rev 1292) </span><span class="lines">@@ -101,4 +101,5 @@ </span><span class="cx"> setattr(objectstore, name, getattr(mod, name)) </span><span class="cx"> </span><span class="cx"> objectstore.session_registry = util.ScopedRegistry(objectstore.Session) # Default session registry </span><del>- engine.default_strategy = 'threadlocal' </del><span class="cx">\ No newline at end of file </span><ins>+ engine.default_strategy = 'threadlocal' +install_plugin() </ins></span></pre></div> <a id="sqlalchemybranchesschematestcyclespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/cycles.py (1291 => 1292)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/cycles.py 2006-04-19 01:32:30 UTC (rev 1291) +++ sqlalchemy/branches/schema/test/cycles.py 2006-04-19 02:00:16 UTC (rev 1292) </span><span class="lines">@@ -283,50 +283,50 @@ </span><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (person_id) VALUES (:person_id)", </span><del>- lambda:{'person_id':p.id} </del><ins>+ lambda ctx:{'person_id':p.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (person_id) VALUES (:person_id)", </span><del>- lambda:{'person_id':p.id} </del><ins>+ lambda ctx:{'person_id':p.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (person_id) VALUES (:person_id)", </span><del>- lambda:{'person_id':p.id} </del><ins>+ lambda ctx:{'person_id':p.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (person_id) VALUES (:person_id)", </span><del>- lambda:{'person_id':p.id} </del><ins>+ lambda ctx:{'person_id':p.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE person SET favoriteBall_id=:favoriteBall_id WHERE person.id = :person_id", </span><del>- lambda:{'favoriteBall_id':p.favorateBall.id,'person_id':p.id} </del><ins>+ lambda ctx:{'favoriteBall_id':p.favorateBall.id,'person_id':p.id} </ins><span class="cx"> ) </span><span class="cx"> ], </span><span class="cx"> with_sequences= [ </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO person (id, favoriteBall_id) VALUES (:id, :favoriteBall_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0], 'favoriteBall_id': None} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0], 'favoriteBall_id': None} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (id, person_id) VALUES (:id, :person_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0],'person_id':p.id} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0],'person_id':p.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (id, person_id) VALUES (:id, :person_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0],'person_id':p.id} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0],'person_id':p.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (id, person_id) VALUES (:id, :person_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0],'person_id':p.id} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0],'person_id':p.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (id, person_id) VALUES (:id, :person_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0],'person_id':p.id} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0],'person_id':p.id} </ins><span class="cx"> ), </span><span class="cx"> # heres the post update </span><span class="cx"> ( </span><span class="cx"> "UPDATE person SET favoriteBall_id=:favoriteBall_id WHERE person.id = :person_id", </span><del>- lambda:{'favoriteBall_id':p.favorateBall.id,'person_id':p.id} </del><ins>+ lambda ctx:{'favoriteBall_id':p.favorateBall.id,'person_id':p.id} </ins><span class="cx"> ) </span><span class="cx"> ]) </span><span class="cx"> objectstore.delete(p) </span><span class="lines">@@ -334,17 +334,17 @@ </span><span class="cx"> # heres the post update (which is a pre-update with deletes) </span><span class="cx"> ( </span><span class="cx"> "UPDATE person SET favoriteBall_id=:favoriteBall_id WHERE person.id = :person_id", </span><del>- lambda:{'person_id': p.id, 'favoriteBall_id': None} </del><ins>+ lambda ctx:{'person_id': p.id, 'favoriteBall_id': None} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "DELETE FROM ball WHERE ball.id = :id", </span><span class="cx"> None </span><span class="cx"> # order cant be predicted, but something like: </span><del>- #lambda:[{'id': 1L}, {'id': 4L}, {'id': 3L}, {'id': 2L}] </del><ins>+ #lambda ctx:[{'id': 1L}, {'id': 4L}, {'id': 3L}, {'id': 2L}] </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "DELETE FROM person WHERE person.id = :id", </span><del>- lambda:[{'id': p.id}] </del><ins>+ lambda ctx:[{'id': p.id}] </ins><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> </span><span class="lines">@@ -396,62 +396,62 @@ </span><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO person (favoriteBall_id) VALUES (:favoriteBall_id)", </span><del>- lambda:{'favoriteBall_id':b.id} </del><ins>+ lambda ctx:{'favoriteBall_id':b.id} </ins><span class="cx"> ), </span><span class="cx"> # heres the post update on each one-to-many item </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id':p.id,'ball_id':b.id} </del><ins>+ lambda ctx:{'person_id':p.id,'ball_id':b.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id':p.id,'ball_id':b2.id} </del><ins>+ lambda ctx:{'person_id':p.id,'ball_id':b2.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id':p.id,'ball_id':b3.id} </del><ins>+ lambda ctx:{'person_id':p.id,'ball_id':b3.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id':p.id,'ball_id':b4.id} </del><ins>+ lambda ctx:{'person_id':p.id,'ball_id':b4.id} </ins><span class="cx"> ), </span><span class="cx"> ], </span><span class="cx"> with_sequences=[ </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (id, person_id) VALUES (:id, :person_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0], 'person_id':None} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0], 'person_id':None} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (id, person_id) VALUES (:id, :person_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0], 'person_id':None} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0], 'person_id':None} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (id, person_id) VALUES (:id, :person_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0], 'person_id':None} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0], 'person_id':None} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO ball (id, person_id) VALUES (:id, :person_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0], 'person_id':None} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0], 'person_id':None} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO person (id, favoriteBall_id) VALUES (:id, :favoriteBall_id)", </span><del>- lambda:{'id':db.last_inserted_ids()[0], 'favoriteBall_id':b.id} </del><ins>+ lambda ctx:{'id':ctx.last_inserted_ids()[0], 'favoriteBall_id':b.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id':p.id,'ball_id':b.id} </del><ins>+ lambda ctx:{'person_id':p.id,'ball_id':b.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id':p.id,'ball_id':b2.id} </del><ins>+ lambda ctx:{'person_id':p.id,'ball_id':b2.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id':p.id,'ball_id':b3.id} </del><ins>+ lambda ctx:{'person_id':p.id,'ball_id':b3.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id':p.id,'ball_id':b4.id} </del><ins>+ lambda ctx:{'person_id':p.id,'ball_id':b4.id} </ins><span class="cx"> ), </span><span class="cx"> ]) </span><span class="cx"> </span><span class="lines">@@ -459,29 +459,29 @@ </span><span class="cx"> self.assert_sql(db, lambda: objectstore.get_session().flush(), [ </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id': None, 'ball_id': b.id} </del><ins>+ lambda ctx:{'person_id': None, 'ball_id': b.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id': None, 'ball_id': b2.id} </del><ins>+ lambda ctx:{'person_id': None, 'ball_id': b2.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id': None, 'ball_id': b3.id} </del><ins>+ lambda ctx:{'person_id': None, 'ball_id': b3.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "UPDATE ball SET person_id=:person_id WHERE ball.id = :ball_id", </span><del>- lambda:{'person_id': None, 'ball_id': b4.id} </del><ins>+ lambda ctx:{'person_id': None, 'ball_id': b4.id} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "DELETE FROM person WHERE person.id = :id", </span><del>- lambda:[{'id':p.id}] </del><ins>+ lambda ctx:[{'id':p.id}] </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "DELETE FROM ball WHERE ball.id = :id", </span><span class="cx"> None </span><span class="cx"> # the order of deletion is not predictable, but its roughly: </span><del>- # lambda:[{'id': b.id}, {'id': b2.id}, {'id': b3.id}, {'id': b4.id}] </del><ins>+ # lambda ctx:[{'id': b.id}, {'id': b2.id}, {'id': b3.id}, {'id': b4.id}] </ins><span class="cx"> ) </span><span class="cx"> ]) </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesschematestobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/objectstore.py (1291 => 1292)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/objectstore.py 2006-04-19 01:32:30 UTC (rev 1291) +++ sqlalchemy/branches/schema/test/objectstore.py 2006-04-19 02:00:16 UTC (rev 1292) </span><span class="lines">@@ -666,26 +666,26 @@ </span><span class="cx"> ), </span><span class="cx"> { </span><span class="cx"> "UPDATE email_addresses SET email_address=:email_address WHERE email_addresses.address_id = :email_addresses_address_id": </span><del>- lambda: {'email_address': 'im...@fo...r', 'email_addresses_address_id': objects[2].address_id} </del><ins>+ lambda ctx: {'email_address': 'im...@fo...r', 'email_addresses_address_id': objects[2].address_id} </ins><span class="cx"> , </span><span class="cx"> </span><span class="cx"> "UPDATE email_addresses SET user_id=:user_id WHERE email_addresses.address_id = :email_addresses_address_id": </span><del>- lambda: {'user_id': objects[3].user.user_id, 'email_addresses_address_id': objects[3].address_id} </del><ins>+ lambda ctx: {'user_id': objects[3].user.user_id, 'email_addresses_address_id': objects[3].address_id} </ins><span class="cx"> }, </span><span class="cx"> </span><span class="cx"> ], </span><span class="cx"> with_sequences=[ </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO users (user_id, user_name) VALUES (:user_id, :user_name)", </span><del>- lambda:{'user_name': 'imnewlyadded', 'user_id':db.last_inserted_ids()[0]} </del><ins>+ lambda ctx:{'user_name': 'imnewlyadded', 'user_id':ctx.last_inserted_ids()[0]} </ins><span class="cx"> ), </span><span class="cx"> { </span><span class="cx"> "UPDATE email_addresses SET email_address=:email_address WHERE email_addresses.address_id = :email_addresses_address_id": </span><del>- lambda: {'email_address': 'im...@fo...r', 'email_addresses_address_id': objects[2].address_id} </del><ins>+ lambda ctx: {'email_address': 'im...@fo...r', 'email_addresses_address_id': objects[2].address_id} </ins><span class="cx"> , </span><span class="cx"> </span><span class="cx"> "UPDATE email_addresses SET user_id=:user_id WHERE email_addresses.address_id = :email_addresses_address_id": </span><del>- lambda: {'user_id': objects[3].user.user_id, 'email_addresses_address_id': objects[3].address_id} </del><ins>+ lambda ctx: {'user_id': objects[3].user.user_id, 'email_addresses_address_id': objects[3].address_id} </ins><span class="cx"> }, </span><span class="cx"> </span><span class="cx"> ]) </span><span class="lines">@@ -762,7 +762,7 @@ </span><span class="cx"> with_sequences=[ </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO email_addresses (address_id, user_id, email_address) VALUES (:address_id, :user_id, :email_address)", </span><del>- lambda:{'email_address': 'hi', 'user_id': 7, 'address_id':db.last_inserted_ids()[0]} </del><ins>+ lambda ctx:{'email_address': 'hi', 'user_id': 7, 'address_id':ctx.last_inserted_ids()[0]} </ins><span class="cx"> ), </span><span class="cx"> ] </span><span class="cx"> ) </span><span class="lines">@@ -924,20 +924,20 @@ </span><span class="cx"> {'name': 'yellow'} </span><span class="cx"> }, </span><span class="cx"> ("INSERT INTO itemkeywords (item_id, keyword_id) VALUES (:item_id, :keyword_id)", </span><del>- lambda: [{'item_id': objects[5].item_id, 'keyword_id': k.keyword_id}] </del><ins>+ lambda ctx: [{'item_id': objects[5].item_id, 'keyword_id': k.keyword_id}] </ins><span class="cx"> ) </span><span class="cx"> ], </span><span class="cx"> </span><span class="cx"> with_sequences = [ </span><span class="cx"> { </span><span class="cx"> "UPDATE items SET item_name=:item_name WHERE items.item_id = :items_item_id": </span><del>- [{'item_name': 'item4updated', 'items_item_id': objects[4].item_id}] </del><ins>+ {'item_name': 'item4updated', 'items_item_id': objects[4].item_id} </ins><span class="cx"> , </span><span class="cx"> "INSERT INTO keywords (keyword_id, name) VALUES (:keyword_id, :name)": </span><del>- lambda: {'name': 'yellow', 'keyword_id':db.last_inserted_ids()[0]} </del><ins>+ lambda ctx: {'name': 'yellow', 'keyword_id':ctx.last_inserted_ids()[0]} </ins><span class="cx"> }, </span><span class="cx"> ("INSERT INTO itemkeywords (item_id, keyword_id) VALUES (:item_id, :keyword_id)", </span><del>- lambda: [{'item_id': objects[5].item_id, 'keyword_id': k.keyword_id}] </del><ins>+ lambda ctx: [{'item_id': objects[5].item_id, 'keyword_id': k.keyword_id}] </ins><span class="cx"> ) </span><span class="cx"> ] </span><span class="cx"> ) </span><span class="lines">@@ -951,7 +951,7 @@ </span><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO itemkeywords (item_id, keyword_id) VALUES (:item_id, :keyword_id)", </span><del>- lambda: [{'item_id': objects[2].item_id, 'keyword_id': k.keyword_id}] </del><ins>+ lambda ctx: [{'item_id': objects[2].item_id, 'keyword_id': k.keyword_id}] </ins><span class="cx"> ) </span><span class="cx"> ]) </span><span class="cx"> </span><span class="lines">@@ -1138,19 +1138,19 @@ </span><span class="cx"> with_sequences = [ </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO users (user_id, user_name) VALUES (:user_id, :user_name)", </span><del>- lambda: {'user_name': 'thesub', 'user_id':db.last_inserted_ids()[0]} </del><ins>+ lambda ctx: {'user_name': 'thesub', 'user_id':ctx.last_inserted_ids()[0]} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO users (user_id, user_name) VALUES (:user_id, :user_name)", </span><del>- lambda: {'user_name': 'assdkfj', 'user_id':db.last_inserted_ids()[0]} </del><ins>+ lambda ctx: {'user_name': 'assdkfj', 'user_id':ctx.last_inserted_ids()[0]} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO email_addresses (address_id, rel_user_id, email_address) VALUES (:address_id, :rel_user_id, :email_address)", </span><del>- lambda:{'rel_user_id': 1, 'email_address': 'ba...@fo...', 'address_id':db.last_inserted_ids()[0]} </del><ins>+ lambda ctx:{'rel_user_id': 1, 'email_address': 'ba...@fo...', 'address_id':ctx.last_inserted_ids()[0]} </ins><span class="cx"> ), </span><span class="cx"> ( </span><span class="cx"> "INSERT INTO email_addresses (address_id, rel_user_id, email_address) VALUES (:address_id, :rel_user_id, :email_address)", </span><del>- lambda:{'rel_user_id': 2, 'email_address': 'th...@as...', 'address_id':db.last_inserted_ids()[0]} </del><ins>+ lambda ctx:{'rel_user_id': 2, 'email_address': 'th...@as...', 'address_id':ctx.last_inserted_ids()[0]} </ins><span class="cx"> ) </span><span class="cx"> ] </span><span class="cx"> ) </span></span></pre></div> <a id="sqlalchemybranchesschematesttestbasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/testbase.py (1291 => 1292)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/testbase.py 2006-04-19 01:32:30 UTC (rev 1291) +++ sqlalchemy/branches/schema/test/testbase.py 2006-04-19 02:00:16 UTC (rev 1292) </span><span class="lines">@@ -30,6 +30,7 @@ </span><span class="cx"> parser.add_option("--db", action="store", dest="db", default="sqlite", help="prefab database uri (sqlite, sqlite_file, postgres, mysql, oracle, oracle8, mssql)") </span><span class="cx"> parser.add_option("--mockpool", action="store_true", dest="mockpool", help="use mock pool") </span><span class="cx"> parser.add_option("--nothreadlocal", action="store_true", dest="nothreadlocal", help="dont use thread-local mod") </span><ins>+ parser.add_option("--enginestrategy", action="store", default=None, dest="enginestrategy", help="engine strategy (plain or threadlocal, defaults to SA default)") </ins><span class="cx"> </span><span class="cx"> (options, args) = parser.parse_args() </span><span class="cx"> sys.argv[1:] = args </span><span class="lines">@@ -62,8 +63,10 @@ </span><span class="cx"> raise "Could not create engine. specify --db <sqlite|sqlite_file|postgres|mysql|oracle|oracle8|mssql> to test runner." </span><span class="cx"> </span><span class="cx"> if not options.nothreadlocal: </span><del>- sqlalchemy.install_mods('threadlocal') - </del><ins>+ __import__('sqlalchemy.mods.threadlocal') + + if options.enginestrategy is not None: + opts['strategy'] = options.enginestrategy </ins><span class="cx"> if options.mockpool: </span><span class="cx"> db = engine.create_engine(db_uri, echo=echo, default_ordering=True, poolclass=MockPool, **opts) </span><span class="cx"> else: </span><span class="lines">@@ -201,7 +204,7 @@ </span><span class="cx"> </span><span class="cx"> (query, params) = item </span><span class="cx"> if callable(params): </span><del>- params = params() </del><ins>+ params = params(ctx) </ins><span class="cx"> </span><span class="cx"> query = self.convert_statement(query) </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |
