scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-04 03:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #836 from Mailu/revert-835-schema-maxUserQuota-1

Browse Source 
Revert "Change quota columns type to BigInteger "
This commit is contained in:
Tim Möhlmann
2019-01-15 14:50:26 +02:00
committed by GitHub
parent a7ec234686 11d6d38328
commit fc9509a2c5
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@ class Domain(Base):
backref=db.backref('manager_of'), lazy='dynamic') backref=db.backref('manager_of'), lazy='dynamic')
max_users = db.Column(db.Integer, nullable=False, default=-1) max_users = db.Column(db.Integer, nullable=False, default=-1)
max_aliases = db.Column(db.Integer, nullable=False, default=-1) max_aliases = db.Column(db.Integer, nullable=False, default=-1)
max_quota_bytes = db.Column(db.BigInteger(), nullable=False, default=0) max_quota_bytes = db.Column(db.Integer(), nullable=False, default=0)
signup_enabled = db.Column(db.Boolean(), nullable=False, default=False) signup_enabled = db.Column(db.Boolean(), nullable=False, default=False)
@property @property
@@ -307,8 +307,8 @@ class User(Base, Email):
domain = db.relationship(Domain, domain = db.relationship(Domain,
backref=db.backref('users', cascade='all, delete-orphan')) backref=db.backref('users', cascade='all, delete-orphan'))
password = db.Column(db.String(255), nullable=False) password = db.Column(db.String(255), nullable=False)
quota_bytes = db.Column(db.BigInteger(), nullable=False, default=10**9) quota_bytes = db.Column(db.Integer(), nullable=False, default=10**9)
quota_bytes_used = db.Column(db.BigInteger(), nullable=False, default=0) quota_bytes_used = db.Column(db.Integer(), nullable=False, default=0)
global_admin = db.Column(db.Boolean(), nullable=False, default=False) global_admin = db.Column(db.Boolean(), nullable=False, default=False)
enabled = db.Column(db.Boolean(), nullable=False, default=True) enabled = db.Column(db.Boolean(), nullable=False, default=True)

2
core/admin/migrations/versions/2335c80a6bc3_.py
View File

@@ -15,7 +15,7 @@ import sqlalchemy as sa
def upgrade(): def upgrade():
op.add_column('domain', sa.Column('max_quota_bytes', sa.BigInteger(), nullable=False, server_default='0')) op.add_column('domain', sa.Column('max_quota_bytes', sa.Integer(), nullable=False, server_default='0'))
def downgrade(): def downgrade():

2
core/admin/migrations/versions/25fd6c7bcb4a_.py
View File

@@ -20,7 +20,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.add_column(sa.Column('quota_bytes_used', sa.BigInteger(), nullable=False, server_default='0')) batch.add_column(sa.Column('quota_bytes_used', sa.Integer(), nullable=False, server_default='0'))
def downgrade(): def downgrade():

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

@@ -41,7 +41,7 @@ def upgrade():
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('password', sa.String(length=255), nullable=False), sa.Column('password', sa.String(length=255), nullable=False),
sa.Column('quota_bytes', sa.BigInteger(), nullable=False), sa.Column('quota_bytes', sa.Integer(), nullable=False),
sa.Column('global_admin', sa.Boolean(), nullable=False), sa.Column('global_admin', sa.Boolean(), nullable=False),
sa.Column('enable_imap', sa.Boolean(), nullable=False), sa.Column('enable_imap', sa.Boolean(), nullable=False),
sa.Column('enable_pop', sa.Boolean(), nullable=False), sa.Column('enable_pop', sa.Boolean(), nullable=False),