[Sqlalchemy-commits] [1396] sqlalchemy/branches/schema/test: merging more things from 0.1.7.....
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1396] sqlalchemy/branches/schema/test: merging more things from 0.1.7.....
|
From: <co...@sq...> - 2006-05-05 00:58:24
|
<!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>[1396] sqlalchemy/branches/schema/test: merging more things from 0.1.7.....</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1396</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-04 19:58:13 -0500 (Thu, 04 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>merging more things from 0.1.7.....</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyattributespy">sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemysqlpy">sqlalchemy/branches/schema/lib/sqlalchemy/sql.py</a></li> <li><a href="#sqlalchemybranchesschematestlazytest1py">sqlalchemy/branches/schema/test/lazytest1.py</a></li> <li><a href="#sqlalchemybranchesschematestselectpy">sqlalchemy/branches/schema/test/select.py</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href="#sqlalchemybranchesschematestmasscreate2py">sqlalchemy/branches/schema/test/masscreate2.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 (1395 => 1396)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py 2006-05-05 00:49:49 UTC (rev 1395) +++ sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py 2006-05-05 00:58:13 UTC (rev 1396) </span><span class="lines">@@ -80,8 +80,12 @@ </span><span class="cx"> ManagedAttribute objects associated with the instance via this dictionary.""" </span><span class="cx"> def __init__(self, obj, key): </span><span class="cx"> self.__obj = weakref.ref(obj) </span><del>- #self.obj = obj </del><span class="cx"> self.key = key </span><ins>+ def __getstate__(self): + return {'key':self.key, 'obj':self.obj} + def __setstate__(self, d): + self.key = d['key'] + self.__obj = weakref.ref(d['obj']) </ins><span class="cx"> obj = property(lambda s:s.__obj()) </span><span class="cx"> def value_changed(self, *args, **kwargs): </span><span class="cx"> self.obj._managed_value_changed = True </span><span class="lines">@@ -522,26 +526,6 @@ </span><span class="cx"> will be passed along to newly created ManagedAttribute.""" </span><span class="cx"> if not hasattr(class_, '_attribute_manager'): </span><span class="cx"> class_._attribute_manager = self </span><del>- class_._managed_attributes = ObjectAttributeGateway() </del><span class="cx"> typecallable = getattr(class_, key, None) </span><span class="cx"> setattr(class_, key, self.create_prop(class_, key, uselist, callable_, typecallable=typecallable, **kwargs)) </span><span class="cx"> </span><del>-managed_attributes = weakref.WeakKeyDictionary() - -class ObjectAttributeGateway(object): - """handles the dictionary of ManagedAttributes for instances. this level of indirection - is to prevent circular references upon objects, as well as keeping them Pickle-compatible.""" - def __set__(self, obj, value): - managed_attributes[obj] = value - def __delete__(self, obj): - try: - del managed_attributes[obj] - except KeyError: - raise AttributeError() - def __get__(self, obj, owner): - if obj is None: - return self - try: - return managed_attributes[obj] - except KeyError: - raise AttributeError() </del><span class="cx">\ No newline at end of file </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py (1395 => 1396)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-05 00:49:49 UTC (rev 1395) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-05 00:58:13 UTC (rev 1396) </span><span class="lines">@@ -143,6 +143,8 @@ </span><span class="cx"> self.effective_polymorphic_on = inherits.effective_polymorphic_on </span><span class="cx"> else: </span><span class="cx"> self.effective_polymorphic_on = self.polymorphic_on </span><ins>+ if self.order_by is False: + self.order_by = inherits.order_by </ins><span class="cx"> else: </span><span class="cx"> self._synchronizer = None </span><span class="cx"> self.inherits = None </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/sql.py (1395 => 1396)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-05 00:49:49 UTC (rev 1395) +++ sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-05 00:58:13 UTC (rev 1396) </span><span class="lines">@@ -721,7 +721,9 @@ </span><span class="cx"> self.type = type </span><span class="cx"> def accept_visitor(self, visitor): </span><span class="cx"> visitor.visit_typeclause(self) </span><del>- </del><ins>+ def _get_from_objects(self): + return [] + </ins><span class="cx"> class TextClause(ClauseElement): </span><span class="cx"> """represents literal a SQL text fragment. public constructor is the </span><span class="cx"> text() function. </span></span></pre></div> <a id="sqlalchemybranchesschematestlazytest1py"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/lazytest1.py (1395 => 1396)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/lazytest1.py 2006-05-05 00:49:49 UTC (rev 1395) +++ sqlalchemy/branches/schema/test/lazytest1.py 2006-05-05 00:58:13 UTC (rev 1396) </span><span class="lines">@@ -68,6 +68,8 @@ </span><span class="cx"> class Data(object): </span><span class="cx"> pass </span><span class="cx"> </span><ins>+ session = create_session() + </ins><span class="cx"> # Create the basic mappers, with no frills or modifications </span><span class="cx"> Information.mapper = mapper(Information, info_table) </span><span class="cx"> Data.mapper = mapper(Data, data_table) </span><span class="lines">@@ -81,7 +83,7 @@ </span><span class="cx"> </span><span class="cx"> Information.mapper.add_property('rels', relation(Relation.mapper)) </span><span class="cx"> </span><del>- info = Information.mapper.get(1) </del><ins>+ info = session.query(Information).get(1) </ins><span class="cx"> assert info </span><span class="cx"> assert len(info.rels) == 2 </span><span class="cx"> assert len(info.rels[0].datas) == 3 </span></span></pre></div> <a id="sqlalchemybranchesschematestmasscreate2py"></a> <div class="addfile"><h4>Added: sqlalchemy/branches/schema/test/masscreate2.py (1395 => 1396)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/masscreate2.py 2006-05-05 00:49:49 UTC (rev 1395) +++ sqlalchemy/branches/schema/test/masscreate2.py 2006-05-05 00:58:13 UTC (rev 1396) </span><span class="lines">@@ -0,0 +1,36 @@ </span><ins>+import gc + +import random, string + +from sqlalchemy.attributes import * + +# with this test, run top. make sure the Python process doenst grow in size arbitrarily. + +class User(object): + pass + +class Address(object): + pass + +attr_manager = AttributeManager() +attr_manager.register_attribute(User, 'id', uselist=False) +attr_manager.register_attribute(User, 'name', uselist=False) +attr_manager.register_attribute(User, 'addresses', uselist=True) +attr_manager.register_attribute(Address, 'email', uselist=False) +attr_manager.register_attribute(Address, 'user', uselist=False) + + +for i in xrange(1000): + for j in xrange(1000): + u = User() + u.name = str(random.randint(0, 100000000)) + for k in xrange(10): + a = Address() + a.email_address = str(random.randint(0, 100000000)) + u.addresses.append(a) + a.user = u + print "clearing" + #managed_attributes.clear() + gc.collect() + + </ins></span></pre></div> <a id="sqlalchemybranchesschematestselectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/select.py (1395 => 1396)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/select.py 2006-05-05 00:49:49 UTC (rev 1395) +++ sqlalchemy/branches/schema/test/select.py 2006-05-05 00:58:13 UTC (rev 1396) </span><span class="lines">@@ -555,7 +555,8 @@ </span><span class="cx"> self.assertEqual(str(cast(tbl.c.ts, Date, engine=engine)), 'CAST(casttest.ts AS %s)' %expected_results[2]) </span><span class="cx"> self.assertEqual(str(cast(1234, TEXT, engine=engine)), 'CAST(%s AS %s)' %(literal, expected_results[3])) </span><span class="cx"> self.assertEqual(str(cast('test', String(20), engine=engine)), 'CAST(%s AS %s)' %(literal, expected_results[4])) </span><del>- </del><ins>+ sel = select([tbl, cast(tbl.c.v1, Numeric)], engine=engine) + self.assertEqual(str(sel), "SELECT casttest.id, casttest.v1, casttest.v2, casttest.ts, CAST(casttest.v1 AS NUMERIC(10, 2)) \nFROM casttest") </ins><span class="cx"> # first test with Postgres engine </span><span class="cx"> check_results(postgres.engine({}), ['NUMERIC(10, 2)', 'NUMERIC(12, 9)', 'DATE', 'TEXT', 'VARCHAR(20)'], '%(literal)s') </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |
