[Sqlalchemy-commits] [1420] sqlalchemy/branches/schema/test: column.original is being migrated to co
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1420] sqlalchemy/branches/schema/test: column.original is being migrated to column.orig_set, which is a Set of "original" columns, 99% of the time the same as "original", except for a compositeselect in which case its the full set of proxied columns.
|
From: <co...@sq...> - 2006-05-08 04:01:42
|
<!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>[1420] sqlalchemy/branches/schema/test: column.original is being migrated to column.orig_set, which is a Set of "original" columns, 99% of the time the same as "original", except for a compositeselect in which case its the full set of proxied columns.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1420</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-07 23:01:19 -0500 (Sun, 07 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>column.original is being migrated to column.orig_set, which is a Set of "original" columns, 99% of the time the same as "original", except for a compositeselect in which case its the full set of proxied columns. polymorphic column translation in Mapper now moved from key-based to column-translation based.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemaexamplespolymorphpolymorphpy">sqlalchemy/branches/schema/examples/polymorph/polymorph.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormpropertiespy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyschemapy">sqlalchemy/branches/schema/lib/sqlalchemy/schema.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemysqlpy">sqlalchemy/branches/schema/lib/sqlalchemy/sql.py</a></li> <li><a href="#sqlalchemybranchesschematestselectablepy">sqlalchemy/branches/schema/test/selectable.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemaexamplespolymorphpolymorphpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/examples/polymorph/polymorph.py (1419 => 1420)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/examples/polymorph/polymorph.py 2006-05-06 19:55:38 UTC (rev 1419) +++ sqlalchemy/branches/schema/examples/polymorph/polymorph.py 2006-05-08 04:01:19 UTC (rev 1420) </span><span class="lines">@@ -1,5 +1,5 @@ </span><span class="cx"> from sqlalchemy import * </span><del>-import sys </del><ins>+import sys, sets </ins><span class="cx"> </span><span class="cx"> # this example illustrates a polymorphic load of two classes, where each class has a very </span><span class="cx"> # different set of properties </span><span class="lines">@@ -63,7 +63,8 @@ </span><span class="cx"> 'person':people.select(people.c.type=='person'), </span><span class="cx"> }, None, 'pjoin') </span><span class="cx"> </span><del>-person_mapper = mapper(Person, people, select_table=person_join, polymorphic_on=person_join.c.type, polymorphic_identity='person') </del><ins>+#person_mapper = mapper(Person, people, select_table=person_join, polymorphic_on=person_join.c.type, polymorphic_identity='person') +person_mapper = mapper(Person, people, select_table=person_join,polymorphic_on=person_join.c.type, polymorphic_identity='person') </ins><span class="cx"> mapper(Engineer, engineers, inherits=person_mapper, polymorphic_identity='engineer') </span><span class="cx"> mapper(Manager, managers, inherits=person_mapper, polymorphic_identity='manager') </span><span class="cx"> </span><span class="lines">@@ -71,7 +72,7 @@ </span><span class="cx"> 'employees': relation(Person, lazy=False, private=True, backref='company') </span><span class="cx"> }) </span><span class="cx"> </span><del>-session = create_session() </del><ins>+session = create_session(echo_uow=False) </ins><span class="cx"> c = Company(name='company1') </span><span class="cx"> c.employees.append(Manager(name='pointy haired boss', status='AAB', manager_name='manager1')) </span><span class="cx"> c.employees.append(Engineer(name='dilbert', status='BBA', engineer_name='engineer1', primary_language='java')) </span><span class="lines">@@ -79,14 +80,15 @@ </span><span class="cx"> c.employees.append(Engineer(name='wally', status='CGG', engineer_name='engineer2', primary_language='python')) </span><span class="cx"> c.employees.append(Manager(name='jsmith', status='ABA', manager_name='manager2')) </span><span class="cx"> session.save(c) </span><ins>+print session.new </ins><span class="cx"> session.flush() </span><del>- </del><ins>+#sys.exit() </ins><span class="cx"> session.clear() </span><span class="cx"> </span><span class="cx"> c = session.query(Company).get(1) </span><span class="cx"> for e in c.employees: </span><span class="cx"> print e, e._instance_key, e.company </span><del>- </del><ins>+assert sets.Set([e.name for e in c.employees]) == sets.Set(['pointy haired boss', 'dilbert', 'joesmith', 'wally', 'jsmith']) </ins><span class="cx"> print "\n" </span><span class="cx"> </span><span class="cx"> dilbert = session.query(Person).get_by(name='dilbert') </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py (1419 => 1420)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-06 19:55:38 UTC (rev 1419) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-08 04:01:19 UTC (rev 1420) </span><span class="lines">@@ -172,7 +172,6 @@ </span><span class="cx"> # TODO: need select_table, local_table properly accounted for when custom primary key is sent </span><span class="cx"> else: </span><span class="cx"> for t in self.tables + [self.mapped_table, self.select_table]: </span><del>- print "SET UP PKS FOR ", str(t) </del><span class="cx"> try: </span><span class="cx"> l = self.pks_by_table[t] </span><span class="cx"> except KeyError: </span><span class="lines">@@ -217,6 +216,7 @@ </span><span class="cx"> # column at index 0 determines which result column is used to populate the object </span><span class="cx"> # attribute, in the case of mapping against a join with column names repeated </span><span class="cx"> # (and particularly in an inheritance relationship) </span><ins>+ # TODO: clarify this comment </ins><span class="cx"> prop.columns.insert(0, column) </span><span class="cx"> #prop.columns.append(column) </span><span class="cx"> else: </span><span class="lines">@@ -227,19 +227,8 @@ </span><span class="cx"> </span><span class="cx"> # its a ColumnProperty - match the ultimate table columns </span><span class="cx"> # back to the property </span><del>- proplist = self.columntoproperty.setdefault(column.original, []) - proplist.append(prop) - - for column in self.mapped_table.columns: - if not self.columntoproperty.has_key(column.original): - proplist = [] - self.columntoproperty[column.original] = proplist - # id like it to use this somehow - #col = self.select_table._get_col_by_original(column.original) - try: - prop = self.props[column.key] - except KeyError: - raise exceptions.ArgumentError("Selectable '%s' does not contain local table column '%s'" % (self.select_table, column.key)) </del><ins>+ for c in column.orig_set: + proplist = self.columntoproperty.setdefault(c.original, []) </ins><span class="cx"> proplist.append(prop) </span><span class="cx"> </span><span class="cx"> if not non_primary and (not mapper_registry.has_key(self.class_key) or self.is_primary or (inherits is not None and inherits._is_primary_mapper())): </span><span class="lines">@@ -374,8 +363,9 @@ </span><span class="cx"> self.props[key] = prop </span><span class="cx"> if isinstance(prop, ColumnProperty): </span><span class="cx"> for col in prop.columns: </span><del>- proplist = self.columntoproperty.setdefault(col.original, []) - proplist.append(prop) </del><ins>+ for c in col.orig_set: + proplist = self.columntoproperty.setdefault(c.original, []) + proplist.append(prop) </ins><span class="cx"> </span><span class="cx"> if init: </span><span class="cx"> prop.init(key, self) </span><span class="lines">@@ -864,10 +854,9 @@ </span><span class="cx"> bare keynames to accomplish this. So far this works for the various polymorphic </span><span class="cx"> examples.""" </span><span class="cx"> newrow = util.DictDecorator(row) </span><del>- for c in self.select_table.c: - newrow[c.name] = row[c] </del><span class="cx"> for c in tomapper.select_table.c: </span><del>- newrow[c] = newrow[c.name] </del><ins>+ c2 = self.select_table._get_col_by_original(c) + newrow[c] = row[c2] </ins><span class="cx"> return newrow </span><span class="cx"> </span><span class="cx"> def populate_instance(self, session, instance, row, identitykey, imap, isnew, frommapper=None): </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py (1419 => 1420)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py 2006-05-06 19:55:38 UTC (rev 1419) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py 2006-05-08 04:01:19 UTC (rev 1420) </span><span class="lines">@@ -609,7 +609,7 @@ </span><span class="cx"> return map.keys() </span><span class="cx"> map = {} </span><span class="cx"> for c in self.eagertarget.c: </span><del>- parent = self.target._get_col_by_original(c.original) </del><ins>+ parent = self.target._get_col_by_original(c) </ins><span class="cx"> map[parent] = c </span><span class="cx"> map[parent._label] = c </span><span class="cx"> map[parent.name] = c </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyschemapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/schema.py (1419 => 1420)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-05-06 19:55:38 UTC (rev 1419) +++ sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-05-08 04:01:19 UTC (rev 1420) </span><span class="lines">@@ -300,14 +300,14 @@ </span><span class="cx"> if self.index is not None and self.unique is not None: </span><span class="cx"> raise ArgumentError("Column may not define both index and unique") </span><span class="cx"> self._foreign_key = None </span><del>- self._orig = None </del><ins>+ self._original = None </ins><span class="cx"> self._parent = None </span><span class="cx"> if len(kwargs): </span><span class="cx"> raise ArgumentError("Unknown arguments passed to Column: " + repr(kwargs.keys())) </span><span class="cx"> </span><span class="cx"> primary_key = util.SimpleProperty('_primary_key') </span><span class="cx"> foreign_key = util.SimpleProperty('_foreign_key') </span><del>- original = property(lambda s: s._orig or s) </del><ins>+ original = property(lambda s: s._original or s) </ins><span class="cx"> parent = property(lambda s:s._parent or s) </span><span class="cx"> columns = property(lambda self:[self]) </span><span class="cx"> </span><span class="lines">@@ -366,7 +366,8 @@ </span><span class="cx"> fk = self.foreign_key.copy() </span><span class="cx"> c = Column(name or self.name, self.type, fk, self.default, key = name or self.key, primary_key = self.primary_key, nullable = self.nullable, hidden = self.hidden) </span><span class="cx"> c.table = selectable </span><del>- c._orig = self.original </del><ins>+ c._original = self.original + c._orig_set = self.orig_set </ins><span class="cx"> c._parent = self </span><span class="cx"> if not c.hidden: </span><span class="cx"> selectable.columns[c.key] = c </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/sql.py (1419 => 1420)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-06 19:55:38 UTC (rev 1419) +++ sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-08 04:01:19 UTC (rev 1420) </span><span class="lines">@@ -8,7 +8,7 @@ </span><span class="cx"> </span><span class="cx"> from sqlalchemy import util, exceptions </span><span class="cx"> from sqlalchemy import types as sqltypes </span><del>-import string, re, random </del><ins>+import string, re, random, sets </ins><span class="cx"> types = __import__('types') </span><span class="cx"> </span><span class="cx"> __all__ = ['text', 'table', 'column', 'func', 'select', 'update', 'insert', 'delete', 'join', 'and_', 'or_', 'not_', 'between_', 'cast', 'union', 'union_all', 'null', 'desc', 'asc', 'outerjoin', 'alias', 'subquery', 'literal', 'bindparam', 'exists'] </span><span class="lines">@@ -602,9 +602,22 @@ </span><span class="cx"> of the single column, providing the same list-based interface as a FromClause.""" </span><span class="cx"> primary_key = property(lambda self:getattr(self, '_primary_key', False)) </span><span class="cx"> foreign_key = property(lambda self:getattr(self, '_foreign_key', False)) </span><del>- original = property(lambda self:getattr(self, '_original', self)) - parent = property(lambda self:getattr(self, '_parent', self)) </del><ins>+ + # TODO: parent can probably go away + parent = property(lambda self:getattr(self, '_parent', self), doc="the immediate parent column of this column") + </ins><span class="cx"> columns = property(lambda self:[self]) </span><ins>+ + def _default_orig_set(self): + try: + return self._orig_set + except AttributeError: + self._orig_set = sets.Set([self.original]) + return self._orig_set + # TODO: merge orig_set and original into just one Set + orig_set = property(_default_orig_set, doc="""a Set containing Table-bound, non-proxied ColumnElements for which this ColumnElement is a proxy. In all cases except for a column proxied from a Union (i.e. CompoundSelect), this set will be just one element.""") + original = property(lambda self:getattr(self, '_original', self), doc="Scalar version of orig_set, which is usually one element. For a column proxied through a CompoundSelect, this will be just one of the columns in orig_set.") + </ins><span class="cx"> def _make_proxy(self, selectable, name=None): </span><span class="cx"> """creates a new ColumnElement representing this ColumnElement as it appears in the select list </span><span class="cx"> of an enclosing selectable. The default implementation returns a ColumnClause if a name is given, </span><span class="lines">@@ -613,6 +626,8 @@ </span><span class="cx"> select list of an enclosing selectable.""" </span><span class="cx"> if name is not None: </span><span class="cx"> co = ColumnClause(name, selectable) </span><ins>+ co._original = self + co._orig_set = self.orig_set </ins><span class="cx"> selectable.columns[name]= co </span><span class="cx"> return co </span><span class="cx"> else: </span><span class="lines">@@ -645,17 +660,18 @@ </span><span class="cx"> self._oid_column = self._locate_oid_column() </span><span class="cx"> return self._oid_column </span><span class="cx"> def _get_col_by_original(self, column, raiseerr=True): </span><del>- """given a column which is a ColumnClause object attached to a TableClause object - (i.e. an "original" column), return the Column object from this - Selectable which corresponds to that original Column, or None if this Selectable - does not contain the column.""" - try: - return self.original_columns[column.original] - except KeyError: </del><ins>+ """given a ColumnElement, return the ColumnElement object from this + Selectable which corresponds to that original Column via a proxy relationship.""" + for c in column.orig_set: + try: + return self.original_columns[c] + except KeyError: + pass + else: </ins><span class="cx"> if not raiseerr: </span><span class="cx"> return None </span><span class="cx"> else: </span><del>- raise exceptions.InvalidRequestError("cant get orig for " + str(column) + " with table " + column.table.name + " from table " + self.name) </del><ins>+ raise exceptions.InvalidRequestError("cant get orig for " + str(column) + " with table " + str(column.table.name) + " from table " + str(self.name)) </ins><span class="cx"> </span><span class="cx"> def _get_exported_attribute(self, name): </span><span class="cx"> try: </span><span class="lines">@@ -667,10 +683,12 @@ </span><span class="cx"> c = property(lambda s:s._get_exported_attribute('_columns')) </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><del>- original_columns = property(lambda s:s._get_exported_attribute('_orig_cols')) </del><ins>+ original_columns = property(lambda s:s._get_exported_attribute('_orig_cols'), doc="a dictionary mapping an original Table-bound column to a proxied column in this FromClause.") </ins><span class="cx"> oid_column = property(_get_oid_column) </span><span class="cx"> </span><span class="cx"> def _export_columns(self): </span><ins>+ """this method is called the first time any of the "exported attrbutes" are called. it receives from the Selectable + a list of all columns to be exported and creates "proxy" columns for each one.""" </ins><span class="cx"> if hasattr(self, '_columns'): </span><span class="cx"> # TODO: put a mutex here ? this is a key place for threading probs </span><span class="cx"> return </span><span class="lines">@@ -683,7 +701,8 @@ </span><span class="cx"> if column.is_selectable(): </span><span class="cx"> for co in column.columns: </span><span class="cx"> cp = self._proxy_column(co) </span><del>- self._orig_cols[co.original] = cp </del><ins>+ for ci in cp.orig_set: + self._orig_cols[ci] = cp </ins><span class="cx"> if self.oid_column is not None: </span><span class="cx"> self._orig_cols[self.oid_column.original] = self.oid_column </span><span class="cx"> def _exportable_columns(self): </span><span class="lines">@@ -939,7 +958,6 @@ </span><span class="cx"> def __init__(self, left, right, onclause=None, isouter = False): </span><span class="cx"> self.left = left </span><span class="cx"> self.right = right </span><del>- </del><span class="cx"> # TODO: if no onclause, do NATURAL JOIN </span><span class="cx"> if onclause is None: </span><span class="cx"> self.onclause = self._match_primaries(left, right) </span><span class="lines">@@ -947,6 +965,7 @@ </span><span class="cx"> self.onclause = onclause </span><span class="cx"> self.isouter = isouter </span><span class="cx"> </span><ins>+ name = property(lambda s: "Join object on " + s.left.name + " " + s.right.name) </ins><span class="cx"> def _locate_oid_column(self): </span><span class="cx"> return self.left.oid_column </span><span class="cx"> </span><span class="lines">@@ -1034,6 +1053,7 @@ </span><span class="cx"> return None </span><span class="cx"> </span><span class="cx"> def _exportable_columns(self): </span><ins>+ #return self.selectable._exportable_columns() </ins><span class="cx"> return self.selectable.columns </span><span class="cx"> </span><span class="cx"> def accept_visitor(self, visitor): </span><span class="lines">@@ -1110,6 +1130,7 @@ </span><span class="cx"> def _make_proxy(self, selectable, name = None): </span><span class="cx"> c = ColumnClause(name or self.name, selectable, hidden=self.hidden) </span><span class="cx"> c._original = self.original </span><ins>+ c._orig_set = self.orig_set </ins><span class="cx"> if not self.hidden: </span><span class="cx"> selectable.columns[c.name] = c </span><span class="cx"> return c </span><span class="lines">@@ -1193,6 +1214,8 @@ </span><span class="cx"> </span><span class="cx"> class SelectBaseMixin(object): </span><span class="cx"> """base class for Select and CompoundSelects""" </span><ins>+ def __init__(self): + self.name = None </ins><span class="cx"> def order_by(self, *clauses): </span><span class="cx"> if len(clauses) == 1 and clauses[0] is None: </span><span class="cx"> self.order_by_clause = ClauseList() </span><span class="lines">@@ -1217,6 +1240,7 @@ </span><span class="cx"> </span><span class="cx"> class CompoundSelect(SelectBaseMixin, FromClause): </span><span class="cx"> def __init__(self, keyword, *selects, **kwargs): </span><ins>+ SelectBaseMixin.__init__(self) </ins><span class="cx"> self.keyword = keyword </span><span class="cx"> self.selects = selects </span><span class="cx"> self.use_labels = kwargs.pop('use_labels', False) </span><span class="lines">@@ -1228,7 +1252,7 @@ </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><del>- </del><ins>+ self._col_map = {} </ins><span class="cx"> def _locate_oid_column(self): </span><span class="cx"> return self.selects[0].oid_column </span><span class="cx"> </span><span class="lines">@@ -1239,10 +1263,19 @@ </span><span class="cx"> </span><span class="cx"> def _proxy_column(self, column): </span><span class="cx"> if self.use_labels: </span><del>- return column._make_proxy(self, name=column._label) </del><ins>+ col = column._make_proxy(self, name=column._label) </ins><span class="cx"> else: </span><del>- return column._make_proxy(self, name=column.name) </del><ins>+ col = column._make_proxy(self, name=column.name) </ins><span class="cx"> </span><ins>+ try: + colset = self._col_map[col.name] + except KeyError: + colset = sets.Set() + self._col_map[col.name] = colset + [colset.add(c) for c in col.orig_set] + col._orig_set = colset + return col + </ins><span class="cx"> def accept_visitor(self, visitor): </span><span class="cx"> self.order_by_clause.accept_visitor(visitor) </span><span class="cx"> self.group_by_clause.accept_visitor(visitor) </span><span class="lines">@@ -1261,9 +1294,9 @@ </span><span class="cx"> """represents a SELECT statement, with appendable clauses, as well as </span><span class="cx"> the ability to execute itself and return a result set.""" </span><span class="cx"> def __init__(self, columns=None, whereclause = None, from_obj = [], order_by = None, group_by=None, having=None, use_labels = False, distinct=False, for_update=False, engine=None, limit=None, offset=None, scalar=False, correlate=True): </span><ins>+ SelectBaseMixin.__init__(self) </ins><span class="cx"> self._froms = util.OrderedDict() </span><span class="cx"> self.use_labels = use_labels </span><del>- self.name = None </del><span class="cx"> self.whereclause = None </span><span class="cx"> self.having = None </span><span class="cx"> self._engine = engine </span><span class="lines">@@ -1350,8 +1383,6 @@ </span><span class="cx"> def _exportable_columns(self): </span><span class="cx"> return self._raw_columns </span><span class="cx"> def _proxy_column(self, column): </span><del>- if column.name == 'oid': - raise "hi" </del><span class="cx"> if self.use_labels: </span><span class="cx"> return column._make_proxy(self, name=column._label) </span><span class="cx"> else: </span></span></pre></div> <a id="sqlalchemybranchesschematestselectablepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/selectable.py (1419 => 1420)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/selectable.py 2006-05-06 19:55:38 UTC (rev 1419) +++ sqlalchemy/branches/schema/test/selectable.py 2006-05-08 04:01:19 UTC (rev 1420) </span><span class="lines">@@ -15,6 +15,7 @@ </span><span class="cx"> Column('col1', Integer, primary_key=True), </span><span class="cx"> Column('col2', String(20)), </span><span class="cx"> Column('col3', Integer), </span><ins>+ Column('colx', Integer), </ins><span class="cx"> redefine=True </span><span class="cx"> ) </span><span class="cx"> </span><span class="lines">@@ -22,6 +23,7 @@ </span><span class="cx"> Column('col1', Integer, primary_key=True), </span><span class="cx"> Column('col2', Integer, ForeignKey('table1.col1')), </span><span class="cx"> Column('col3', String(20)), </span><ins>+ Column('coly', Integer), </ins><span class="cx"> redefine=True </span><span class="cx"> ) </span><span class="cx"> </span><span class="lines">@@ -36,6 +38,53 @@ </span><span class="cx"> print str(j) </span><span class="cx"> self.assert_(criterion.compare(j.onclause)) </span><span class="cx"> </span><ins>+ def testunion(self): + # tests that we can correspond a column in a Select statement with a certain Table, against + # a column in a Union where one of its underlying Selects matches to that same Table + u = select([table.c.col1, table.c.col2, table.c.col3, table.c.colx, null().label('coly')]).union( + select([table2.c.col1, table2.c.col2, table2.c.col3, null().label('colx'), table2.c.coly]) + ) + s1 = table.select(use_labels=True) + s2 = table2.select(use_labels=True) + print ["%d %s" % (id(c),c.key) for c in u.c] + c = u._get_col_by_original(s1.c.table1_col2) + print "%d %s" % (id(c), c.key) + assert u._get_col_by_original(s1.c.table1_col2) is u.c.col2 + assert u._get_col_by_original(s2.c.table2_col2) is u.c.col2 + + def testaliasunion(self): + # same as testunion, except its an alias of the union + u = select([table.c.col1, table.c.col2, table.c.col3, table.c.colx, null().label('coly')]).union( + select([table2.c.col1, table2.c.col2, table2.c.col3, null().label('colx'), table2.c.coly]) + ).alias('analias') + s1 = table.select(use_labels=True) + s2 = table2.select(use_labels=True) + print ["%d %s" % (id(c),c.key) for c in u.c] +# c = u._get_col_by_original(s1.c.table1_col2) + print "%d %s" % (id(c), c.key) + assert u._get_col_by_original(s1.c.table1_col2) is u.c.col2 + assert u._get_col_by_original(s2.c.table2_col2) is u.c.col2 + + def testselectunion(self): + # like testaliasunion, but off a Select off the union. + u = select([table.c.col1, table.c.col2, table.c.col3, table.c.colx, null().label('coly')]).union( + select([table2.c.col1, table2.c.col2, table2.c.col3, null().label('colx'), table2.c.coly]) + ).alias('analias') + s = select([u]) + s1 = table.select(use_labels=True) + s2 = table2.select(use_labels=True) + assert s._get_col_by_original(s1.c.table1_col2) is s.c.col2 + assert s._get_col_by_original(s2.c.table2_col2) is s.c.col2 + + def testunionagainstjoin(self): + # same as testunion, except its an alias of the union + u = select([table.c.col1, table.c.col2, table.c.col3, table.c.colx, null().label('coly')]).union( + select([table2.c.col1, table2.c.col2, table2.c.col3, null().label('colx'), table2.c.coly]) + ).alias('analias') + j1 = table.join(table2) + assert u._get_col_by_original(j1.c.table1_colx) is u.c.colx + assert j1._get_col_by_original(u.c.colx) is j1.c.table1_colx + </ins><span class="cx"> def testjoin(self): </span><span class="cx"> a = join(table, table2) </span><span class="cx"> print str(a.select(use_labels=True)) </span></span></pre> </div> </div> </body> </html> |
