summaryrefslogtreecommitdiff
path: root/src/mailman/database/schema
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/database/schema')
-rw-r--r--src/mailman/database/schema/mm_20121015000000.py4
-rw-r--r--src/mailman/database/schema/sqlite_20121015000000_01.sql6
2 files changed, 4 insertions, 6 deletions
diff --git a/src/mailman/database/schema/mm_20121015000000.py b/src/mailman/database/schema/mm_20121015000000.py
index 1ef368bfc..dd6d23ca7 100644
--- a/src/mailman/database/schema/mm_20121015000000.py
+++ b/src/mailman/database/schema/mm_20121015000000.py
@@ -94,5 +94,9 @@ def upgrade_postgres(database, store, version, module_path):
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;')
+ 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 subscribe_auto_approval;')
# 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 5b3a00e0f..73a56230b 100644
--- a/src/mailman/database/schema/sqlite_20121015000000_01.sql
+++ b/src/mailman/database/schema/sqlite_20121015000000_01.sql
@@ -116,12 +116,9 @@ CREATE TABLE ml_backup (
send_goodbye_message BOOLEAN,
send_welcome_message BOOLEAN,
subject_prefix TEXT,
- subscribe_auto_approval BLOB,
- subscribe_policy INTEGER,
topics BLOB,
topics_bodylines_limit INTEGER,
topics_enabled BOOLEAN,
- unsubscribe_policy INTEGER,
welcome_message_uri TEXT,
archive_policy INTEGER,
list_id TEXT,
@@ -221,12 +218,9 @@ INSERT INTO ml_backup SELECT
send_goodbye_message,
send_welcome_message,
subject_prefix,
- subscribe_auto_approval,
- subscribe_policy,
topics,
topics_bodylines_limit,
topics_enabled,
- unsubscribe_policy,
welcome_message_uri,
archive_policy,
list_id,