diff options
| author | Barry Warsaw | 2012-07-25 12:23:29 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2012-07-25 12:23:29 -0400 |
| commit | 9ef8a1268f1b2902ad46852937dd7bc977c5b2b1 (patch) | |
| tree | 62ba81c9694fb41581bbaab95a9662cc73798a2d /src/mailman/database/schema | |
| parent | 5598b9eea196e4085aa91aaf8a0cacaffa200355 (diff) | |
| download | mailman-9ef8a1268f1b2902ad46852937dd7bc977c5b2b1.tar.gz mailman-9ef8a1268f1b2902ad46852937dd7bc977c5b2b1.tar.zst mailman-9ef8a1268f1b2902ad46852937dd7bc977c5b2b1.zip | |
Very nearly there with PostgreSQL support for testing the beta2 migration.
- Improve migration logging
- Disable pre_reset() and post_reset() on migrations, which might need to be
re-enabled for SQLite support.
- Be sure to record the migration version in PostgreSQL.
- Parameterize the Error that will occur.
- Better sample data for PostgreSQL and SQLite, which have different formats.
Diffstat (limited to 'src/mailman/database/schema')
| -rw-r--r-- | src/mailman/database/schema/mm_00000000000000_base.py | 12 | ||||
| -rw-r--r-- | src/mailman/database/schema/mm_20120407000000.py | 14 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/mailman/database/schema/mm_00000000000000_base.py b/src/mailman/database/schema/mm_00000000000000_base.py index ef448d620..f98b30a8d 100644 --- a/src/mailman/database/schema/mm_00000000000000_base.py +++ b/src/mailman/database/schema/mm_00000000000000_base.py @@ -38,11 +38,11 @@ def upgrade(database, store, version, module_path): -def pre_reset(store): - global _helper - from mailman.testing.database import ResetHelper - _helper = ResetHelper(VERSION, store) +## def pre_reset(store): +## global _helper +## from mailman.testing.database import ResetHelper +## _helper = ResetHelper(VERSION, store) -def post_reset(store): - _helper.restore(store) +## def post_reset(store): +## _helper.restore(store) diff --git a/src/mailman/database/schema/mm_20120407000000.py b/src/mailman/database/schema/mm_20120407000000.py index ad0515a5d..017141683 100644 --- a/src/mailman/database/schema/mm_20120407000000.py +++ b/src/mailman/database/schema/mm_20120407000000.py @@ -125,14 +125,16 @@ def upgrade_postgres(database, store, version, module_path): # Now drop the old columns. store.execute('ALTER TABLE mailinglist DROP COLUMN archive;') store.execute('ALTER TABLE mailinglist DROP COLUMN archive_private;') + # Record the migration in the version table. + database.load_schema(store, version, None, module_path) -def pre_reset(store): - global _helper - from mailman.testing.database import ResetHelper - _helper = ResetHelper(VERSION, store) +## def pre_reset(store): +## global _helper +## from mailman.testing.database import ResetHelper +## _helper = ResetHelper(VERSION, store) -def post_reset(store): - _helper.restore(store) +## def post_reset(store): +## _helper.restore(store) |