[Sqlalchemy-commits] [1257] sqlalchemy/trunk/lib/sqlalchemy/sql.py: factored oid column into a consi
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1257] sqlalchemy/trunk/lib/sqlalchemy/sql.py: factored oid column into a consistent late-bound pattern, fixing [ticket:146]
|
From: <co...@sq...> - 2006-04-04 21:40:27
|
<!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>[1257] sqlalchemy/trunk/lib/sqlalchemy/sql.py: factored oid column into a consistent late-bound pattern, fixing [ticket:146]</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1257</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-04 16:40:18 -0500 (Tue, 04 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>factored oid column into a consistent late-bound pattern, fixing [ticket:146]</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1256 => 1257)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-04-04 00:28:33 UTC (rev 1256) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-04-04 21:40:18 UTC (rev 1257) </span><span class="lines">@@ -611,6 +611,13 @@ </span><span class="cx"> return Join(self, right, isouter = True, *args, **kwargs) </span><span class="cx"> def alias(self, name=None): </span><span class="cx"> return Alias(self, name) </span><ins>+ def _locate_oid_column(self): + """subclasses override this to return an appropriate OID column""" + return None + def _get_oid_column(self): + if not hasattr(self, '_oid_column'): + self._oid_column = self._locate_oid_column() + return self._oid_column </ins><span class="cx"> def _get_col_by_original(self, column, raiseerr=True): </span><span class="cx"> """given a column which is a schema.Column object attached to a schema.Table object </span><span class="cx"> (i.e. an "original" column), return the Column object from this </span><span class="lines">@@ -635,6 +642,7 @@ </span><span class="cx"> primary_key = property(lambda s:s._get_exported_attribute('_primary_key')) </span><span class="cx"> foreign_keys = property(lambda s:s._get_exported_attribute('_foreign_keys')) </span><span class="cx"> original_columns = property(lambda s:s._get_exported_attribute('_orig_cols')) </span><ins>+ oid_column = property(_get_oid_column) </ins><span class="cx"> </span><span class="cx"> def _export_columns(self): </span><span class="cx"> if hasattr(self, '_columns'): </span><span class="lines">@@ -912,7 +920,8 @@ </span><span class="cx"> self.onclause = onclause </span><span class="cx"> self.isouter = isouter </span><span class="cx"> </span><del>- oid_column = property(lambda s:s.left.oid_column) </del><ins>+ def _locate_oid_column(self): + return self.left.oid_column </ins><span class="cx"> </span><span class="cx"> def _exportable_columns(self): </span><span class="cx"> return [c for c in self.left.columns] + [c for c in self.right.columns] </span><span class="lines">@@ -990,11 +999,13 @@ </span><span class="cx"> n = n[0:15] </span><span class="cx"> alias = n + "_" + hex(random.randint(0, 65535))[2:] </span><span class="cx"> self.name = alias </span><ins>+ + def _locate_oid_column(self): </ins><span class="cx"> if self.selectable.oid_column is not None: </span><del>- self.oid_column = self.selectable.oid_column._make_proxy(self) </del><ins>+ return self.selectable.oid_column._make_proxy(self) </ins><span class="cx"> else: </span><del>- self.oid_column = None - </del><ins>+ return None + </ins><span class="cx"> def _exportable_columns(self): </span><span class="cx"> return self.selectable.columns </span><span class="cx"> </span><span class="lines">@@ -1094,18 +1105,16 @@ </span><span class="cx"> def append_column(self, c): </span><span class="cx"> self._columns[c.text] = c </span><span class="cx"> c.table = self </span><del>- def _oid_col(self): </del><ins>+ def _locate_oid_column(self): </ins><span class="cx"> if self.engine is None: </span><span class="cx"> return None </span><del>- # OID remains a little hackish so far - if not hasattr(self, '_oid_column'): - if self.engine.oid_column_name() is not None: - self._oid_column = schema.Column(self.engine.oid_column_name(), sqltypes.Integer, hidden=True) - self._oid_column._set_parent(self) - self._orig_columns()[self._oid_column.original] = self._oid_column - else: - self._oid_column = None - return self._oid_column </del><ins>+ if self.engine.oid_column_name() is not None: + _oid_column = schema.Column(self.engine.oid_column_name(), sqltypes.Integer, hidden=True) + _oid_column._set_parent(self) + self._orig_columns()[_oid_column.original] = _oid_column + return _oid_column + else: + return None </ins><span class="cx"> def _orig_columns(self): </span><span class="cx"> try: </span><span class="cx"> return self._orig_cols </span><span class="lines">@@ -1119,7 +1128,6 @@ </span><span class="cx"> primary_key = property(lambda s:s._primary_key) </span><span class="cx"> foreign_keys = property(lambda s:s._foreign_keys) </span><span class="cx"> original_columns = property(_orig_columns) </span><del>- oid_column = property(_oid_col) </del><span class="cx"> </span><span class="cx"> def _clear(self): </span><span class="cx"> """clears all attributes on this TableClause so that new items can be added again""" </span><span class="lines">@@ -1193,13 +1201,15 @@ </span><span class="cx"> self.parens = kwargs.pop('parens', False) </span><span class="cx"> self.correlate = kwargs.pop('correlate', False) </span><span class="cx"> self.for_update = kwargs.pop('for_update', False) </span><del>- self.oid_column = selects[0].oid_column </del><span class="cx"> for s in self.selects: </span><span class="cx"> s.group_by(None) </span><span class="cx"> s.order_by(None) </span><span class="cx"> self.group_by(*kwargs.get('group_by', [None])) </span><span class="cx"> self.order_by(*kwargs.get('order_by', [None])) </span><span class="cx"> </span><ins>+ def _locate_oid_column(self): + return self.selects[0].oid_column + </ins><span class="cx"> def _exportable_columns(self): </span><span class="cx"> for s in self.selects: </span><span class="cx"> for c in s.c: </span><span class="lines">@@ -1235,7 +1245,6 @@ </span><span class="cx"> self.whereclause = None </span><span class="cx"> self.having = None </span><span class="cx"> self._engine = engine </span><del>- self.oid_column = None </del><span class="cx"> self.limit = limit </span><span class="cx"> self.offset = offset </span><span class="cx"> self.for_update = for_update </span><span class="lines">@@ -1345,11 +1354,15 @@ </span><span class="cx"> def append_from(self, fromclause): </span><span class="cx"> if type(fromclause) == str: </span><span class="cx"> fromclause = FromClause(from_name = fromclause) </span><del>- if self.oid_column is None and hasattr(fromclause, 'oid_column'): - self.oid_column = fromclause.oid_column </del><span class="cx"> fromclause.accept_visitor(self._correlator) </span><span class="cx"> fromclause._process_from_dict(self._froms, True) </span><del>- </del><ins>+ def _locate_oid_column(self): + for f in self._froms.values(): + oid = f.oid_column + if oid is not None: + return oid + else: + return None </ins><span class="cx"> def _get_froms(self): </span><span class="cx"> return [f for f in self._froms.values() if f is not self and (self._correlated is None or not self._correlated.has_key(f))] </span><span class="cx"> froms = property(lambda s: s._get_froms()) </span></span></pre> </div> </div> </body> </html> |
