From a1c8043d47ac21dae2f2094c392fbafe3f1b783f Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Thu, 14 Mar 2019 21:31:37 -0700 Subject: [PATCH 1/2] [api/v1][query_obj] add default prequeries array --- superset/common/query_object.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/superset/common/query_object.py b/superset/common/query_object.py index a2394042a09f..21f2e5739295 100644 --- a/superset/common/query_object.py +++ b/superset/common/query_object.py @@ -32,6 +32,7 @@ class QueryObject: The query object's schema matches the interfaces of DB connectors like sqla and druid. The query objects are constructed on the client. """ + def __init__( self, granularity: str, @@ -46,7 +47,7 @@ def __init__( timeseries_limit_metric: Optional[Dict] = None, order_desc: bool = True, extras: Optional[Dict] = None, - prequeries: Optional[Dict] = None, + prequeries: List[List] = None, is_prequery: bool = False, columns: List[str] = None, orderby: List[List] = None, @@ -67,7 +68,7 @@ def __init__( self.timeseries_limit = timeseries_limit self.timeseries_limit_metric = timeseries_limit_metric self.order_desc = order_desc - self.prequeries = prequeries + self.prequeries = prequeries if prequeries is not None else [] self.is_prequery = is_prequery self.extras = extras if extras is not None else {} self.columns = columns if columns is not None else [] From 1931911a2a91bc5636d4ddec825088066910a88d Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Thu, 14 Mar 2019 21:44:43 -0700 Subject: [PATCH 2/2] [api/v1][query_obj] fix prequeries type --- superset/common/query_object.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset/common/query_object.py b/superset/common/query_object.py index 21f2e5739295..62b972569302 100644 --- a/superset/common/query_object.py +++ b/superset/common/query_object.py @@ -47,7 +47,7 @@ def __init__( timeseries_limit_metric: Optional[Dict] = None, order_desc: bool = True, extras: Optional[Dict] = None, - prequeries: List[List] = None, + prequeries: Optional[List[Dict]] = None, is_prequery: bool = False, columns: List[str] = None, orderby: List[List] = None,