diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/database/schema/mm_20121015000000.py | 4 | ||||
| -rw-r--r-- | src/mailman/database/schema/sqlite_20121015000000_01.sql | 3 | ||||
| -rw-r--r-- | src/mailman/database/tests/test_migrations.py | 6 | ||||
| -rw-r--r-- | src/mailman/docs/NEWS.rst | 1 | ||||
| -rw-r--r-- | src/mailman/model/mailinglist.py | 1 | ||||
| -rw-r--r-- | src/mailman/styles/default.py | 1 |
6 files changed, 9 insertions, 7 deletions
diff --git a/src/mailman/database/schema/mm_20121015000000.py b/src/mailman/database/schema/mm_20121015000000.py index 7745b8d9b..dc688d33b 100644 --- a/src/mailman/database/schema/mm_20121015000000.py +++ b/src/mailman/database/schema/mm_20121015000000.py @@ -96,8 +96,10 @@ 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;') + store.execute('ALTER TABLE mailinglist DROP COLUMN private_roster;') + store.execute( + 'ALTER TABLE mailinglist DROP COLUMN admin_member_chunksize;') # 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 0526f9c8e..3e2410c3b 100644 --- a/src/mailman/database/schema/sqlite_20121015000000_01.sql +++ b/src/mailman/database/schema/sqlite_20121015000000_01.sql @@ -28,6 +28,7 @@ ALTER TABLE ban_backup ADD COLUMN list_id TEXT; -- REM unsubscribe_policy -- REM subscribe_auto_approval -- REM private_roster +-- REM admin_member_chunksize CREATE TABLE ml_backup ( id INTEGER NOT NULL, @@ -36,7 +37,6 @@ CREATE TABLE ml_backup ( allow_list_posts BOOLEAN, include_rfc2369_headers BOOLEAN, created_at TIMESTAMP, - admin_member_chunksize INTEGER, next_request_id INTEGER, next_digest_number INTEGER, digest_last_sent_at TIMESTAMP, @@ -137,7 +137,6 @@ INSERT INTO ml_backup SELECT allow_list_posts, include_rfc2369_headers, created_at, - admin_member_chunksize, next_request_id, next_digest_number, digest_last_sent_at, diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py index 16a536894..4b784d8b3 100644 --- a/src/mailman/database/tests/test_migrations.py +++ b/src/mailman/database/tests/test_migrations.py @@ -380,7 +380,8 @@ class TestMigration20121015Schema(MigrationTestBase): (), ('new_member_options', 'send_reminders', 'subscribe_policy', 'unsubscribe_policy', - 'subscribe_auto_approval', 'private_roster'), + 'subscribe_auto_approval', 'private_roster', + 'admin_member_chunksize'), ) def test_post_upgrade_column_migrations(self): @@ -394,7 +395,8 @@ class TestMigration20121015Schema(MigrationTestBase): '20121015000000'], ('new_member_options', 'send_reminders', 'subscribe_policy', 'unsubscribe_policy', - 'subscribe_auto_approval', 'private_roster'), + 'subscribe_auto_approval', 'private_roster', + 'admin_member_chunksize'), ()) diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst index 8acf68043..ecb3e1a57 100644 --- a/src/mailman/docs/NEWS.rst +++ b/src/mailman/docs/NEWS.rst @@ -81,6 +81,7 @@ Database - `mailinglist.unsubscribe_policy` - `mailinglist.subscribe_auto_approval` - `mailinglist.private_roster` + - `mailinglist.admin_member_chunksize` Interfaces ---------- diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py index 28c911619..1ffef716c 100644 --- a/src/mailman/model/mailinglist.py +++ b/src/mailman/model/mailinglist.py @@ -88,7 +88,6 @@ class MailingList(Model): anonymous_list = Bool() # Attributes not directly modifiable via the web u/i created_at = DateTime() - admin_member_chunksize = Int() # Attributes which are directly modifiable via the web u/i. The more # complicated attributes are currently stored as pickles, though that # will change as the schema and implementation is developed. diff --git a/src/mailman/styles/default.py b/src/mailman/styles/default.py index 9f0e3858c..bc67c13f9 100644 --- a/src/mailman/styles/default.py +++ b/src/mailman/styles/default.py @@ -85,7 +85,6 @@ from: .*@uplinkpro.com mlist.welcome_message_uri = 'mailman:///welcome.txt' mlist.goodbye_message_uri = '' mlist.obscure_addresses = True - mlist.admin_member_chunksize = 30 mlist.administrivia = True mlist.preferred_language = 'en' mlist.collapse_alternatives = True |