From 4d9d43b0f010015cf68d7285c7ffa55d20ada1fb Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 24 May 2022 21:26:51 +0200 Subject: [PATCH] Don't limit length (and fix migration) --- ...ations.py => f6a6004bf4b9_add_user_associations.py} | 10 +++++----- app/models/order.py | 2 +- app/models/user.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename app/migrations/versions/{5c8378aa4dff_add_user_associations.py => f6a6004bf4b9_add_user_associations.py} (70%) diff --git a/app/migrations/versions/5c8378aa4dff_add_user_associations.py b/app/migrations/versions/f6a6004bf4b9_add_user_associations.py similarity index 70% rename from app/migrations/versions/5c8378aa4dff_add_user_associations.py rename to app/migrations/versions/f6a6004bf4b9_add_user_associations.py index 24f52c7..e084687 100644 --- a/app/migrations/versions/5c8378aa4dff_add_user_associations.py +++ b/app/migrations/versions/f6a6004bf4b9_add_user_associations.py @@ -1,13 +1,13 @@ """Add user associations -Revision ID: 5c8378aa4dff +Revision ID: f6a6004bf4b9 Revises: 55013fe95bea -Create Date: 2022-05-20 21:32:47.786340 +Create Date: 2022-05-24 21:23:27.770365 """ # revision identifiers, used by Alembic. -revision = '5c8378aa4dff' +revision = 'f6a6004bf4b9' down_revision = '55013fe95bea' from alembic import op @@ -16,8 +16,8 @@ import sqlalchemy as sa def upgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.add_column('order', sa.Column('association', sa.String(length=120), nullable=False, default="")) - op.add_column('user', sa.Column('associations', sa.String(length=120), nullable=False, default="")) + op.add_column('order', sa.Column('association', sa.String(length=120), server_default='', nullable=False)) + op.add_column('user', sa.Column('associations', sa.String(), server_default='', nullable=False)) # ### end Alembic commands ### diff --git a/app/models/order.py b/app/models/order.py index 37407dd..c7b458e 100644 --- a/app/models/order.py +++ b/app/models/order.py @@ -27,7 +27,7 @@ class Order(db.Model): stoptime = db.Column(db.DateTime) public = db.Column(db.Boolean, default=True) slug = db.Column(db.String(7), default=generate_slug, unique=True) - association = db.Column(db.String(120), nullable=False) + association = db.Column(db.String(120), nullable=False, server_default="") items = db.relationship("OrderItem", backref="order", lazy="dynamic") diff --git a/app/models/user.py b/app/models/user.py index 964ba42..a45faeb 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -11,7 +11,7 @@ class User(db.Model): admin = db.Column(db.Boolean) bias = db.Column(db.Integer) # Assocation logic - associations = db.Column(db.String(120), nullable=False) + associations = db.Column(db.String(), nullable=False, server_default="") # Relations runs = db.relation(