diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-03-23 17:38:54 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-03-23 17:38:54 -0400 |
| commit | de529fb81cc80cd49666a80ef60de6015ff81c1c (patch) | |
| tree | 6bc932d2f4afef8b09fcee19cb324bdb1d61e14b /lib | |
| parent | 93da3087f1a068018a3c5a67f61dbbfa5178bdf0 (diff) | |
| download | sqlalchemy-de529fb81cc80cd49666a80ef60de6015ff81c1c.tar.gz | |
- 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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/engine/ddl.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/schema.py | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/sqlalchemy/engine/ddl.py b/lib/sqlalchemy/engine/ddl.py index dca183f9a..79958baae 100644 --- a/lib/sqlalchemy/engine/ddl.py +++ b/lib/sqlalchemy/engine/ddl.py @@ -51,7 +51,7 @@ class SchemaGenerator(DDLBase): tables = metadata.tables.values() collection = [t for t in sql_util.sort_tables(tables) if self._can_create_table(t)] - seq_coll = [s for s in metadata._sequences + seq_coll = [s for s in metadata._sequences.values() if s.column is None and self._can_create_sequence(s)] metadata.dispatch.before_create(metadata, self.connection, @@ -112,7 +112,7 @@ class SchemaDropper(DDLBase): tables = metadata.tables.values() collection = [t for t in reversed(sql_util.sort_tables(tables)) if self._can_drop_table(t)] - seq_coll = [s for s in metadata._sequences + seq_coll = [s for s in metadata._sequences.values() if s.column is None and self._can_drop_sequence(s)] metadata.dispatch.before_drop(metadata, self.connection, 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): |