summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-02-27 13:50:47 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-02-27 13:50:47 -0500
commitc2f86c92b1fbb4e855161bd509d3057f86ed7a74 (patch)
tree7993fd70b986b711e1f1e6da9677bb89427b434a /lib/sqlalchemy/sql/base.py
parentb6428219c663e0eb0bf44817391d7a8fc1c60d43 (diff)
downloadsqlalchemy-c2f86c92b1fbb4e855161bd509d3057f86ed7a74.tar.gz
restore the contracts of update/extend to the degree that the same column identity
isn't appended to the list. reflection makes use of this.
Diffstat (limited to 'lib/sqlalchemy/sql/base.py')
-rw-r--r--lib/sqlalchemy/sql/base.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py
index c2bdd8b1c..379f61ed7 100644
--- a/lib/sqlalchemy/sql/base.py
+++ b/lib/sqlalchemy/sql/base.py
@@ -522,17 +522,19 @@ class ColumnCollection(util.OrderedProperties):
raise NotImplementedError()
def remove(self, column):
- raise NotImplementedError()
+ del self._data[column.key]
+ self._all_col_set.remove(column)
+ self._all_columns[:] = [c for c in self._all_columns if c is not column]
def update(self, iter):
cols = list(iter)
- self._all_columns.extend(c for label, c in cols)
+ self._all_columns.extend(c for label, c in cols if c not in self._all_col_set)
self._all_col_set.update(c for label, c in cols)
self._data.update((label, c) for label, c in cols)
def extend(self, iter):
cols = list(iter)
- self._all_columns.extend(cols)
+ self._all_columns.extend(c for c in cols if c not in self._all_col_set)
self._all_col_set.update(cols)
self._data.update((c.key, c) for c in cols)