self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-05-29 23:07:50 +02:00
Code Issues Releases Activity

Fix support for postgres and mysql

Browse Source
This commit is contained in:
kaiyou 2018-12-06 17:04:48 +01:00
parent a881a1a839
commit e022513a94
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/admin/mailu/models.py
View File

@ -24,10 +24,10 @@ class IdnaDomain(db.TypeDecorator):
""" Stores a Unicode string in it's IDNA representation (ASCII only) """ Stores a Unicode string in it's IDNA representation (ASCII only)
""" """
impl = db.String(80) impl = db.String(80, collation="NOCASE")
def process_bind_param(self, value, dialect): def process_bind_param(self, value, dialect):
return idna.encode(value).decode("ascii") return idna.encode(value).decode("ascii").lower()
def process_result_value(self, value, dialect): def process_result_value(self, value, dialect):
return idna.decode(value) return idna.decode(value)
@ -45,7 +45,7 @@ class IdnaEmail(db.TypeDecorator):
return "{0}@{1}".format( return "{0}@{1}".format(
localpart, localpart,
idna.encode(domain_name).decode('ascii'), idna.encode(domain_name).decode('ascii'),
) ).lower()
except ValueError: except ValueError:
pass pass

2
core/admin/migrations/versions/049fed905da7_.py
View File

@ -16,7 +16,7 @@ import sqlalchemy as sa
def upgrade(): def upgrade():
with op.batch_alter_table('user') as batch: with op.batch_alter_table('user') as batch:
batch.alter_column('email', type_=sa.String(length=255, collation="NOCASE")) batch.alter_column('email', type_=sa.String(length=255))
def downgrade(): def downgrade():

4
core/admin/migrations/versions/27ae2f102682_.py
View File

@ -35,7 +35,7 @@ def upgrade():
) )
# set default to 80% # set default to 80%
with op.batch_alter_table('user') as batch: with op.batch_alter_table('user') as batch:
batch.alter_column('spam_threshold', default=80.) batch.alter_column('spam_threshold', server_default="80.")
def downgrade(): def downgrade():
connection = op.get_bind() connection = op.get_bind()
@ -50,4 +50,4 @@ def downgrade():
) )
# set default to 10/15 # set default to 10/15
with op.batch_alter_table('user') as batch: with op.batch_alter_table('user') as batch:
batch.alter_column('spam_threshold', default=10.) batch.alter_column('spam_threshold', server_default="10.")

4
core/admin/migrations/versions/9c28df23f77e_.py
View File

@ -16,9 +16,9 @@ import sqlalchemy as sa
def upgrade(): def upgrade():
with op.batch_alter_table('user') as batch: with op.batch_alter_table('user') as batch:
batch.alter_column('email', type_=sa.String(length=255, collation="NOCASE")) batch.alter_column('email', type_=sa.String(length=255))
with op.batch_alter_table('alias') as batch: with op.batch_alter_table('alias') as batch:
batch.alter_column('email', type_=sa.String(length=255, collation="NOCASE")) batch.alter_column('email', type_=sa.String(length=255))
def downgrade(): def downgrade():

4
core/admin/migrations/versions/ff0417f4318f_.py
View File

@ -29,7 +29,7 @@ def upgrade():
sa.Column('updated_at', sa.Date(), nullable=True), sa.Column('updated_at', sa.Date(), nullable=True),
sa.Column('comment', sa.String(length=255), nullable=True), sa.Column('comment', sa.String(length=255), nullable=True),
sa.Column('localpart', sa.String(length=80), nullable=False), sa.Column('localpart', sa.String(length=80), nullable=False),
sa.Column('destination', sa.String(), nullable=False), sa.Column('destination', sa.String(length=1023), nullable=False),
sa.Column('domain_name', sa.String(length=80), nullable=False), sa.Column('domain_name', sa.String(length=80), nullable=False),
sa.Column('email', sa.String(length=255), nullable=False), sa.Column('email', sa.String(length=255), nullable=False),
sa.ForeignKeyConstraint(['domain_name'], ['domain.name'], ), sa.ForeignKeyConstraint(['domain_name'], ['domain.name'], ),
@ -64,7 +64,7 @@ def upgrade():
sa.Column('comment', sa.String(length=255), nullable=True), sa.Column('comment', sa.String(length=255), nullable=True),
sa.Column('id', sa.Integer(), nullable=False), sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_email', sa.String(length=255), nullable=False), sa.Column('user_email', sa.String(length=255), nullable=False),
sa.Column('protocol', sa.Enum('imap', 'pop3'), nullable=False), sa.Column('protocol', sa.Enum('imap', 'pop3', name='enum_protocol'), nullable=False),
sa.Column('host', sa.String(length=255), nullable=False), sa.Column('host', sa.String(length=255), nullable=False),
sa.Column('port', sa.Integer(), nullable=False), sa.Column('port', sa.Integer(), nullable=False),
sa.Column('tls', sa.Boolean(), nullable=False), sa.Column('tls', sa.Boolean(), nullable=False),

2
core/admin/requirements.txt
View File

@ -18,3 +18,5 @@ PyOpenSSL
dnspython dnspython
bcrypt bcrypt
tenacity tenacity
mysqlclient
psycopg2