[Sqlalchemy-commits] [1150] sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py: John Dell'Aquila's
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1150] sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py: John Dell'Aquila's patch which fixes [ticket:103] [ticket:105], selecting primary keys properly and using the ALL_* instead of USER_* tables
<!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>[1150] sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py: John Dell'Aquila's patch which fixes [ticket:103] [ticket:105], selecting primary keys properly and using the ALL_* instead of USER_* tables</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1150</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-16 17:55:00 -0600 (Thu, 16 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>John Dell'Aquila's patch which fixes [ticket:103] [ticket:105], selecting primary keys properly and using the ALL_* instead of USER_* tables</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 (1149 => 1150)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-03-16 23:38:14 UTC (rev 1149) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-03-16 23:55:00 UTC (rev 1150) </span><span class="lines">@@ -75,6 +75,24 @@ </span><span class="cx"> 'CLOB' : OracleText </span><span class="cx"> } </span><span class="cx"> </span><ins>+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 +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 = 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""" + </ins><span class="cx"> def engine(*args, **params): </span><span class="cx"> return OracleSQLEngine(*args, **params) </span><span class="cx"> </span><span class="lines">@@ -123,7 +141,7 @@ </span><span class="cx"> return OracleDefaultRunner(self, proxy) </span><span class="cx"> </span><span class="cx"> def reflecttable(self, table): </span><del>- c = self.execute ("select COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, DATA_DEFAULT from USER_TAB_COLUMNS where TABLE_NAME = :table_name", {'table_name':table.name.upper()}) </del><ins>+ c = self.execute ("select COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, DATA_DEFAULT from ALL_TAB_COLUMNS where TABLE_NAME = :table_name", {'table_name':table.name.upper()}) </ins><span class="cx"> </span><span class="cx"> while True: </span><span class="cx"> row = c.fetchone() </span><span class="lines">@@ -159,23 +177,22 @@ </span><span class="cx"> table.append_item (schema.Column(name, coltype, nullable=nullable, *colargs)) </span><span class="cx"> </span><span class="cx"> </span><del>- c = self.execute("""select UCC.CONSTRAINT_NAME, UCC.COLUMN_NAME, UC.CONSTRAINT_TYPE, UC.SEARCH_CONDITION, UC2.TABLE_NAME as REFERENCES_TABLE -from USER_CONS_COLUMNS UCC, USER_CONSTRAINTS UC, USER_CONSTRAINTS UC2 -where UCC.CONSTRAINT_NAME = UC.CONSTRAINT_NAME -and UC.R_CONSTRAINT_NAME = UC2.CONSTRAINT_NAME(+) -and UCC.TABLE_NAME = :table_name -order by UCC.CONSTRAINT_NAME""",{'table_name' : table.name.upper()}) </del><ins>+ c = self.execute(constraintSQL, {'table_name' : table.name.upper()}) </ins><span class="cx"> while True: </span><span class="cx"> row = c.fetchone() </span><span class="cx"> if row is None: </span><span class="cx"> break </span><span class="cx"> #print "ROW:" , row </span><del>- (cons_name, column_name, type, search, referred_table) = row - if type=='P' : - table.c[column_name.lower()]._set_primary_key() - elif type=='R': - remotetable = Table(referred_table.lower(), table.engine, autoload = True) - table.c[column_name.lower()].append_item(schema.ForeignKey(remotetable.primary_key[0])) </del><ins>+ (cons_name, cons_type, local_column, remote_table, remote_column) = row + if cons_type == 'P': + table.c[local_column]._set_primary_key() + elif cons_type == 'R': + table.c[local_column].append_item( + schema.ForeignKey(Table(remote_table, + self, + autoload=True).c[remote_column] + ) + ) </ins><span class="cx"> </span><span class="cx"> def last_inserted_ids(self): </span><span class="cx"> return self.context.last_inserted_ids </span></span></pre> </div> </div> </body> </html> |
