[Sqlalchemy-commits] [1425] sqlalchemy/branches/schema/lib/sqlalchemy: "column.original" factored do
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1425] sqlalchemy/branches/schema/lib/sqlalchemy: "column.original" factored down to come from the same Set as column.orig_set
|
From: <co...@sq...> - 2006-05-08 17:40:33
|
<!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>[1425] sqlalchemy/branches/schema/lib/sqlalchemy: "column.original" factored down to come from the same Set as column.orig_set</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1425</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-08 12:40:17 -0500 (Mon, 08 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>"column.original" factored down to come from the same Set as column.orig_set</pre> <h3>Modified Paths</h3> <ul> <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> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyschemapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/schema.py (1424 => 1425)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-05-08 17:12:43 UTC (rev 1424) +++ sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-05-08 17:40:17 UTC (rev 1425) </span><span class="lines">@@ -300,13 +300,11 @@ </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._original = None </del><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._original or s) </del><span class="cx"> columns = property(lambda self:[self]) </span><span class="cx"> </span><span class="cx"> def _derived_metadata(self): </span><span class="lines">@@ -364,8 +362,7 @@ </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._original = self.original - c._orig_set = self.orig_set </del><ins>+ 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 (1424 => 1425)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-08 17:12:43 UTC (rev 1424) +++ sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-08 17:40:17 UTC (rev 1425) </span><span class="lines">@@ -265,6 +265,7 @@ </span><span class="cx"> self[key] = value </span><span class="cx"> self.binds[key] = bindparam </span><span class="cx"> def get_original(self, key): </span><ins>+ """returns the given parameter as it was originally placed in this ClauseParameters object, without any Type conversion""" </ins><span class="cx"> return super(ClauseParameters, self).__getitem__(key) </span><span class="cx"> def __getitem__(self, key): </span><span class="cx"> v = super(ClauseParameters, self).__getitem__(key) </span><span class="lines">@@ -595,25 +596,36 @@ </span><span class="cx"> return True </span><span class="cx"> </span><span class="cx"> class ColumnElement(Selectable, CompareMixin): </span><del>- """represents a column element within the list of a Selectable's columns. Provides - default implementations for the things a "column" needs, including a "primary_key" flag, - a "foreign_key" accessor, an "original" accessor which represents the ultimate column - underlying a string of labeled/select-wrapped columns, and "columns" which returns a list - of the single column, providing the same list-based interface as a FromClause.""" - primary_key = property(lambda self:getattr(self, '_primary_key', False)) - foreign_key = property(lambda self:getattr(self, '_foreign_key', False)) </del><ins>+ """represents a column element within the list of a Selectable's columns. + A ColumnElement can either be directly associated with a TableClause, or + a free-standing textual column with no table, or is a "proxied" column, indicating + it is placed on a Selectable such as an Alias or Select statement and corresponds + to a TableClause attached column. in the case of a CompositeSelect, a ColumnElement + may correspond to several TableClause-attached columns. """ </ins><span class="cx"> </span><del>- columns = property(lambda self:[self]) </del><ins>+ primary_key = property(lambda self:getattr(self, '_primary_key', False), doc="primary key flag. indicates if this Column represents part or whole of a primary key.") + foreign_key = property(lambda self:getattr(self, '_foreign_key', False), doc="foreign key accessor. points to a ForeignKey object which represents a Foreign Key placed on this column") + columns = property(lambda self:[self], doc="Columns accessor which just returns self, to provide compatibility with Selectable objects.") </ins><span class="cx"> </span><del>- def _default_orig_set(self): </del><ins>+ def _get_orig_set(self): </ins><span class="cx"> try: </span><del>- return self._orig_set </del><ins>+ return self.__orig_set </ins><span class="cx"> except AttributeError: </span><del>- 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.") </del><ins>+ self.__orig_set = sets.Set([self]) + return self.__orig_set + def _set_orig_set(self, s): + if len(s) == 0: + s.add(self) + self.__orig_set = s + self.__original = list(s)[0] + def _get_original(self): + try: + return self.__original + except AttributeError: + self.__original = list(self.orig_set)[0] + return self.__original + orig_set = property(_get_orig_set, _set_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(_get_original, doc="Scalar version of orig_set, which is usually one element. If orig_set contains multiple columns, this will represent just one of the columns.") </ins><span class="cx"> </span><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="lines">@@ -623,8 +635,7 @@ </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><del>- co._original = self - co._orig_set = self.orig_set </del><ins>+ 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">@@ -1077,7 +1088,7 @@ </span><span class="cx"> key = property(lambda s: s.name) </span><span class="cx"> </span><span class="cx"> _label = property(lambda s: s.name) </span><del>- original = property(lambda s:s.obj.original) </del><ins>+ orig_set = property(lambda s:s.obj.orig_set) </ins><span class="cx"> def accept_visitor(self, visitor): </span><span class="cx"> self.obj.accept_visitor(visitor) </span><span class="cx"> visitor.visit_label(self) </span><span class="lines">@@ -1125,8 +1136,7 @@ </span><span class="cx"> return BindParamClause(self._label, obj, shortname = self.name, type=self.type) </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><del>- c._original = self.original - c._orig_set = self.orig_set </del><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">@@ -1269,7 +1279,7 @@ </span><span class="cx"> colset = sets.Set() </span><span class="cx"> self._col_map[col.name] = colset </span><span class="cx"> [colset.add(c) for c in col.orig_set] </span><del>- col._orig_set = colset </del><ins>+ col.orig_set = colset </ins><span class="cx"> return col </span><span class="cx"> </span><span class="cx"> def accept_visitor(self, visitor): </span></span></pre> </div> </div> </body> </html> |
