fix migration 3dda56f1c (apache#5468)

* fix migration 3dda56f1c * add isodate to setup.py: (cherry picked from commit bea0a0a)
graceguo-supercat · Jul 26, 2018 · 4f138e5 · 4f138e5
1 parent 1604d8b
commit 4f138e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -17,6 +17,7 @@ geopy==1.11.0
 gunicorn==19.8.0
 humanize==0.5.1
 idna==2.6
+isodate==0.6.0
 markdown==2.6.11
 pandas==0.22.0
 parsedatetime==2.0.0

diff --git a/setup.py b/setup.py
@@ -69,6 +69,7 @@ def get_git_sha():
         'gunicorn',  # deprecated
         'humanize',
         'idna',
+        'isodate',
         'markdown',
         'pandas',
         'parsedatetime',

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
@@ -125,7 +125,7 @@ def upgrade():
     session = db.Session(bind=bind)
 
     for chart in session.query(Slice):
-        params = json.loads(chart.params)
+        params = json.loads(chart.params or '{}')
 
         if not params.get('num_period_compare'):
             continue
@@ -150,7 +150,7 @@ def downgrade():
     session = db.Session(bind=bind)
 
     for chart in session.query(Slice):
-        params = json.loads(chart.params)
+        params = json.loads(chart.params or '{}')
 
         if 'time_compare' in params or 'comparison_type' in params:
             params.pop('time_compare', None)