diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/database/alembic/versions/51b7f92bd06c_initial.py | 4 | ||||
| -rw-r--r-- | src/mailman/database/tests/test_factory.py | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py b/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py index c5b3e01c5..226bff7f6 100644 --- a/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py +++ b/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py @@ -17,7 +17,9 @@ import sqlalchemy as sa def upgrade(): ### commands auto generated by Alembic - please adjust! ### op.drop_table('version') - op.drop_column('mailinglist', 'acceptable_aliases_id') + if op.get_bind().dialect.name != "sqlite": + # SQLite does not support dropping columns + op.drop_column('mailinglist', 'acceptable_aliases_id') op.create_index(op.f('ix_user__user_id'), 'user', ['_user_id'], unique=False) op.drop_index('ix_user_user_id', table_name='user') ### end Alembic commands ### diff --git a/src/mailman/database/tests/test_factory.py b/src/mailman/database/tests/test_factory.py index 723d82985..bb37d01c9 100644 --- a/src/mailman/database/tests/test_factory.py +++ b/src/mailman/database/tests/test_factory.py @@ -31,7 +31,7 @@ import alembic.command from mock import Mock from sqlalchemy import MetaData, Table, Column, Integer, Unicode from sqlalchemy.schema import Index -from sqlalchemy.exc import ProgrammingError +from sqlalchemy.exc import ProgrammingError, OperationalError from mailman.config import config from mailman.testing.layers import ConfigLayer @@ -100,8 +100,10 @@ class TestSchemaManager(unittest.TestCase): Model.metadata.remove(version) try: Index("ix_user_user_id").drop(bind=config.db.engine) - except ProgrammingError as e: - pass # non-existant + except (ProgrammingError, OperationalError) as e: + # non-existant (PGSQL raises a ProgrammingError, while SQLite + # raises an OperationalError) + pass config.db.commit() |