[Sqlalchemy-commits] [1476] sqlalchemy/branches/schema/test/eagertest2.py: 0.2-converted
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1476] sqlalchemy/branches/schema/test/eagertest2.py: 0.2-converted
|
From: <co...@sq...> - 2006-05-20 18:43:16
|
<!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>[1476] sqlalchemy/branches/schema/test/eagertest2.py: 0.2-converted</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1476</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-20 13:43:07 -0500 (Sat, 20 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>0.2-converted</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschematesteagertest2py">sqlalchemy/branches/schema/test/eagertest2.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschematesteagertest2py"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/eagertest2.py (1475 => 1476)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/eagertest2.py 2006-05-20 18:34:29 UTC (rev 1475) +++ sqlalchemy/branches/schema/test/eagertest2.py 2006-05-20 18:43:07 UTC (rev 1476) </span><span class="lines">@@ -3,17 +3,15 @@ </span><span class="cx"> import unittest, sys, os </span><span class="cx"> from sqlalchemy import * </span><span class="cx"> import datetime </span><ins>+from sqlalchemy.ext.sessioncontext import SessionContext </ins><span class="cx"> </span><del>-metadata = testbase.metadata - </del><span class="cx"> class EagerTest(AssertMixin): </span><span class="cx"> def setUpAll(self): </span><del>- objectstore.clear() - clear_mappers() - testbase.metadata.tables.clear() - - global companies_table, addresses_table, invoice_table, phones_table, items_table </del><ins>+ global companies_table, addresses_table, invoice_table, phones_table, items_table, ctx, metadata </ins><span class="cx"> </span><ins>+ metadata = BoundMetaData(testbase.db) + ctx = SessionContext(create_session) + </ins><span class="cx"> companies_table = Table('companies', metadata, </span><span class="cx"> Column('company_id', Integer, Sequence('company_id_seq', optional=True), primary_key = True), </span><span class="cx"> Column('company_name', String(40)), </span><span class="lines">@@ -46,27 +44,15 @@ </span><span class="cx"> Column('qty', Integer), </span><span class="cx"> ) </span><span class="cx"> </span><del>- companies_table.create() - addresses_table.create() - phones_table.create() - invoice_table.create() - items_table.create() </del><ins>+ metadata.create_all() </ins><span class="cx"> </span><span class="cx"> def tearDownAll(self): </span><del>- items_table.drop() - invoice_table.drop() - phones_table.drop() - addresses_table.drop() - companies_table.drop() </del><ins>+ metadata.drop_all() </ins><span class="cx"> </span><span class="cx"> def tearDown(self): </span><del>- objectstore.clear() </del><span class="cx"> clear_mappers() </span><del>- items_table.delete().execute() - invoice_table.delete().execute() - phones_table.delete().execute() - addresses_table.delete().execute() - companies_table.delete().execute() </del><ins>+ for t in metadata.table_iterator(reverse=True): + t.delete().execute() </ins><span class="cx"> </span><span class="cx"> def testone(self): </span><span class="cx"> """tests eager load of a many-to-one attached to a one-to-many. this testcase illustrated </span><span class="lines">@@ -88,14 +74,14 @@ </span><span class="cx"> def __repr__(self): </span><span class="cx"> return "Invoice:" + repr(getattr(self, 'invoice_id', None)) + " " + repr(getattr(self, 'date', None)) + " " + repr(self.company) </span><span class="cx"> </span><del>- Address.mapper = mapper(Address, addresses_table, properties={ - }) - Company.mapper = mapper(Company, companies_table, properties={ - 'addresses' : relation(Address.mapper, lazy=False), - }) - Invoice.mapper = mapper(Invoice, invoice_table, properties={ - 'company': relation(Company.mapper, lazy=False, ) - }) </del><ins>+ mapper(Address, addresses_table, properties={ + }, extension=ctx.mapper_extension) + mapper(Company, companies_table, properties={ + 'addresses' : relation(Address, lazy=False), + }, extension=ctx.mapper_extension) + mapper(Invoice, invoice_table, properties={ + 'company': relation(Company, lazy=False, ) + }, extension=ctx.mapper_extension) </ins><span class="cx"> </span><span class="cx"> c1 = Company() </span><span class="cx"> c1.company_name = 'company 1' </span><span class="lines">@@ -109,19 +95,18 @@ </span><span class="cx"> i1.date = datetime.datetime.now() </span><span class="cx"> i1.company = c1 </span><span class="cx"> </span><del>- - objectstore.flush() </del><ins>+ ctx.current.flush() </ins><span class="cx"> </span><span class="cx"> company_id = c1.company_id </span><span class="cx"> invoice_id = i1.invoice_id </span><span class="cx"> </span><del>- objectstore.clear() </del><ins>+ ctx.current.clear() </ins><span class="cx"> </span><del>- c = Company.mapper.get(company_id) </del><ins>+ c = ctx.current.query(Company).get(company_id) </ins><span class="cx"> </span><del>- objectstore.clear() </del><ins>+ ctx.current.clear() </ins><span class="cx"> </span><del>- i = Invoice.mapper.get(invoice_id) </del><ins>+ i = ctx.current.query(Invoice).get(invoice_id) </ins><span class="cx"> </span><span class="cx"> self.echo(repr(c)) </span><span class="cx"> self.echo(repr(i.company)) </span><span class="lines">@@ -153,24 +138,24 @@ </span><span class="cx"> def __repr__(self): </span><span class="cx"> return "Item: " + repr(getattr(self, 'item_id', None)) + " " + repr(getattr(self, 'invoice_id', None)) + " " + repr(self.code) + " " + repr(self.qty) </span><span class="cx"> </span><del>- Phone.mapper = mapper(Phone, phones_table, is_primary=True) </del><ins>+ mapper(Phone, phones_table, extension=ctx.mapper_extension) </ins><span class="cx"> </span><del>- Address.mapper = mapper(Address, addresses_table, properties={ - 'phones': relation(Phone.mapper, lazy=False, backref='address') - }) </del><ins>+ mapper(Address, addresses_table, properties={ + 'phones': relation(Phone, lazy=False, backref='address') + }, extension=ctx.mapper_extension) </ins><span class="cx"> </span><del>- Company.mapper = mapper(Company, companies_table, properties={ - 'addresses' : relation(Address.mapper, lazy=False, backref='company'), - }) </del><ins>+ mapper(Company, companies_table, properties={ + 'addresses' : relation(Address, lazy=False, backref='company'), + }, extension=ctx.mapper_extension) </ins><span class="cx"> </span><del>- Item.mapper = mapper(Item, items_table, is_primary=True) </del><ins>+ mapper(Item, items_table, extension=ctx.mapper_extension) </ins><span class="cx"> </span><del>- Invoice.mapper = mapper(Invoice, invoice_table, properties={ - 'items': relation(Item.mapper, lazy=False, backref='invoice'), - 'company': relation(Company.mapper, lazy=False, backref='invoices') - }) </del><ins>+ mapper(Invoice, invoice_table, properties={ + 'items': relation(Item, lazy=False, backref='invoice'), + 'company': relation(Company, lazy=False, backref='invoices') + }, extension=ctx.mapper_extension) </ins><span class="cx"> </span><del>- objectstore.clear() </del><ins>+ ctx.current.clear() </ins><span class="cx"> c1 = Company() </span><span class="cx"> c1.company_name = 'company 1' </span><span class="cx"> </span><span class="lines">@@ -205,13 +190,13 @@ </span><span class="cx"> </span><span class="cx"> c1.addresses.append(a2) </span><span class="cx"> </span><del>- objectstore.flush() </del><ins>+ ctx.current.flush() </ins><span class="cx"> </span><span class="cx"> company_id = c1.company_id </span><span class="cx"> </span><del>- objectstore.clear() </del><ins>+ ctx.current.clear() </ins><span class="cx"> </span><del>- a = Company.mapper.get(company_id) </del><ins>+ a = ctx.current.query(Company).get(company_id) </ins><span class="cx"> self.echo(repr(a)) </span><span class="cx"> </span><span class="cx"> # set up an invoice </span><span class="lines">@@ -234,18 +219,18 @@ </span><span class="cx"> item3.qty = 3 </span><span class="cx"> item3.invoice = i1 </span><span class="cx"> </span><del>- objectstore.flush() </del><ins>+ ctx.current.flush() </ins><span class="cx"> </span><span class="cx"> invoice_id = i1.invoice_id </span><span class="cx"> </span><del>- objectstore.clear() </del><ins>+ ctx.current.clear() </ins><span class="cx"> </span><del>- c = Company.mapper.get(company_id) </del><ins>+ c = ctx.current.query(Company).get(company_id) </ins><span class="cx"> self.echo(repr(c)) </span><span class="cx"> </span><del>- objectstore.clear() </del><ins>+ ctx.current.clear() </ins><span class="cx"> </span><del>- i = Invoice.mapper.get(invoice_id) </del><ins>+ i = ctx.current.query(Invoice).get(invoice_id) </ins><span class="cx"> self.echo(repr(i)) </span><span class="cx"> </span><span class="cx"> self.assert_(repr(i.company) == repr(c)) </span></span></pre> </div> </div> </body> </html> |
