Merge "New cron type for audit interval"

watcher/db/sqlalchemy/alembic/versions/d098df6021e2_cron_support_for_audit.py

@@ -0,0 +1,26 @@
+"""Add cron support for audit table
+
+Revision ID: d098df6021e2
+Revises: 0f6042416884
+Create Date: 2017-06-08 16:21:35.746752
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = 'd098df6021e2'
+down_revision = '0f6042416884'
+
+
+def upgrade():
+    op.alter_column('audits', 'interval', existing_type=sa.String(36),
+                    nullable=True)
+    op.add_column('audits',
+                  sa.Column('next_run_time', sa.DateTime(), nullable=True))
+
+
+def downgrade():
+    op.alter_column('audits', 'interval', existing_type=sa.Integer(),
+                    nullable=True)
+    op.drop_column('audits', 'next_run_time')

watcher/db/sqlalchemy/models.py

@@ -173,11 +173,12 @@ class Audit(Base):
     audit_type = Column(String(20))
     state = Column(String(20), nullable=True)
     parameters = Column(JSONEncodedDict, nullable=True)
-    interval = Column(Integer, nullable=True)
+    interval = Column(String(36), nullable=True)
     goal_id = Column(Integer, ForeignKey('goals.id'), nullable=False)
     strategy_id = Column(Integer, ForeignKey('strategies.id'), nullable=True)
     scope = Column(JSONEncodedList, nullable=True)
     auto_trigger = Column(Boolean, nullable=False)
+    next_run_time = Column(DateTime, nullable=True)
 
     goal = orm.relationship(Goal, foreign_keys=goal_id, lazy=None)
     strategy = orm.relationship(Strategy, foreign_keys=strategy_id, lazy=None)