[Sqlalchemy-commits] [1322] sqlalchemy/branches/schema/test: instances are created using __new__ ins
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1322] sqlalchemy/branches/schema/test: instances are created using __new__ instead of __init__
|
From: <co...@sq...> - 2006-04-23 20:44:13
|
<!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>[1322] sqlalchemy/branches/schema/test: instances are created using __new__ instead of __init__</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1322</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-23 15:43:59 -0500 (Sun, 23 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>instances are created using __new__ instead of __init__</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemymappingmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py</a></li> <li><a href="#sqlalchemybranchesschematestmapperpy">sqlalchemy/branches/schema/test/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py (1321 => 1322)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py 2006-04-23 20:37:53 UTC (rev 1321) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py 2006-04-23 20:43:59 UTC (rev 1322) </span><span class="lines">@@ -724,7 +724,7 @@ </span><span class="cx"> imap[identitykey] = instance </span><span class="cx"> for prop in self.props.values(): </span><span class="cx"> prop.execute(session, instance, row, identitykey, imap, True) </span><del>- if self.extension.append_result(self, row, imap, result, instance, isnew, populate_existing=populate_existing) is EXT_PASS: </del><ins>+ if self.extension.append_result(self, session, row, imap, result, instance, isnew, populate_existing=populate_existing) is EXT_PASS: </ins><span class="cx"> if result is not None: </span><span class="cx"> result.append_nohistory(instance) </span><span class="cx"> return instance </span><span class="lines">@@ -738,9 +738,9 @@ </span><span class="cx"> if row[col] is None: </span><span class="cx"> return None </span><span class="cx"> # plugin point </span><del>- instance = self.extension.create_instance(self, row, imap, self.class_) </del><ins>+ instance = self.extension.create_instance(self, session, row, imap, self.class_) </ins><span class="cx"> if instance is EXT_PASS: </span><del>- instance = self.class_(_mapper_nohistory=True, _sa_entity_name=self.entity_name, _sa_session=session) </del><ins>+ instance = self._create_instance(session) </ins><span class="cx"> imap[identitykey] = instance </span><span class="cx"> isnew = True </span><span class="cx"> else: </span><span class="lines">@@ -753,11 +753,25 @@ </span><span class="cx"> # instances from the row and possibly populate this item. </span><span class="cx"> if self.extension.populate_instance(self, session, instance, row, identitykey, imap, isnew) is EXT_PASS: </span><span class="cx"> self.populate_instance(session, instance, row, identitykey, imap, isnew) </span><del>- if self.extension.append_result(self, row, imap, result, instance, isnew, populate_existing=populate_existing) is EXT_PASS: </del><ins>+ if self.extension.append_result(self, session, row, imap, result, instance, isnew, populate_existing=populate_existing) is EXT_PASS: </ins><span class="cx"> if result is not None: </span><span class="cx"> result.append_nohistory(instance) </span><span class="cx"> return instance </span><span class="cx"> </span><ins>+ def _create_instance(self, session): + + #return self.class_(_mapper_nohistory=True, _sa_entity_name=self.entity_name, _sa_session=session) + + obj = self.class_.__new__(self.class_) + obj._entity_name = self.entity_name + + # this gets the AttributeManager to do some pre-initialization, + # in order to save on KeyErrors later on + objectstore.global_attributes.init_attr(obj) + + session._bind_to(obj) + return obj + </ins><span class="cx"> def translate_row(self, tomapper, row): </span><span class="cx"> """attempts to take a row and translate its values to a row that can </span><span class="cx"> be understood by another mapper. breaks the column references down to their </span><span class="lines">@@ -857,7 +871,7 @@ </span><span class="cx"> return EXT_PASS </span><span class="cx"> else: </span><span class="cx"> return self.next.select(query, *args, **kwargs) </span><del>- def create_instance(self, mapper, row, imap, class_): </del><ins>+ def create_instance(self, mapper, session, row, imap, class_): </ins><span class="cx"> """called when a new object instance is about to be created from a row. </span><span class="cx"> the method can choose to create the instance itself, or it can return </span><span class="cx"> None to indicate normal object creation should take place. </span><span class="lines">@@ -874,8 +888,8 @@ </span><span class="cx"> if self.next is None: </span><span class="cx"> return EXT_PASS </span><span class="cx"> else: </span><del>- return self.next.create_instance(mapper, row, imap, class_) - def append_result(self, mapper, row, imap, result, instance, isnew, populate_existing=False): </del><ins>+ return self.next.create_instance(mapper, session, row, imap, class_) + def append_result(self, mapper, session, row, imap, result, instance, isnew, populate_existing=False): </ins><span class="cx"> """called when an object instance is being appended to a result list. </span><span class="cx"> </span><span class="cx"> If this method returns True, it is assumed that the mapper should do the appending, else </span><span class="lines">@@ -904,7 +918,7 @@ </span><span class="cx"> if self.next is None: </span><span class="cx"> return EXT_PASS </span><span class="cx"> else: </span><del>- return self.next.append_result(mapper, row, imap, result, instance, isnew, populate_existing) </del><ins>+ return self.next.append_result(mapper, session, row, imap, result, instance, isnew, populate_existing) </ins><span class="cx"> def populate_instance(self, mapper, session, instance, row, identitykey, imap, isnew): </span><span class="cx"> """called right before the mapper, after creating an instance from a row, passes the row </span><span class="cx"> to its MapperProperty objects which are responsible for populating the object's attributes. </span></span></pre></div> <a id="sqlalchemybranchesschematestmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/mapper.py (1321 => 1322)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/mapper.py 2006-04-23 20:37:53 UTC (rev 1321) +++ sqlalchemy/branches/schema/test/mapper.py 2006-04-23 20:43:59 UTC (rev 1322) </span><span class="lines">@@ -550,7 +550,7 @@ </span><span class="cx"> </span><span class="cx"> def testbackwardsonetoone(self): </span><span class="cx"> m = mapper(Address, addresses, properties = dict( </span><del>- user = relation(mapper(User, users, properties = {'id':users.c.user_id}), lazy = True) </del><ins>+ user = relation(mapper(User, users), lazy = True) </ins><span class="cx"> )) </span><span class="cx"> l = m.select(addresses.c.address_id == 1) </span><span class="cx"> self.echo(repr(l)) </span></span></pre> </div> </div> </body> </html> |
