From 6f8325800459f83999dfe441d5d01e388c08c497 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Tue, 4 Oct 2016 10:47:34 +0100 Subject: [PATCH] Update Template.version and TemplateHistory.version nullable=False to match the db --- app/models.py | 4 ++-- migrations/versions/0056_minor_updates.py | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/models.py b/app/models.py index 2ed7cd771..445977251 100644 --- a/app/models.py +++ b/app/models.py @@ -278,7 +278,7 @@ class Template(db.Model): subject = db.Column(db.Text, index=False, unique=False, nullable=True) created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False) created_by = db.relationship('User') - version = db.Column(db.Integer, default=1) + version = db.Column(db.Integer, default=1, nullable=False) class TemplateHistory(db.Model): @@ -296,7 +296,7 @@ class TemplateHistory(db.Model): subject = db.Column(db.Text) created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False) created_by = db.relationship('User') - version = db.Column(db.Integer, primary_key=True) + version = db.Column(db.Integer, primary_key=True, nullable=False) MMG_PROVIDER = "mmg" diff --git a/migrations/versions/0056_minor_updates.py b/migrations/versions/0056_minor_updates.py index 8de03f9f1..a253e69c5 100644 --- a/migrations/versions/0056_minor_updates.py +++ b/migrations/versions/0056_minor_updates.py @@ -25,9 +25,6 @@ def upgrade(): op.alter_column('services_history', 'research_mode', existing_type=sa.BOOLEAN(), nullable=False) - op.alter_column('templates', 'version', - existing_type=sa.INTEGER(), - nullable=True) op.create_foreign_key('templates_history_service_id_fkey', 'templates_history', 'services', ['service_id'], ['id']) op.create_foreign_key('templates_history_created_by_id_fkey', 'templates_history', 'users', ['created_by_id'], ['id']) ### end Alembic commands ### @@ -37,9 +34,6 @@ def downgrade(): ### commands auto generated by Alembic - please adjust! ### op.drop_constraint('templates_history_service_id_fkey', 'templates_history', type_='foreignkey') op.drop_constraint('templates_history_created_by_id_fkey', 'templates_history', type_='foreignkey') - op.alter_column('templates', 'version', - existing_type=sa.INTEGER(), - nullable=False) op.alter_column('services_history', 'research_mode', existing_type=sa.BOOLEAN(), nullable=True)