[Sqlalchemy-commits] [1059] sqlalchemy/trunk/lib/sqlalchemy/mapping: got mapper.using() to work, fix
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1059] sqlalchemy/trunk/lib/sqlalchemy/mapping: got mapper.using() to work, fixed push/pop mapper, custom session assignments
|
From: <co...@sq...> - 2006-02-27 02:33:57
|
<!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>[1059] sqlalchemy/trunk/lib/sqlalchemy/mapping: got mapper.using() to work, fixed push/pop mapper, custom session assignments</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1059</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-26 20:33:47 -0600 (Sun, 26 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>got mapper.using() to work, fixed push/pop mapper, custom session assignments</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingobjectstorepy">sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1058 => 1059)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-02-27 01:11:56 UTC (rev 1058) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-02-27 02:33:47 UTC (rev 1059) </span><span class="lines">@@ -213,15 +213,22 @@ </span><span class="cx"> def init(self, *args, **kwargs): </span><span class="cx"> nohist = kwargs.pop('_mapper_nohistory', False) </span><span class="cx"> session = kwargs.pop('_sa_session', objectstore.get_session()) </span><ins>+ if not nohist: + # register new with the correct session, before the object's + # constructor is called, since further assignments within the + # constructor would otherwise bind it to whatever get_session() is. + session.register_new(self) </ins><span class="cx"> if oldinit is not None: </span><span class="cx"> try: </span><span class="cx"> oldinit(self, *args, **kwargs) </span><span class="cx"> except TypeError, msg: </span><span class="cx"> # re-raise with the offending class name added to help in debugging </span><span class="cx"> raise TypeError, '%s.%s' %(self.__class__.__name__, msg) </span><del>- if not nohist: - session.register_new(self) - self.class_.__init__ = init </del><ins>+ # override oldinit, insuring that its not already one of our + # own modified inits + if oldinit is None or not hasattr(oldinit, '_sa_mapper_init'): + init._sa_mapper_init = True + self.class_.__init__ = init </ins><span class="cx"> mapper_registry[self.class_] = self </span><span class="cx"> self.class_.c = self.c </span><span class="cx"> </span><span class="lines">@@ -300,7 +307,23 @@ </span><span class="cx"> mapper.__dict__.update(self.__dict__) </span><span class="cx"> mapper.props = self.props.copy() </span><span class="cx"> return mapper </span><del>- </del><ins>+ + def using(self, session): + """returns a proxying object to this mapper, which will execute methods on the mapper + within the context of the given session. The session is placed as the "current" session + via the push_session/pop_session methods in the objectstore module.""" + mapper = self + class Proxy(object): + def __getattr__(self, key): + def callit(*args, **kwargs): + objectstore.push_session(session) + try: + return getattr(mapper, key)(*args, **kwargs) + finally: + objectstore.pop_session() + return callit + return Proxy() + </ins><span class="cx"> def options(self, *options): </span><span class="cx"> """uses this mapper as a prototype for a new mapper with different behavior. </span><span class="cx"> *options is a list of options directives, which include eagerload(), lazyload(), and noload()""" </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py (1058 => 1059)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py 2006-02-27 01:11:56 UTC (rev 1058) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py 2006-02-27 02:33:47 UTC (rev 1059) </span><span class="lines">@@ -369,7 +369,8 @@ </span><span class="cx"> self.attributes.commit(obj) </span><span class="cx"> </span><span class="cx"> def register_new(self, obj): </span><del>- self.new.append(obj) </del><ins>+ if not self.new.contains(obj): + self.new.append(obj) </ins><span class="cx"> </span><span class="cx"> def register_dirty(self, obj): </span><span class="cx"> if not self.dirty.contains(obj): </span><span class="lines">@@ -1059,17 +1060,15 @@ </span><span class="cx"> uow = get_session # deprecated </span><span class="cx"> </span><span class="cx"> def push_session(sess): </span><del>- old = _sessions.get(thread.get_ident(), None) </del><ins>+ old = get_session() </ins><span class="cx"> sess._previous = old </span><del>- _sessions[sess.hash_key] = sess - _sessions[thread.get_ident()] = sess </del><ins>+ session_registry.set(sess) </ins><span class="cx"> </span><span class="cx"> def pop_session(): </span><del>- sess = _sessions[thread.get_ident()] </del><ins>+ sess = get_session() </ins><span class="cx"> old = sess._previous </span><span class="cx"> sess._previous = None </span><del>- _sessions[old.hash_key] = old - _sessions[thread.get_ident()] = old </del><ins>+ session_registry.set(old) </ins><span class="cx"> return old </span><span class="cx"> </span><span class="cx"> def using_session(sess, func): </span></span></pre> </div> </div> </body> </html> |
