From de529fb81cc80cd49666a80ef60de6015ff81c1c Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 23 Mar 2011 17:38:54 -0400 Subject: - adjust the previous checkin a bit. need to transfer sequences over from pickle even if they are *not* restated. its necessary here to do a "replacement" scheme when an incoming sequence replaces the previous. Theoretically we could do what Table does here, i.e. use a singleton constructor, but this is heavyhanded. The most recent sequence placed in is the winner is likely the most expected behavior. --- lib/sqlalchemy/schema.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/schema.py') diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index c8d00f407..1da43c6b1 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -1486,6 +1486,7 @@ class Sequence(DefaultGenerator): self.quote = quote self.schema = schema self.metadata = metadata + self._key = _get_table_key(name, schema) if metadata: self._set_metadata(metadata) @@ -1520,7 +1521,7 @@ class Sequence(DefaultGenerator): def _set_metadata(self, metadata): self.metadata = metadata - self.metadata._sequences.add(self) + self.metadata._sequences[self._key] = self @property def bind(self): @@ -2099,7 +2100,7 @@ class MetaData(SchemaItem): """ self.tables = util.immutabledict() self._schemas = set() - self._sequences = set() + self._sequences = {} self.bind = bind if reflect: if not bind: @@ -2131,12 +2132,13 @@ class MetaData(SchemaItem): if t.schema is not None]) def __getstate__(self): - return {'tables': self.tables, 'schemas':self._schemas} + return {'tables': self.tables, 'schemas':self._schemas, + 'sequences':self._sequences} def __setstate__(self, state): self.tables = state['tables'] self._bind = None - self._sequences = set() + self._sequences = state['sequences'] self._schemas = state['schemas'] def is_bound(self): -- cgit v1.2.1