diff options
| author | Barry Warsaw | 2012-12-30 12:19:20 -0500 |
|---|---|---|
| committer | Barry Warsaw | 2012-12-30 12:19:20 -0500 |
| commit | 0f233dd350594228c34e3de60ae8820c38b236d7 (patch) | |
| tree | cb0ac2dfa851e972b32673c18b5c8f7cc2b669eb /src | |
| parent | fc662999d425e9347f59f676861ee44ad81c2623 (diff) | |
| download | mailman-0f233dd350594228c34e3de60ae8820c38b236d7.tar.gz mailman-0f233dd350594228c34e3de60ae8820c38b236d7.tar.zst mailman-0f233dd350594228c34e3de60ae8820c38b236d7.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/database/schema/mm_20121015000000.py | 9 | ||||
| -rw-r--r-- | src/mailman/database/schema/sqlite_20121015000000_01.sql | 3 | ||||
| -rw-r--r-- | src/mailman/database/tests/test_migrations.py | 5 | ||||
| -rw-r--r-- | src/mailman/docs/NEWS.rst | 4 | ||||
| -rw-r--r-- | src/mailman/model/mailinglist.py | 1 | ||||
| -rw-r--r-- | src/mailman/styles/default.py | 1 |
6 files changed, 12 insertions, 11 deletions
diff --git a/src/mailman/database/schema/mm_20121015000000.py b/src/mailman/database/schema/mm_20121015000000.py index 3e7b12555..1ef368bfc 100644 --- a/src/mailman/database/schema/mm_20121015000000.py +++ b/src/mailman/database/schema/mm_20121015000000.py @@ -17,10 +17,12 @@ """3.0b2 -> 3.0b3 schema migrations. -* bans.mailing_list -> bans.list_id +Renamed: + * bans.mailing_list -> bans.list_id -Added: -* mailinglist.style +Removed: + * mailinglist.new_member_options + * mailinglist.send_remindersn """ from __future__ import absolute_import, print_function, unicode_literals @@ -91,5 +93,6 @@ def upgrade_postgres(database, store, version, module_path): """.format(_make_listid(mailing_list), id)) store.execute('ALTER TABLE ban DROP COLUMN mailing_list;') store.execute('ALTER TABLE mailinglist DROP COLUMN new_member_options;') + store.execute('ALTER TABLE mailinglist DROP COLUMN send_reminders;') # Record the migration in the version table. database.load_schema(store, version, None, module_path) diff --git a/src/mailman/database/schema/sqlite_20121015000000_01.sql b/src/mailman/database/schema/sqlite_20121015000000_01.sql index d25f7c52a..5b3a00e0f 100644 --- a/src/mailman/database/schema/sqlite_20121015000000_01.sql +++ b/src/mailman/database/schema/sqlite_20121015000000_01.sql @@ -23,6 +23,7 @@ ALTER TABLE ban_backup ADD COLUMN list_id TEXT; -- REMOVALS from the mailinglist table. -- REM new_member_options +-- REM send_reminders CREATE TABLE ml_backup ( id INTEGER NOT NULL, @@ -113,7 +114,6 @@ CREATE TABLE ml_backup ( respond_to_post_requests BOOLEAN, scrub_nondigest BOOLEAN, send_goodbye_message BOOLEAN, - send_reminders BOOLEAN, send_welcome_message BOOLEAN, subject_prefix TEXT, subscribe_auto_approval BLOB, @@ -219,7 +219,6 @@ INSERT INTO ml_backup SELECT respond_to_post_requests, scrub_nondigest, send_goodbye_message, - send_reminders, send_welcome_message, subject_prefix, subscribe_auto_approval, diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py index f47ad6d3c..d8a210a67 100644 --- a/src/mailman/database/tests/test_migrations.py +++ b/src/mailman/database/tests/test_migrations.py @@ -378,7 +378,8 @@ class TestMigration20121015Schema(MigrationTestBase): self._missing_present('mailinglist', ['20121014999999'], (), - ('new_member_options',)) + ('new_member_options', 'send_reminders'), + ) def test_post_upgrade_column_migrations(self): self._missing_present('ban', @@ -389,7 +390,7 @@ class TestMigration20121015Schema(MigrationTestBase): self._missing_present('mailinglist', ['20121014999999', '20121015000000'], - ('new_member_options',), + ('new_member_options', 'send_reminders'), ()) diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst index 082bc7f12..d4ad867cb 100644 --- a/src/mailman/docs/NEWS.rst +++ b/src/mailman/docs/NEWS.rst @@ -73,8 +73,8 @@ Database -------- * The `ban` table now uses list-ids to cross-reference the mailing list, since these cannot change even if the mailing list is moved or renamed. - * The column `mailinglist.new_member_options` was unused, and has been - removed. + * The columns `mailinglist.new_member_options` and + `mailinglist.send_reminders` were unused, and have been removed. Interfaces ---------- diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py index 344cc7f8e..ae4918a95 100644 --- a/src/mailman/model/mailinglist.py +++ b/src/mailman/model/mailinglist.py @@ -183,7 +183,6 @@ class MailingList(Model): respond_to_post_requests = Bool() scrub_nondigest = Bool() send_goodbye_message = Bool() - send_reminders = Bool() send_welcome_message = Bool() subject_prefix = Unicode() subscribe_auto_approval = Pickle() diff --git a/src/mailman/styles/default.py b/src/mailman/styles/default.py index 6e4fc71b5..f8e94911e 100644 --- a/src/mailman/styles/default.py +++ b/src/mailman/styles/default.py @@ -69,7 +69,6 @@ class DefaultStyle: mlist.admin_immed_notify = True mlist.admin_notify_mchanges = False mlist.require_explicit_destination = True - mlist.send_reminders = True mlist.send_welcome_message = True mlist.send_goodbye_message = True mlist.bounce_matching_headers = """ |
