* remove migrate command

* remove alembic.cfg, move contents to schema.cfg
* fix import errors in src/mailman/model/language.py
* add indexes
* change the previously wrong written tablename autoresponserecord
* change alembic_cfg to use schema.cfg instead of alembic.cfg

9 files changed, 22 insertions, 18 deletions

diff --git a/src/mailman/model/address.py b/src/mailman/model/address.py
index 20bd631f5..cc4ab6fd0 100644
--- a/src/mailman/model/address.py
+++ b/src/mailman/model/address.py
@@ -53,9 +53,9 @@ class Address(Model):
     _verified_on = Column('verified_on', DateTime)
     registered_on = Column(DateTime)
 
-    user_id = Column(Integer, ForeignKey('user.id'))
+    user_id = Column(Integer, ForeignKey('user.id'), index=True)
 
-    preferences_id = Column(Integer, ForeignKey('preferences.id'))
+    preferences_id = Column(Integer, ForeignKey('preferences.id'), index=True)
     preferences = relationship(
         'Preferences', backref=backref('address', uselist=False))
 
diff --git a/src/mailman/model/autorespond.py b/src/mailman/model/autorespond.py
index c74434f7b..2293f5dcd 100644
--- a/src/mailman/model/autorespond.py
+++ b/src/mailman/model/autorespond.py
@@ -44,14 +44,14 @@ from mailman.utilities.datetime import today
 class AutoResponseRecord(Model):
     """See `IAutoResponseRecord`."""
 
-    __tablename__ = 'autorespondrecord'
+    __tablename__ = 'autoresponserecord'
 
     id = Column(Integer, primary_key=True)
 
-    address_id = Column(Integer, ForeignKey('address.id'))
+    address_id = Column(Integer, ForeignKey('address.id'), index=True)
     address = relationship('Address')
 
-    mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'))
+    mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'), index=True)
     mailing_list = relationship('MailingList')
 
     response_type = Column(Enum(Response))
diff --git a/src/mailman/model/language.py b/src/mailman/model/language.py
index 15450c936..f4d48fc97 100644
--- a/src/mailman/model/language.py
+++ b/src/mailman/model/language.py
@@ -28,8 +28,8 @@ __all__ = [
 from sqlalchemy import Column, Integer, Unicode
 from zope.interface import implementer
 
-from mailman.database import Model
-from mailman.interfaces import ILanguage
+from mailman.database.model import Model
+from mailman.interfaces.languages import ILanguage
 
 
 
diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py
index d00cf3d31..fe84ff5b5 100644
--- a/src/mailman/model/mailinglist.py
+++ b/src/mailman/model/mailinglist.py
@@ -504,9 +504,12 @@ class AcceptableAlias(Model):
 
     id = Column(Integer, primary_key=True)
 
-    mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'))
+    mailing_list_id = Column(Integer,
+                             ForeignKey('mailinglist.id'),
+                             index=True,
+                             nullable=False)
     mailing_list = relationship('MailingList', backref='acceptable_alias')
-    alias = Column(Unicode)
+    alias = Column(Unicode, index=True, nullable=False)
 
     def __init__(self, mailing_list, alias):
         self.mailing_list = mailing_list
@@ -558,9 +561,10 @@ class ListArchiver(Model):
 
     id = Column(Integer, primary_key=True)
 
-    mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'))
+    mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'),
+                             index=True, nullable=False)
     mailing_list = relationship('MailingList')
-    name = Column(Unicode)
+    name = Column(Unicode, nullable=False)
     _is_enabled = Column(Boolean)
 
     def __init__(self, mailing_list, archiver_name, system_archiver):
diff --git a/src/mailman/model/mime.py b/src/mailman/model/mime.py
index 906af91ea..dc6a54437 100644
--- a/src/mailman/model/mime.py
+++ b/src/mailman/model/mime.py
@@ -43,7 +43,7 @@ class ContentFilter(Model):
 
     id = Column(Integer, primary_key=True)
 
-    mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'))
+    mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'), index=True)
     mailing_list = relationship('MailingList')
 
     filter_type = Column(Enum(FilterType))
diff --git a/src/mailman/model/pending.py b/src/mailman/model/pending.py
index 691e94fd9..49b12c16a 100644
--- a/src/mailman/model/pending.py
+++ b/src/mailman/model/pending.py
@@ -56,7 +56,7 @@ class PendedKeyValue(Model):
     id = Column(Integer, primary_key=True)
     key = Column(Unicode)
     value = Column(Unicode)
-    pended_id = Column(Integer, ForeignKey('pended.id'))
+    pended_id = Column(Integer, ForeignKey('pended.id'), index=True)
 
     def __init__(self, key, value):
         self.key = key
diff --git a/src/mailman/model/requests.py b/src/mailman/model/requests.py
index 7f996dded..6b130196d 100644
--- a/src/mailman/model/requests.py
+++ b/src/mailman/model/requests.py
@@ -149,14 +149,14 @@ class ListRequests:
 class _Request(Model):
     """Table for mailing list hold requests."""
 
-    __tablename__ = 'request'
+    __tablename__ = '_request'
 
     id = Column(Integer, primary_key=True)
     key = Column(Unicode)
     request_type = Column(Enum(RequestType))
     data_hash = Column(LargeBinary)
 
-    mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'))
+    mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'), index=True)
     mailing_list = relationship('MailingList')
 
     def __init__(self, key, request_type, mailing_list, data_hash):
diff --git a/src/mailman/model/uid.py b/src/mailman/model/uid.py
index 29d8e7021..72ddd7b5a 100644
--- a/src/mailman/model/uid.py
+++ b/src/mailman/model/uid.py
@@ -50,7 +50,7 @@ class UID(Model):
     __tablename__ = 'uid'
 
     id = Column(Integer, primary_key=True)
-    uid = Column(UUID)
+    uid = Column(UUID, index=True)
 
     @dbconnection
     def __init__(self, store, uid):
diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py
index ffd52fdfb..5fe61ddd4 100644
--- a/src/mailman/model/user.py
+++ b/src/mailman/model/user.py
@@ -57,7 +57,7 @@ class User(Model):
     id = Column(Integer, primary_key=True)
     display_name = Column(Unicode)
     _password = Column('password', LargeBinary) # TODO : was RawStr()
-    _user_id = Column(UUID)
+    _user_id = Column(UUID, index=True)
     _created_on = Column(DateTime)
 
     addresses = relationship(
@@ -74,7 +74,7 @@ class User(Model):
         'Address', primaryjoin=(_preferred_address_id==Address.id),
         post_update=True)
 
-    preferences_id = Column(Integer, ForeignKey('preferences.id'))
+    preferences_id = Column(Integer, ForeignKey('preferences.id'), index=True)
     preferences = relationship(
         'Preferences', backref=backref('user', uselist=False))