2 files changed, 8 insertions, 1 deletions

diff --git a/src/mailman/database/schema/mm_20120407000000.py b/src/mailman/database/schema/mm_20120407000000.py
index bfeb1060b..555d35ea2 100644
--- a/src/mailman/database/schema/mm_20120407000000.py
+++ b/src/mailman/database/schema/mm_20120407000000.py
@@ -61,7 +61,7 @@ def upgrade_sqlite(database, store, version, module_path):
             archive_policy = int(ArchivePolicy.public)
         store.execute(
             'update ml_backup set '
-            '    nntp_moderation = {0}, '
+            '    newsgroup_moderation = {0}, '
             '    nntp_prefix_subject_too = {1}, '
             '    archive_policy = {2} '
             'where id = {2};'.format(news_moderation, news_prefix, 
diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py
index 5333083f2..bf3decc88 100644
--- a/src/mailman/database/tests/test_migrations.py
+++ b/src/mailman/database/tests/test_migrations.py
@@ -108,6 +108,13 @@ class TestMigration20120407(unittest.TestCase):
             database.initialize()
         # Load all the database SQL to just before ours.
         database.load_migrations('20120406999999')
+        # Populate the test database with a domain and a mailing list.
+        with temporary_db(database):
+            getUtility(IDomainManager).add(
+                'example.com', 'An example domain.',
+                'http://lists.example.com', 'postmaster@example.com')
+            mlist = create_list('test@example.com')
+            del mlist
         database.commit()
         # Load all migrations, up to and including this one.
         database.load_migrations('20120407000000')