[Sqlalchemy-commits] [4382] sqlalchemy/trunk/lib/sqlalchemy/databases: some cache decorator calls..
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [4382] sqlalchemy/trunk/lib/sqlalchemy/databases: some cache decorator calls...
|
From: <co...@sq...> - 2008-03-30 22:15:22
|
<!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><meta http-equiv="content-type" content="text/html; charset=utf-8" /><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, #header, #footer { 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; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #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>[4382] sqlalchemy/trunk/lib/sqlalchemy/databases: some cache decorator calls...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>4382</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2008-03-30 18:15:19 -0400 (Sun, 30 Mar 2008)</dd> </dl> <h3>Log Message</h3> <pre>some cache decorator calls...</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesmysqlpy">sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesoraclepy">sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemydatabasespostgrespy">sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemydatabasesmysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py (4381 => 4382)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py 2008-03-30 22:01:15 UTC (rev 4381) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py 2008-03-30 22:15:19 UTC (rev 4382) </span><span class="lines">@@ -1542,13 +1542,9 @@ </span><span class="cx"> return False </span><span class="cx"> </span><span class="cx"> def get_default_schema_name(self, connection): </span><del>- try: - return self._default_schema_name - except AttributeError: - name = self._default_schema_name = \ - connection.execute('SELECT DATABASE()').scalar() - return name - </del><ins>+ return connection.execute('SELECT DATABASE()').scalar() + get_default_schema_name = util.cache_decorator(get_default_schema_name) + </ins><span class="cx"> def table_names(self, connection, schema): </span><span class="cx"> """Return a Unicode SHOW TABLES from a given schema.""" </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemydatabasesoraclepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py (4381 => 4382)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2008-03-30 22:01:15 UTC (rev 4381) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2008-03-30 22:15:19 UTC (rev 4382) </span><span class="lines">@@ -379,13 +379,9 @@ </span><span class="cx"> return name.encode(self.encoding) </span><span class="cx"> </span><span class="cx"> def get_default_schema_name(self,connection): </span><del>- try: - return self._default_schema_name - except AttributeError: - name = self._default_schema_name = \ - connection.execute('SELECT USER FROM DUAL').scalar() - return name - </del><ins>+ return connection.execute('SELECT USER FROM DUAL').scalar() + get_default_schema_name = util.cache_decorator(get_default_schema_name) + </ins><span class="cx"> def table_names(self, connection, schema): </span><span class="cx"> # note that table_names() isnt loading DBLINKed or synonym'ed tables </span><span class="cx"> if schema is None: </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemydatabasespostgrespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py (4381 => 4382)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py 2008-03-30 22:01:15 UTC (rev 4381) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py 2008-03-30 22:15:19 UTC (rev 4382) </span><span class="lines">@@ -367,10 +367,9 @@ </span><span class="cx"> return [row[0] for row in resultset] </span><span class="cx"> </span><span class="cx"> def get_default_schema_name(self, connection): </span><del>- if not hasattr(self, '_default_schema_name'): - self._default_schema_name = connection.scalar("select current_schema()", None) - return self._default_schema_name - </del><ins>+ return connection.scalar("select current_schema()", None) + get_default_schema_name = util.cache_decorator(get_default_schema_name) + </ins><span class="cx"> def last_inserted_ids(self): </span><span class="cx"> if self.context.last_inserted_ids is None: </span><span class="cx"> raise exceptions.InvalidRequestError("no INSERT executed, or can't use cursor.lastrowid without Postgres OIDs enabled") </span></span></pre> </div> </div> </body> </html> |