From commits-return-1239-archive-asf-public=cust-asf.ponee.io@superset.incubator.apache.org Tue Jul 24 23:05:07 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 08B1E180626 for ; Tue, 24 Jul 2018 23:05:06 +0200 (CEST) Received: (qmail 26040 invoked by uid 500); 24 Jul 2018 21:05:06 -0000 Mailing-List: contact commits-help@superset.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@superset.incubator.apache.org Delivered-To: mailing list commits@superset.incubator.apache.org Received: (qmail 26031 invoked by uid 99); 24 Jul 2018 21:05:06 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jul 2018 21:05:06 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 88E9780943; Tue, 24 Jul 2018 21:05:05 +0000 (UTC) Date: Tue, 24 Jul 2018 21:05:05 +0000 To: "commits@superset.apache.org" Subject: [incubator-superset] branch master updated: [migration] Fix migration 3dda56f1c (#5471) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153246630536.1982.6509354912673461577@gitbox.apache.org> From: graceguo@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-superset X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: bea0a0aa1590d073365ecf74d75a054643dbe3b7 X-Git-Newrev: bfcc3a633ba7fbaed2d974acb928029699b0c04e X-Git-Rev: bfcc3a633ba7fbaed2d974acb928029699b0c04e X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. graceguo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-superset.git The following commit(s) were added to refs/heads/master by this push: new bfcc3a6 [migration] Fix migration 3dda56f1c (#5471) bfcc3a6 is described below commit bfcc3a633ba7fbaed2d974acb928029699b0c04e Author: John Bodley <4567245+john-bodley@users.noreply.github.com> AuthorDate: Tue Jul 24 14:05:00 2018 -0700 [migration] Fix migration 3dda56f1c (#5471) --- ...dda56f1c4c6_migrate_num_period_compare_and_period_.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 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 fef8bb8..475252f 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 @@ -16,7 +16,7 @@ import json from alembic import op import isodate from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy import Column, Integer, Text +from sqlalchemy import Column, Integer, String, Text from superset import db from superset.utils import parse_human_timedelta @@ -32,6 +32,7 @@ class Slice(Base): __tablename__ = 'slices' id = Column(Integer, primary_key=True) + datasource_type = Column(String(200)) params = Column(Text) @@ -50,6 +51,12 @@ db_engine_specs_map = { 'hour': 'PT1H', 'day': 'P1D', 'week': 'P1W', + 'week_ending_saturday': 'P1W', + 'week_start_sunday': 'P1W', + 'week_start_monday': 'P1W', + 'week_starting_sunday': 'P1W', + 'P1W/1970-01-03T00:00:00Z': 'P1W', + '1969-12-28T00:00:00Z/P1W': 'P1W', 'month': 'P1M', 'quarter': 'P0.25Y', 'year': 'P1Y', @@ -131,10 +138,11 @@ def upgrade(): continue num_period_compare = int(params.get('num_period_compare')) - granularity = params.get('granularity') or params.get('time_grain_sqla') - period_ratio_type = params.get('period_ratio_type', 'growth') - + granularity = (params.get('granularity') if chart.datasource_type == 'druid' + else params.get('time_grain_sqla')) time_compare = compute_time_compare(granularity, num_period_compare) + + period_ratio_type = params.get('period_ratio_type') or 'growth' comparison_type = comparison_type_map[period_ratio_type.lower()] params['time_compare'] = [time_compare]