diff --git a/app/models.py b/app/models.py index ecc2670e0..d8b364489 100644 --- a/app/models.py +++ b/app/models.py @@ -1035,7 +1035,7 @@ class JobStatistics(db.Model): __tablename__ = 'job_statistics' id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4) - job_id = db.Column(UUID(as_uuid=True), db.ForeignKey('jobs.id'), index=True, unique=True) + job_id = db.Column(UUID(as_uuid=True), db.ForeignKey('jobs.id'), index=True, unique=True, nullable=False) job = db.relationship('Job', backref=db.backref('job_statistics', lazy='dynamic')) emails_sent = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0) emails_delivered = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0) diff --git a/migrations/versions/0083_add_job_stats.py b/migrations/versions/0083_add_job_stats.py index cf028ded6..808b75c29 100644 --- a/migrations/versions/0083_add_job_stats.py +++ b/migrations/versions/0083_add_job_stats.py @@ -1,8 +1,8 @@ """empty message Revision ID: 0083_add_job_stats -Revises: 0080_fix_rate_start_date -Create Date: 2017-05-09 12:44:43.173269 +Revises: 0082_add_go_live_template +Create Date: 2017-05-12 13:16:14.147368 """ @@ -17,7 +17,7 @@ from sqlalchemy.dialects import postgresql def upgrade(): op.create_table('job_statistics', sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False), - sa.Column('job_id', postgresql.UUID(as_uuid=True), nullable=True), + sa.Column('job_id', postgresql.UUID(as_uuid=True), nullable=False), sa.Column('emails_sent', sa.BigInteger(), nullable=False), sa.Column('emails_delivered', sa.BigInteger(), nullable=False), sa.Column('emails_failed', sa.BigInteger(), nullable=False), @@ -26,6 +26,7 @@ def upgrade(): sa.Column('sms_failed', sa.BigInteger(), nullable=False), sa.Column('letters_sent', sa.BigInteger(), nullable=False), sa.Column('letters_failed', sa.BigInteger(), nullable=False), + sa.Column('created_at', sa.DateTime(), nullable=True), sa.Column('updated_at', sa.DateTime(), nullable=True), sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ), sa.PrimaryKeyConstraint('id') diff --git a/migrations/versions/0084_add_created_to_job_stats.py b/migrations/versions/0084_add_created_to_job_stats.py deleted file mode 100644 index c7470bef1..000000000 --- a/migrations/versions/0084_add_created_to_job_stats.py +++ /dev/null @@ -1,22 +0,0 @@ -"""empty message - -Revision ID: 0084_add_created_to_job_stats -Revises: 0081_add_job_stats -Create Date: 2017-05-11 15:05:53.420946 - -""" - -# revision identifiers, used by Alembic. -revision = '0084_add_created_to_job_stats' -down_revision = '0083_add_job_stats' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - op.add_column('job_statistics', sa.Column('created_at', sa.DateTime(), nullable=True)) - - -def downgrade(): - op.drop_column('job_statistics', 'created_at')