From 73ec5269135ebf09559ff9ceb29e3290bea2c43c Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 17 Jul 2018 15:30:18 -0700 Subject: [PATCH] Fix db migration 3dda56f1c4c6 (#5415) --- ...a56f1c4c6_migrate_num_period_compare_and_period_.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/superset/migrations/versions/3dda56f1c4c6_migrate_num_period_compare_and_period_.py b/superset/migrations/versions/3dda56f1c4c6_migrate_num_period_compare_and_period_.py index 8bb6f100683a8..c2a0d9af27962 100644 --- a/superset/migrations/versions/3dda56f1c4c6_migrate_num_period_compare_and_period_.py +++ b/superset/migrations/versions/3dda56f1c4c6_migrate_num_period_compare_and_period_.py @@ -9,18 +9,20 @@ from __future__ import division # revision identifiers, used by Alembic. -revision = '3dda56f1c4c6' -down_revision = 'bddc498dd179' +import datetime import json from alembic import op import isodate -import sqlalchemy as sa from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import Column, Integer, Text from superset import db +from superset.utils import parse_human_timedelta + +revision = '3dda56f1c4c6' +down_revision = 'bddc498dd179' Base = declarative_base() @@ -96,6 +98,8 @@ def format_seconds(value): def compute_time_compare(granularity, periods): + if not granularity: + return None # convert old db_engine_spec granularity to ISO duration if granularity in db_engine_specs_map: granularity = db_engine_specs_map[granularity]