summaryrefslogtreecommitdiff
path: root/src/mailman/database
diff options
context:
space:
mode:
authorBarry Warsaw2012-12-30 12:57:46 -0500
committerBarry Warsaw2012-12-30 12:57:46 -0500
commit58d77cbb3ffa8df4f85d0c42a529f3c48cbd8810 (patch)
treec0ef1210078b1eb19ad58538a0881d51dba8e04e /src/mailman/database
parent5b6f92e726ee43453431e13e712deb7e4ecb20ef (diff)
downloadmailman-58d77cbb3ffa8df4f85d0c42a529f3c48cbd8810.tar.gz
mailman-58d77cbb3ffa8df4f85d0c42a529f3c48cbd8810.tar.zst
mailman-58d77cbb3ffa8df4f85d0c42a529f3c48cbd8810.zip
Remove mailinglist.private_roster.
Diffstat (limited to 'src/mailman/database')
-rw-r--r--src/mailman/database/schema/mm_20121015000000.py1
-rw-r--r--src/mailman/database/schema/sqlite_20121015000000_01.sql6
-rw-r--r--src/mailman/database/tests/test_migrations.py4
3 files changed, 7 insertions, 4 deletions
diff --git a/src/mailman/database/schema/mm_20121015000000.py b/src/mailman/database/schema/mm_20121015000000.py
index dd6d23ca7..7745b8d9b 100644
--- a/src/mailman/database/schema/mm_20121015000000.py
+++ b/src/mailman/database/schema/mm_20121015000000.py
@@ -96,6 +96,7 @@ def upgrade_postgres(database, store, version, module_path):
store.execute('ALTER TABLE mailinglist DROP COLUMN send_reminders;')
store.execute('ALTER TABLE mailinglist DROP COLUMN subscribe_policy;')
store.execute('ALTER TABLE mailinglist DROP COLUMN unsubscribe_policy;')
+ store.execute('ALTER TABLE mailinglist DROP COLUMN private_roster;')
store.execute(
'ALTER TABLE mailinglist DROP COLUMN subscribe_auto_approval;')
# Record the migration in the version table.
diff --git a/src/mailman/database/schema/sqlite_20121015000000_01.sql b/src/mailman/database/schema/sqlite_20121015000000_01.sql
index 73a56230b..0526f9c8e 100644
--- a/src/mailman/database/schema/sqlite_20121015000000_01.sql
+++ b/src/mailman/database/schema/sqlite_20121015000000_01.sql
@@ -24,6 +24,10 @@ ALTER TABLE ban_backup ADD COLUMN list_id TEXT;
-- REMOVALS from the mailinglist table.
-- REM new_member_options
-- REM send_reminders
+-- REM subscribe_policy
+-- REM unsubscribe_policy
+-- REM subscribe_auto_approval
+-- REM private_roster
CREATE TABLE ml_backup (
id INTEGER NOT NULL,
@@ -105,7 +109,6 @@ CREATE TABLE ml_backup (
posting_chain TEXT,
posting_pipeline TEXT,
preferred_language TEXT,
- private_roster BOOLEAN,
display_name TEXT,
reject_these_nonmembers BLOB,
reply_goes_to_list INTEGER,
@@ -207,7 +210,6 @@ INSERT INTO ml_backup SELECT
posting_chain,
posting_pipeline,
preferred_language,
- private_roster,
display_name,
reject_these_nonmembers,
reply_goes_to_list,
diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py
index 5b800caf7..16a536894 100644
--- a/src/mailman/database/tests/test_migrations.py
+++ b/src/mailman/database/tests/test_migrations.py
@@ -380,7 +380,7 @@ class TestMigration20121015Schema(MigrationTestBase):
(),
('new_member_options', 'send_reminders',
'subscribe_policy', 'unsubscribe_policy',
- 'subscribe_auto_approval'),
+ 'subscribe_auto_approval', 'private_roster'),
)
def test_post_upgrade_column_migrations(self):
@@ -394,7 +394,7 @@ class TestMigration20121015Schema(MigrationTestBase):
'20121015000000'],
('new_member_options', 'send_reminders',
'subscribe_policy', 'unsubscribe_policy',
- 'subscribe_auto_approval'),
+ 'subscribe_auto_approval', 'private_roster'),
())