2 files changed, 9 insertions, 3 deletions

diff --git a/src/mailman/database/alembic/versions/3002bac0c25a_dmarc_attributes.py b/src/mailman/database/alembic/versions/3002bac0c25a_dmarc_attributes.py
index 06fcecf0a..b0c2297a0 100644
--- a/src/mailman/database/alembic/versions/3002bac0c25a_dmarc_attributes.py
+++ b/src/mailman/database/alembic/versions/3002bac0c25a_dmarc_attributes.py
@@ -10,7 +10,7 @@ import sqlalchemy as sa
 
 from alembic import op
 from mailman.database.helpers import exists_in_db
-from mailman.database.types import Enum, SAUnicode
+from mailman.database.types import Enum, SAUnicode, SAUnicodeLarge
 from mailman.interfaces.mailinglist import DMARCModerationAction, FromIsList
 
 
@@ -71,6 +71,10 @@ def upgrade():
         dmarc_wrapped_message_text=op.inline_literal(''),
         from_is_list=op.inline_literal(FromIsList.none),
         )))
+    # Adding another rule can make the rule Hits/Misses too long for MySQL
+    # SaUnicode.
+    with op.batch_alter_table('pendedkeyvalue') as batch_op:
+        batch_op.alter_column('value', type_=SAUnicodeLarge)
 
 
 def downgrade():
@@ -81,3 +85,5 @@ def downgrade():
         batch_op.drop_column('dmarc_moderation_notice')
         batch_op.drop_column('dmarc_wrapped_message_text')
         batch_op.drop_column('from_is_list')
+    with op.batch_alter_table('pendedkeyvalue') as batch_op:
+        batch_op.alter_column('value', type_=SAUnicode)
diff --git a/src/mailman/model/pending.py b/src/mailman/model/pending.py
index 7e7f0b2eb..3df28af06 100644
--- a/src/mailman/model/pending.py
+++ b/src/mailman/model/pending.py
@@ -24,7 +24,7 @@ from mailman import public
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
-from mailman.database.types import SAUnicode
+from mailman.database.types import SAUnicode, SAUnicodeLarge
 from mailman.interfaces.pending import (
     IPendable, IPended, IPendedKeyValue, IPendings)
 from mailman.utilities.datetime import now
@@ -47,7 +47,7 @@ class PendedKeyValue(Model):
 
     id = Column(Integer, primary_key=True)
     key = Column(SAUnicode, index=True)
-    value = Column(SAUnicode, index=True)
+    value = Column(SAUnicodeLarge, index=True)
     pended_id = Column(Integer, ForeignKey('pended.id'), index=True)
 
     def __init__(self, key, value):