[Sqlalchemy-commits] [1253] sqlalchemy/trunk: added a unit test for the "version_id" keyword argumen
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1253] sqlalchemy/trunk: added a unit test for the "version_id" keyword argument, which passes based on previous changes to Mapper
|
From: <co...@sq...> - 2006-04-03 22:01:48
|
<!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>[1253] sqlalchemy/trunk: added a unit test for the "version_id" keyword argument, which passes based on previous changes to Mapper</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1253</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-03 17:01:35 -0500 (Mon, 03 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>added a unit test for the "version_id" keyword argument, which passes based on previous changes to Mapper</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkCHANGES">sqlalchemy/trunk/CHANGES</a></li> <li><a href="#sqlalchemytrunktestobjectstorepy">sqlalchemy/trunk/test/objectstore.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkCHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/CHANGES (1252 => 1253)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/CHANGES 2006-04-03 21:46:00 UTC (rev 1252) +++ sqlalchemy/trunk/CHANGES 2006-04-03 22:01:35 UTC (rev 1253) </span><span class="lines">@@ -1,4 +1,10 @@ </span><span class="cx"> 0.1.6 </span><ins>+- added 'version_id' keyword argument to mapper. this keyword should reference a +Column object with type Integer, preferably non-nullable, which will be used on +the mapped table to track version numbers. this number is incremented on each +save operation and is specifed in the UPDATE/DELETE conditions so that it +factors into the returned row count, which results in a ConcurrencyError if the +value received is not the expected count. </ins><span class="cx"> - added 'entity_name' keyword argument to mapper. a mapper is now associated </span><span class="cx"> with a class via the class object as well as an optional entity_name parameter, </span><span class="cx"> which is a string defaulting to None. any number of primary mappers can be </span></span></pre></div> <a id="sqlalchemytrunktestobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/objectstore.py (1252 => 1253)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/objectstore.py 2006-04-03 21:46:00 UTC (rev 1252) +++ sqlalchemy/trunk/test/objectstore.py 2006-04-03 22:01:35 UTC (rev 1253) </span><span class="lines">@@ -169,7 +169,61 @@ </span><span class="cx"> objectstore.clear() </span><span class="cx"> self.assert_(m.get(8).user_name == name2) </span><span class="cx"> self.assert_(m.get(7).user_name != name1) </span><ins>+ +class VersioningTest(AssertMixin): + def setUpAll(self): + global version_table + version_table = Table('version_test', db, + Column('id', Integer, primary_key=True), + Column('version_id', Integer, nullable=False), + Column('value', String(40), nullable=False) + ).create() + def tearDownAll(self): + version_table.drop() + def tearDown(self): + version_table.delete().execute() + objectstore.clear() + clear_mappers() </ins><span class="cx"> </span><ins>+ def testbasic(self): + class Foo(object):pass + assign_mapper(Foo, version_table, version_id_col=version_table.c.version_id) + f1 =Foo(value='f1') + f2 = Foo(value='f2') + objectstore.commit() + + f1.value='f1rev2' + objectstore.commit() + s = objectstore.Session() + f1_s = Foo.mapper.using(s).get(f1.id) + f1_s.value='f1rev3' + s.commit() + + f1.value='f1rev3mine' + success = False + try: + # a concurrent session has modified this, should throw + # an exception + objectstore.commit() + except SQLAlchemyError: + success = True + assert success + + objectstore.clear() + f1 = Foo.mapper.get(f1.id) + f2 = Foo.mapper.get(f2.id) + + f1_s.value='f1rev4' + s.commit() + + objectstore.delete(f1, f2) + success = False + try: + objectstore.commit() + except SQLAlchemyError: + success = True + assert success + </ins><span class="cx"> class UnicodeTest(AssertMixin): </span><span class="cx"> def setUpAll(self): </span><span class="cx"> global uni_table </span></span></pre> </div> </div> </body> </html> |
