mirror of
https://github.com/sqlalchemy/sqlalchemy.git
synced 2026-05-27 02:52:53 -04:00
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.
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -454,6 +454,36 @@ class ColumnCollectionTest(fixtures.TestBase):
|
||||
# the same as the "_all_columns" collection.
|
||||
eq_(list(cc), [c1, c2b, c3])
|
||||
|
||||
def test_extend_existing(self):
|
||||
cc = sql.ColumnCollection()
|
||||
|
||||
c1, c2, c3, c4, c5 = column('c1'), column('c2'), column('c3'), column('c4'), column('c5')
|
||||
|
||||
cc.extend([c1, c2])
|
||||
eq_(cc._all_columns, [c1, c2])
|
||||
|
||||
cc.extend([c3])
|
||||
eq_(cc._all_columns, [c1, c2, c3])
|
||||
cc.extend([c4, c2, c5])
|
||||
|
||||
eq_(cc._all_columns, [c1, c2, c3, c4, c5])
|
||||
|
||||
def test_update_existing(self):
|
||||
cc = sql.ColumnCollection()
|
||||
|
||||
c1, c2, c3, c4, c5 = column('c1'), column('c2'), column('c3'), column('c4'), column('c5')
|
||||
|
||||
cc.update([('c1', c1), ('c2', c2)])
|
||||
eq_(cc._all_columns, [c1, c2])
|
||||
|
||||
cc.update([('c3', c3)])
|
||||
eq_(cc._all_columns, [c1, c2, c3])
|
||||
cc.update([('c4', c4), ('c2', c2), ('c5', c5)])
|
||||
|
||||
eq_(cc._all_columns, [c1, c2, c3, c4, c5])
|
||||
|
||||
|
||||
|
||||
class LRUTest(fixtures.TestBase):
|
||||
|
||||
def test_lru(self):
|
||||
|
||||
Reference in New Issue
Block a user