diff options
| -rw-r--r-- | src/mailman/config/schema.cfg | 1 | ||||
| -rw-r--r-- | src/mailman/database/alembic/env.py | 1 | ||||
| -rw-r--r-- | src/mailman/model/user.py | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg index 139963788..3316f54e0 100644 --- a/src/mailman/config/schema.cfg +++ b/src/mailman/config/schema.cfg @@ -204,7 +204,6 @@ class: mailman.database.sqlite.SQLiteDatabase url: sqlite:///$DATA_DIR/mailman.db debug: no - [logging.template] # This defines various log settings. The options available are: # diff --git a/src/mailman/database/alembic/env.py b/src/mailman/database/alembic/env.py index ffab0fed8..56f673803 100644 --- a/src/mailman/database/alembic/env.py +++ b/src/mailman/database/alembic/env.py @@ -34,7 +34,6 @@ from mailman.core import initialize from mailman.config import config from mailman.database.alembic import alembic_cfg from mailman.database.model import Model -from mailman.utilities.modules import expand_path from mailman.utilities.string import expand diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py index 576015dbe..ffd52fdfb 100644 --- a/src/mailman/model/user.py +++ b/src/mailman/model/user.py @@ -66,7 +66,10 @@ class User(Model): _preferred_address_id = Column( Integer, - ForeignKey('address.id', use_alter=True, name='_preferred_address')) + ForeignKey('address.id', use_alter=True, + name='_preferred_address', + ondelete="SET NULL")) + _preferred_address = relationship( 'Address', primaryjoin=(_preferred_address_id==Address.id), post_update=True) |