[Sqlalchemy-commits] [5933] sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/oracle/base.py: pas
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5933] sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/oracle/base.py: pass cache to _prepare_reflection_args
|
From: <co...@sq...> - 2009-04-29 19:30:12
|
<!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>[5933] sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/oracle/base.py: pass cache to _prepare_reflection_args</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5933</dd> <dt>Author</dt> <dd>randall</dd> <dt>Date</dt> <dd>2009-04-29 15:29:59 -0400 (Wed, 29 Apr 2009)</dd> </dl> <h3>Log Message</h3> <pre>pass cache to _prepare_reflection_args</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesrel_0_6libsqlalchemydialectsoraclebasepy">sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/oracle/base.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesrel_0_6libsqlalchemydialectsoraclebasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/oracle/base.py (5932 => 5933)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/oracle/base.py 2009-04-29 04:17:59 UTC (rev 5932) +++ sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/oracle/base.py 2009-04-29 19:29:59 UTC (rev 5933) </span><span class="lines">@@ -566,7 +566,7 @@ </span><span class="cx"> </span><span class="cx"> @reflection.cache </span><span class="cx"> def _prepare_reflection_args(self, connection, table_name, schema=None, </span><del>- resolve_synonyms=False, dblink=''): </del><ins>+ resolve_synonyms=False, dblink='', **kw): </ins><span class="cx"> </span><span class="cx"> if resolve_synonyms: </span><span class="cx"> actual_name, owner, dblink, synonym = self._resolve_synonym(connection, desired_owner=self._denormalize_name(schema), desired_synonym=self._denormalize_name(table_name)) </span><span class="lines">@@ -613,10 +613,12 @@ </span><span class="cx"> </span><span class="cx"> resolve_synonyms = kw.get('oracle_resolve_synonyms', False) </span><span class="cx"> dblink = kw.get('dblink', '') </span><ins>+ info_cache = kw.get('info_cache') </ins><span class="cx"> </span><span class="cx"> (table_name, schema, dblink, synonym) = \ </span><span class="cx"> self._prepare_reflection_args(connection, table_name, schema, </span><del>- resolve_synonyms, dblink) </del><ins>+ resolve_synonyms, dblink, + info_cache=info_cache) </ins><span class="cx"> columns = [] </span><span class="cx"> c = connection.execute ("select COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, DATA_DEFAULT from ALL_TAB_COLUMNS%(dblink)s where TABLE_NAME = :table_name and OWNER = :owner" % {'dblink':dblink}, {'table_name':table_name, 'owner':schema}) </span><span class="cx"> </span><span class="lines">@@ -663,9 +665,11 @@ </span><span class="cx"> resolve_synonyms=False, dblink='', **kw): </span><span class="cx"> </span><span class="cx"> </span><ins>+ info_cache = kw.get('info_cache') </ins><span class="cx"> (table_name, schema, dblink, synonym) = \ </span><span class="cx"> self._prepare_reflection_args(connection, table_name, schema, </span><del>- resolve_synonyms, dblink) </del><ins>+ resolve_synonyms, dblink, + info_cache=info_cache) </ins><span class="cx"> indexes = [] </span><span class="cx"> q = """ </span><span class="cx"> SELECT a.INDEX_NAME, a.COLUMN_NAME, b.UNIQUENESS </span><span class="lines">@@ -741,10 +745,12 @@ </span><span class="cx"> </span><span class="cx"> resolve_synonyms = kw.get('oracle_resolve_synonyms', False) </span><span class="cx"> dblink = kw.get('dblink', '') </span><ins>+ info_cache = kw.get('info_cache') </ins><span class="cx"> </span><span class="cx"> (table_name, schema, dblink, synonym) = \ </span><span class="cx"> self._prepare_reflection_args(connection, table_name, schema, </span><del>- resolve_synonyms, dblink) </del><ins>+ resolve_synonyms, dblink, + info_cache=info_cache) </ins><span class="cx"> pkeys = [] </span><span class="cx"> constraint_data = self._get_constraint_data(connection, table_name, </span><span class="cx"> schema, dblink, </span><span class="lines">@@ -771,10 +777,12 @@ </span><span class="cx"> requested_schema = schema # to check later on </span><span class="cx"> resolve_synonyms = kw.get('oracle_resolve_synonyms', False) </span><span class="cx"> dblink = kw.get('dblink', '') </span><ins>+ info_cache = kw.get('info_cache') </ins><span class="cx"> </span><span class="cx"> (table_name, schema, dblink, synonym) = \ </span><span class="cx"> self._prepare_reflection_args(connection, table_name, schema, </span><del>- resolve_synonyms, dblink) </del><ins>+ resolve_synonyms, dblink, + info_cache=info_cache) </ins><span class="cx"> </span><span class="cx"> constraint_data = self._get_constraint_data(connection, table_name, </span><span class="cx"> schema, dblink, </span><span class="lines">@@ -825,9 +833,11 @@ </span><span class="cx"> @reflection.cache </span><span class="cx"> def get_view_definition(self, connection, view_name, schema=None, </span><span class="cx"> resolve_synonyms=False, dblink='', **kw): </span><ins>+ info_cache = kw.get('info_cache') </ins><span class="cx"> (view_name, schema, dblink, synonym) = \ </span><span class="cx"> self._prepare_reflection_args(connection, view_name, schema, </span><del>- resolve_synonyms, dblink) </del><ins>+ resolve_synonyms, dblink, + info_cache=info_cache) </ins><span class="cx"> s = """ </span><span class="cx"> SELECT text FROM all_views </span><span class="cx"> WHERE owner = :schema </span></span></pre> </div> </div> </body> </html> |