[Sqlalchemy-commits] [1422] sqlalchemy/branches/schema/lib/sqlalchemy/ext/proxy.py: Fixed ProxyEngin
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1422] sqlalchemy/branches/schema/lib/sqlalchemy/ext/proxy.py: Fixed ProxyEngine according to the new syntax of create_engine().
|
From: <co...@sq...> - 2006-05-08 16:32:06
|
<!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>[1422] sqlalchemy/branches/schema/lib/sqlalchemy/ext/proxy.py: Fixed ProxyEngine according to the new syntax of create_engine().</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1422</dd> <dt>Author</dt> <dd>niemeyer</dd> <dt>Date</dt> <dd>2006-05-08 11:31:28 -0500 (Mon, 08 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>Fixed ProxyEngine according to the new syntax of create_engine().</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyextproxypy">sqlalchemy/branches/schema/lib/sqlalchemy/ext/proxy.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyextproxypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/ext/proxy.py (1421 => 1422)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/ext/proxy.py 2006-05-08 04:14:28 UTC (rev 1421) +++ sqlalchemy/branches/schema/lib/sqlalchemy/ext/proxy.py 2006-05-08 16:31:28 UTC (rev 1422) </span><span class="lines">@@ -9,6 +9,7 @@ </span><span class="cx"> import sqlalchemy.schema as schema </span><span class="cx"> import thread, weakref </span><span class="cx"> </span><ins>+ </ins><span class="cx"> class BaseProxyEngine(sql.Engine): </span><span class="cx"> ''' </span><span class="cx"> Basis for all proxy engines </span><span class="lines">@@ -39,29 +40,29 @@ </span><span class="cx"> raise AttributeError('No connection established in ProxyEngine: ' </span><span class="cx"> ' no access to %s' % attr) </span><span class="cx"> </span><ins>+ </ins><span class="cx"> class AutoConnectEngine(BaseProxyEngine): </span><span class="cx"> ''' </span><span class="cx"> An SQLEngine proxy that automatically connects when necessary. </span><span class="cx"> ''' </span><span class="cx"> </span><del>- def __init__(self, dburi, opts=None, **kwargs): </del><ins>+ def __init__(self, dburi, **kwargs): </ins><span class="cx"> BaseProxyEngine.__init__(self) </span><del>- self.dburi= dburi - self.opts= opts - self.kwargs= kwargs - self._engine= None </del><ins>+ self.dburi = dburi + self.kwargs = kwargs + self._engine = None </ins><span class="cx"> </span><span class="cx"> def get_engine(self): </span><span class="cx"> if self._engine is None: </span><span class="cx"> if callable(self.dburi): </span><del>- dburi= self.dburi() </del><ins>+ dburi = self.dburi() </ins><span class="cx"> else: </span><del>- dburi= self.dburi - self._engine= create_engine( dburi, self.opts, **self.kwargs ) </del><ins>+ dburi = self.dburi + self._engine = create_engine(dburi, **self.kwargs) </ins><span class="cx"> return self._engine </span><span class="cx"> </span><span class="cx"> </span><del>- </del><ins>+ </ins><span class="cx"> class ProxyEngine(BaseProxyEngine): </span><span class="cx"> """ </span><span class="cx"> SQLEngine proxy. Supports lazy and late initialization by </span><span class="lines">@@ -76,14 +77,15 @@ </span><span class="cx"> self.storage.connection = {} </span><span class="cx"> self.storage.engine = None </span><span class="cx"> self.kwargs = kwargs </span><del>- - def connect(self, uri, opts=None, **kwargs): </del><ins>+ + def connect(self, *args, **kwargs): </ins><span class="cx"> """Establish connection to a real engine. </span><span class="cx"> """ </span><del>- kw = self.kwargs.copy() - kw.update(kwargs) - kwargs = kw - key = "%s(%s,%s)" % (uri, repr(opts), repr(kwargs)) </del><ins>+ kwargs.update(self.kwargs) + if not kwargs: + key = repr(args) + else: + key = "%s, %s" % (repr(args), repr(sorted(kwargs.items()))) </ins><span class="cx"> try: </span><span class="cx"> map = self.storage.connection </span><span class="cx"> except AttributeError: </span><span class="lines">@@ -93,7 +95,7 @@ </span><span class="cx"> try: </span><span class="cx"> self.engine = map[key] </span><span class="cx"> except KeyError: </span><del>- map[key] = create_engine(uri, opts, **kwargs) </del><ins>+ map[key] = create_engine(*args, **kwargs) </ins><span class="cx"> self.storage.engine = map[key] </span><span class="cx"> </span><span class="cx"> def get_engine(self): </span><span class="lines">@@ -103,5 +105,3 @@ </span><span class="cx"> </span><span class="cx"> def set_engine(self, engine): </span><span class="cx"> self.storage.engine = engine </span><del>- - </del></span></pre> </div> </div> </body> </html> |
