Merge branch 'master' into gg-DashboardTimeoutWarning

apache · Jun 6, 2017 · 0196c5f · 0196c5f
2 parents 4e907a0 + 65f25a1
commit 0196c5f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
@@ -603,6 +603,9 @@ def sync_to_db(cls, name, cluster, merge):
             logging.error("Failed at fetching the latest segment")
             return
         for col in cols:
+            # Skip the time column
+            if col == "__time":
+                continue
             col_obj = (
                 session
                 .query(DruidColumn)
@@ -618,6 +621,11 @@ def sync_to_db(cls, name, cluster, merge):
                 col_obj.filterable = True
             if datatype == "hyperUnique" or datatype == "thetaSketch":
                 col_obj.count_distinct = True
+            # If long or double, allow sum/min/max
+            if datatype == "LONG" or datatype == "DOUBLE":
+                col_obj.sum = True
+                col_obj.min = True
+                col_obj.max = True
             if col_obj:
                 col_obj.type = cols[col]['type']
             session.flush()

diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
@@ -477,22 +477,23 @@ def get_sqla_query(  # sqla
                     if op == 'not in':
                         cond = ~cond
                     where_clause_and.append(cond)
-                if col_obj.is_num:
-                    eq = utils.string_to_num(flt['val'])
-                if op == '==':
-                    where_clause_and.append(col_obj.sqla_col == eq)
-                elif op == '!=':
-                    where_clause_and.append(col_obj.sqla_col != eq)
-                elif op == '>':
-                    where_clause_and.append(col_obj.sqla_col > eq)
-                elif op == '<':
-                    where_clause_and.append(col_obj.sqla_col < eq)
-                elif op == '>=':
-                    where_clause_and.append(col_obj.sqla_col >= eq)
-                elif op == '<=':
-                    where_clause_and.append(col_obj.sqla_col <= eq)
-                elif op == 'LIKE':
-                    where_clause_and.append(col_obj.sqla_col.like(eq))
+                else:
+                    if col_obj.is_num:
+                        eq = utils.string_to_num(flt['val'])
+                    if op == '==':
+                        where_clause_and.append(col_obj.sqla_col == eq)
+                    elif op == '!=':
+                        where_clause_and.append(col_obj.sqla_col != eq)
+                    elif op == '>':
+                        where_clause_and.append(col_obj.sqla_col > eq)
+                    elif op == '<':
+                        where_clause_and.append(col_obj.sqla_col < eq)
+                    elif op == '>=':
+                        where_clause_and.append(col_obj.sqla_col >= eq)
+                    elif op == '<=':
+                        where_clause_and.append(col_obj.sqla_col <= eq)
+                    elif op == 'LIKE':
+                        where_clause_and.append(col_obj.sqla_col.like(eq))
         if extras:
             where = extras.get('where')
             if where: