[Sqlalchemy-commits] [2335] sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py: - modified patch
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [2335] sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py: - modified patch for [ticket:379] - detecting synonyms, dblinks in reflection.
|
From: <co...@sq...> - 2007-02-17 21:37:40
|
<!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>[2335] sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py: - modified patch for [ticket:379] - detecting synonyms, dblinks in reflection.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2335</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2007-02-17 17:40:31 -0600 (Sat, 17 Feb 2007)</dd> </dl> <h3>Log Message</h3> <pre>- modified patch for [ticket:379] - detecting synonyms, dblinks in reflection. test passes except for DBLINK which I cannot get to work on my oracle-xe database. - probable (also untested) fix for [ticket:363], better error message if we get None back for remote table information (which is due to rights)</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesoraclepy">sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemydatabasesoraclepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py (2334 => 2335)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2007-02-17 19:08:36 UTC (rev 2334) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2007-02-17 23:40:31 UTC (rev 2335) </span><span class="lines">@@ -26,7 +26,10 @@ </span><span class="cx"> </span><span class="cx"> class OracleNumeric(sqltypes.Numeric): </span><span class="cx"> def get_col_spec(self): </span><del>- return "NUMERIC(%(precision)s, %(length)s)" % {'precision': self.precision, 'length' : self.length} </del><ins>+ if self.precision is None: + return "NUMERIC" + else: + return "NUMERIC(%(precision)s, %(length)s)" % {'precision': self.precision, 'length' : self.length} </ins><span class="cx"> class OracleInteger(sqltypes.Integer): </span><span class="cx"> def get_col_spec(self): </span><span class="cx"> return "INTEGER" </span><span class="lines">@@ -123,25 +126,6 @@ </span><span class="cx"> 'DOUBLE PRECISION' : OracleNumeric, </span><span class="cx"> } </span><span class="cx"> </span><del>-constraintSQL = """SELECT - ac.constraint_name, - ac.constraint_type, - LOWER(loc.column_name) AS local_column, - LOWER(rem.table_name) AS remote_table, - LOWER(rem.column_name) AS remote_column, - LOWER(rem.owner) AS remote_owner -FROM all_constraints ac, - all_cons_columns loc, - all_cons_columns rem -WHERE ac.table_name = :table_name -AND ac.constraint_type IN ('R','P') -AND ac.owner = :owner -AND ac.owner = loc.owner -AND ac.constraint_name = loc.constraint_name -AND ac.r_owner = rem.owner(+) -AND ac.r_constraint_name = rem.constraint_name(+) --- order multiple primary keys correctly -ORDER BY ac.constraint_name, loc.position, rem.position""" </del><span class="cx"> </span><span class="cx"> </span><span class="cx"> def descriptor(): </span><span class="lines">@@ -224,31 +208,80 @@ </span><span class="cx"> def has_sequence(self, connection, sequence_name): </span><span class="cx"> cursor = connection.execute("""select sequence_name from all_sequences where sequence_name=:name""", {'name':sequence_name.upper()}) </span><span class="cx"> return bool( cursor.fetchone() is not None ) </span><ins>+ + def _locate_owner_row(self, owner, name, rows, raiseerr=False): + """return the row in the given list of rows which references the given table name and owner name.""" + if not rows: + if raiseerr: + raise exceptions.NoSuchTableError(name) + else: + return None + else: + if owner is not None: + for row in rows: + if owner.upper() in row[0]: + return row + else: + if raiseerr: + raise exceptions.AssertionError("Specified owner %s does not own table %s" % (owner, name)) + else: + return None + else: + if len(rows)==1: + return rows[0] + else: + if raiseerr: + raise exceptions.AssertionError("There are multiple tables with name '%s' visible to the schema, you must specifiy owner" % name) + else: + return None </ins><span class="cx"> </span><ins>+ def _resolve_table_owner(self, connection, name, table, dblink=''): + """locate the given table in the ALL_TAB_COLUMNS view, including searching for equivalent synonyms and dblinks""" + c = connection.execute ("select distinct OWNER from ALL_TAB_COLUMNS%(dblink)s where TABLE_NAME = :table_name" % {'dblink':dblink}, {'table_name':name}) + rows = c.fetchall() + try: + row = self._locate_owner_row(table.owner, name, rows, raiseerr=True) + return name, row['OWNER'], '' + except exceptions.SQLAlchemyError: + # locate synonyms + c = connection.execute ("""select OWNER, TABLE_OWNER, TABLE_NAME, DB_LINK + from ALL_SYNONYMS%(dblink)s + where SYNONYM_NAME = :synonym_name + and (DB_LINK IS NOT NULL + or ((TABLE_NAME, TABLE_OWNER) in + (select TABLE_NAME, OWNER from ALL_TAB_COLUMNS%(dblink)s)))""" % {'dblink':dblink}, + {'synonym_name':name}) + rows = c.fetchall() + row = self._locate_owner_row(table.owner, name, rows) + if row is None: + row = self._locate_owner_row("PUBLIC", name, rows) + + if row is not None: + owner, name, dblink = row['TABLE_OWNER'], row['TABLE_NAME'], row['DB_LINK'] + if dblink: + dblink = '@' + dblink + if not owner: + # re-resolve table owner using new dblink variable + t1, owner, t2 = self._resolve_table_owner(connection, name, table, dblink=dblink) + else: + dblink = '' + return name, owner, dblink + raise + + </ins><span class="cx"> def reflecttable(self, connection, table): </span><span class="cx"> preparer = self.identifier_preparer </span><span class="cx"> if not preparer.should_quote(table): </span><span class="cx"> name = table.name.upper() </span><span class="cx"> else: </span><span class="cx"> name = table.name </span><del>- c = connection.execute ("select distinct OWNER from ALL_TAB_COLUMNS where TABLE_NAME = :table_name", {'table_name':name}) - rows = c.fetchall() - if not rows : - raise exceptions.NoSuchTableError(table.name) - else: - if table.owner is not None: - if table.owner.upper() in [r[0] for r in rows]: - owner = table.owner.upper() - else: - raise exceptions.AssertionError("Specified owner %s does not own table %s"%(table.owner, table.name)) - else: - if len(rows)==1: - owner = rows[0][0] - else: - raise exceptions.AssertionError("There are multiple tables with name %s in the schema, you must specifie owner"%table.name) - - c = connection.execute ("select COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, DATA_DEFAULT from ALL_TAB_COLUMNS where TABLE_NAME = :table_name and OWNER = :owner", {'table_name':name, 'owner':owner}) </del><span class="cx"> </span><ins>+ # search for table, including across synonyms and dblinks. + # locate the actual name of the table, the real owner, and any dblink clause needed. + actual_name, owner, dblink = self._resolve_table_owner(connection, name, table) + + 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':actual_name, 'owner':owner}) + </ins><span class="cx"> while True: </span><span class="cx"> row = c.fetchone() </span><span class="cx"> if row is None: </span><span class="lines">@@ -256,7 +289,7 @@ </span><span class="cx"> found_table = True </span><span class="cx"> </span><span class="cx"> #print "ROW:" , row </span><del>- (name, coltype, length, precision, scale, nullable, default) = (row[0], row[1], row[2], row[3], row[4], row[5]=='Y', row[6]) </del><ins>+ (colname, coltype, length, precision, scale, nullable, default) = (row[0], row[1], row[2], row[3], row[4], row[5]=='Y', row[6]) </ins><span class="cx"> </span><span class="cx"> # INTEGER if the scale is 0 and precision is null </span><span class="cx"> # NUMBER if the scale and precision are both null </span><span class="lines">@@ -277,20 +310,42 @@ </span><span class="cx"> try: </span><span class="cx"> coltype = ischema_names[coltype] </span><span class="cx"> except KeyError: </span><del>- raise exceptions.AssertionError("Cant get coltype for type '%s'" % coltype) </del><ins>+ raise exceptions.AssertionError("Cant get coltype for type '%s' on colname '%s'" % (coltype, colname)) </ins><span class="cx"> </span><span class="cx"> colargs = [] </span><span class="cx"> if default is not None: </span><span class="cx"> colargs.append(schema.PassiveDefault(sql.text(default))) </span><span class="cx"> </span><span class="cx"> # if name comes back as all upper, assume its case folded </span><del>- if (name.upper() == name): - name = name.lower() </del><ins>+ if (colname.upper() == colname): + colname = colname.lower() </ins><span class="cx"> </span><del>- table.append_column(schema.Column(name, coltype, nullable=nullable, *colargs)) </del><ins>+ table.append_column(schema.Column(colname, coltype, nullable=nullable, *colargs)) </ins><span class="cx"> </span><del>- - c = connection.execute(constraintSQL, {'table_name' : table.name.upper(), 'owner' : owner}) </del><ins>+ if not len(table.columns): + raise exceptions.AssertionError("Couldn't find any column information for table %s" % actual_name) + + c = connection.execute("""SELECT + ac.constraint_name, + ac.constraint_type, + LOWER(loc.column_name) AS local_column, + LOWER(rem.table_name) AS remote_table, + LOWER(rem.column_name) AS remote_column, + LOWER(rem.owner) AS remote_owner + FROM all_constraints%(dblink)s ac, + all_cons_columns%(dblink)s loc, + all_cons_columns%(dblink)s rem + WHERE ac.table_name = :table_name + AND ac.constraint_type IN ('R','P') + AND ac.owner = :owner + AND ac.owner = loc.owner + AND ac.constraint_name = loc.constraint_name + AND ac.r_owner = rem.owner(+) + AND ac.r_constraint_name = rem.constraint_name(+) + -- order multiple primary keys correctly + ORDER BY ac.constraint_name, loc.position, rem.position""" + % {'dblink':dblink}, {'table_name' : actual_name, 'owner' : owner}) + </ins><span class="cx"> fks = {} </span><span class="cx"> while True: </span><span class="cx"> row = c.fetchone() </span><span class="lines">@@ -306,6 +361,9 @@ </span><span class="cx"> except KeyError: </span><span class="cx"> fk = ([], []) </span><span class="cx"> fks[cons_name] = fk </span><ins>+ if remote_table is None: + # ticket 363 + raise exceptions.AssertionError("Got 'None' querying 'table_name' from all_cons_columns%(dblink)s - does the user have proper rights to the table?" % {'dblink':dblink}) </ins><span class="cx"> refspec = ".".join([remote_table, remote_column]) </span><span class="cx"> schema.Table(remote_table, table.metadata, autoload=True, autoload_with=connection, owner=remote_owner) </span><span class="cx"> if local_column not in fk[0]: </span></span></pre> </div> </div> </body> </html> |