[Sqlalchemy-commits] [1477] sqlalchemy/branches/schema/test: got onetoone test working....
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1477] sqlalchemy/branches/schema/test: got onetoone test working....
|
From: <co...@sq...> - 2006-05-20 18:52:26
|
<!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>[1477] sqlalchemy/branches/schema/test: got onetoone test working....</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1477</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-20 13:52:13 -0500 (Sat, 20 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>got onetoone test working....</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyattributespy">sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py</a></li> <li><a href="#sqlalchemybranchesschematestonetoonepy">sqlalchemy/branches/schema/test/onetoone.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyattributespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py (1476 => 1477)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py 2006-05-20 18:43:07 UTC (rev 1476) +++ sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py 2006-05-20 18:52:13 UTC (rev 1477) </span><span class="lines">@@ -96,8 +96,9 @@ </span><span class="cx"> pass </span><span class="cx"> def hasparent(self, item): </span><span class="cx"> return item.__class__._attribute_manager.attribute_history(item).get('_hasparent_' + self.key) </span><del>- def sethasparent(self, item, value): - item.__class__._attribute_manager.attribute_history(item)['_hasparent_' + self.key] = value </del><ins>+ def sethasparent(self, item, value): + if item is not None: + item.__class__._attribute_manager.attribute_history(item)['_hasparent_' + self.key] = value </ins><span class="cx"> </span><span class="cx"> class ScalarAttribute(ManagedAttribute): </span><span class="cx"> """Used by AttributeManager to track the history of a scalar attribute </span></span></pre></div> <a id="sqlalchemybranchesschematestonetoonepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/onetoone.py (1476 => 1477)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/onetoone.py 2006-05-20 18:43:07 UTC (rev 1476) +++ sqlalchemy/branches/schema/test/onetoone.py 2006-05-20 18:52:13 UTC (rev 1477) </span><span class="lines">@@ -1,5 +1,6 @@ </span><span class="cx"> from sqlalchemy import * </span><span class="cx"> import testbase </span><ins>+from sqlalchemy.ext.sessioncontext import SessionContext </ins><span class="cx"> </span><span class="cx"> class Jack(object): </span><span class="cx"> def __repr__(self): </span><span class="lines">@@ -23,8 +24,10 @@ </span><span class="cx"> </span><span class="cx"> class O2OTest(testbase.AssertMixin): </span><span class="cx"> def setUpAll(self): </span><del>- global jack, port - jack = Table('jack', testbase.db, </del><ins>+ global jack, port, metadata, ctx + metadata = BoundMetaData(testbase.db) + ctx = SessionContext(create_session) + jack = Table('jack', metadata, </ins><span class="cx"> Column('id', Integer, primary_key=True), </span><span class="cx"> #Column('room_id', Integer, ForeignKey("room.id")), </span><span class="cx"> Column('number', String(50)), </span><span class="lines">@@ -33,54 +36,54 @@ </span><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> </span><del>- port = Table('port', testbase.db, </del><ins>+ port = Table('port', metadata, </ins><span class="cx"> Column('id', Integer, primary_key=True), </span><span class="cx"> #Column('device_id', Integer, ForeignKey("device.id")), </span><span class="cx"> Column('name', String(30)), </span><span class="cx"> Column('description', String(100)), </span><span class="cx"> Column('jack_id', Integer, ForeignKey("jack.id")), </span><span class="cx"> ) </span><del>- jack.create() - port.create() </del><ins>+ metadata.create_all() </ins><span class="cx"> def setUp(self): </span><del>- objectstore.clear() </del><ins>+ pass </ins><span class="cx"> def tearDown(self): </span><span class="cx"> clear_mappers() </span><span class="cx"> def tearDownAll(self): </span><del>- port.drop() - jack.drop() </del><ins>+ metadata.drop_all() </ins><span class="cx"> </span><span class="cx"> def test1(self): </span><del>- assign_mapper(Port, port) - assign_mapper(Jack, jack, order_by=[jack.c.number],properties = { - 'port': relation(Port.mapper, backref='jack', uselist=False, lazy=True), - }) </del><ins>+ mapper(Port, port, extension=ctx.mapper_extension) + mapper(Jack, jack, order_by=[jack.c.number],properties = { + 'port': relation(Port, backref='jack', uselist=False, lazy=True), + }, extension=ctx.mapper_extension) </ins><span class="cx"> </span><span class="cx"> j=Jack(number='101') </span><span class="cx"> p=Port(name='fa0/1') </span><span class="cx"> j.port=p </span><del>- objectstore.commit() </del><ins>+ ctx.current.flush() </ins><span class="cx"> jid = j.id </span><span class="cx"> pid = p.id </span><span class="cx"> </span><del>- j=Jack.get(jid) - p=Port.get(pid) </del><ins>+ j=ctx.current.query(Jack).get(jid) + p=ctx.current.query(Port).get(pid) </ins><span class="cx"> print p.jack </span><del>- print j.port </del><ins>+ assert p.jack is not None + assert p.jack is j + assert j.port is not None </ins><span class="cx"> p.jack=None </span><span class="cx"> assert j.port is None #works </span><span class="cx"> </span><del>- objectstore.clear() </del><ins>+ ctx.current.clear() </ins><span class="cx"> </span><del>- j=Jack.get(jid) - p=Port.get(pid) </del><ins>+ j=ctx.current.query(Jack).get(jid) + p=ctx.current.query(Port).get(pid) </ins><span class="cx"> </span><span class="cx"> j.port=None </span><span class="cx"> self.assert_(p.jack is None) </span><del>- objectstore.commit() </del><ins>+ ctx.current.flush() </ins><span class="cx"> </span><del>- j.delete() - objectstore.commit() </del><ins>+ ctx.current.delete(j) + ctx.current.flush() </ins><span class="cx"> </span><span class="cx"> if __name__ == "__main__": </span><span class="cx"> testbase.main() </span></span></pre> </div> </div> </body> </html> |
