Make form_data dict a macro (#2585)

superset/connectors/druid/models.py

@@ -709,7 +709,7 @@ def get_query_str(  # noqa / druid
             orderby=None,
             extras=None,  # noqa
             select=None,  # noqa
-            columns=None, phase=2, client=None):
+            columns=None, phase=2, client=None, form_data=None):
         """Runs a query against Druid and returns a dataframe.
 
         This query interface is common to SqlAlchemy and Druid

superset/connectors/sqla/models.py

@@ -346,7 +346,8 @@ def get_sqla_query(  # sqla
             inner_to_dttm=None,
             orderby=None,
             extras=None,
-            columns=None):
+            columns=None,
+            form_data=None):
         """Querying any sqla table from this common interface"""
 
         template_kwargs = {
@@ -355,6 +356,7 @@ def get_sqla_query(  # sqla
             'metrics': metrics,
             'row_limit': row_limit,
             'to_dttm': to_dttm,
+            'form_data': form_data,
         }
         template_processor = self.get_template_processor(**template_kwargs)
 

superset/jinja_context.py

@@ -82,6 +82,7 @@ def __init__(self, database=None, query=None, table=None, **kwargs):
             'url_param': url_param,
             'current_user_id': current_user_id,
             'current_username': current_username,
+            'form_data': {},
         }
         self.context.update(kwargs)
         self.context.update(BASE_CONTEXT)

superset/viz.py

@@ -178,6 +178,7 @@ def query_obj(self):
             'timeseries_limit': limit,
             'extras': extras,
             'timeseries_limit_metric': timeseries_limit_metric,
+            'form_data': form_data,
         }
         return d