From 8fc102429d724931c1d7a324271f9c33cdea5f45 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Fri, 16 Dec 2016 15:16:53 -0800 Subject: Modifications based on feedback from Barry. Also, the change to the value column of pendedkeyvalue from SAUnicode to SAUnicodeLarge is removed as it is a separate MR now. This will cause mysql CI to fail until that MR lands. --- .../database/alembic/versions/3002bac0c25a_dmarc_attributes.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/mailman/database') diff --git a/src/mailman/database/alembic/versions/3002bac0c25a_dmarc_attributes.py b/src/mailman/database/alembic/versions/3002bac0c25a_dmarc_attributes.py index b0c2297a0..06fcecf0a 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, SAUnicodeLarge +from mailman.database.types import Enum, SAUnicode from mailman.interfaces.mailinglist import DMARCModerationAction, FromIsList @@ -71,10 +71,6 @@ 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(): @@ -85,5 +81,3 @@ 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) -- cgit v1.2.3-70-g09d2