From 51fd43a47b3ed33df90f4f8ebc7e763517825d02 Mon Sep 17 00:00:00 2001
From: Luca Toscano <elukey@users.noreply.github.com>
Date: Thu, 9 May 2019 07:25:34 +0200
Subject: [PATCH] druid connector: avoid using 'dimensions' for scan queries
 (#7377)

After the following PyDruid change (contained in version 0.5.2)
the Superset Histogram charts rendered with Druid data are
broken:

druid-io/pydruid@0a59a70

Bump the pydruid requirements accordingly in setup.py

Issue: apache#7368
---
 setup.py                            | 2 +-
 superset/connectors/druid/models.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 87f66ab67..2cf3e39b2 100644
--- a/setup.py
+++ b/setup.py
@@ -92,7 +92,7 @@ setup(
         'parsedatetime',
         'pathlib2',
         'polyline',
-        'pydruid>=0.4.3',
+        'pydruid>=0.5.2',
         'python-dateutil',
         'python-geohash',
         'pyyaml>=3.13',
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index 43a092c20..17ec4b82e 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -1118,7 +1118,8 @@ class DruidDatasource(Model, BaseDatasource):
             columns.append('__time')
             del qry['post_aggregations']
             del qry['aggregations']
-            qry['dimensions'] = columns
+            del qry['dimensions']
+            qry['columns'] = columns
             qry['metrics'] = []
             qry['granularity'] = 'all'
             qry['limit'] = row_limit