Skip to content

Commit

Permalink
[revert] Partial revert of #7888 (#7933)
Browse files Browse the repository at this point in the history
  • Loading branch information
@john-bodley
john-bodley authored Jul 29, 2019
1 parent 994ac04 commit af462fe
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 59 deletions.
75 changes: 36 additions & 39 deletions superset/connectors/sqla/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -734,46 +734,43 @@ def get_sqla_query( # sqla
if not all([flt.get(s) for s in ["col", "op"]]):
continue
col = flt["col"]

if col not in cols:
raise Exception(_("Column '%(column)s' does not exist", column=col))

op = flt["op"]
col_obj = cols[col]
is_list_target = op in ("in", "not in")
eq = self.filter_values_handler(
flt.get("val"),
target_column_is_numeric=col_obj.is_num,
is_list_target=is_list_target,
)
if op in ("in", "not in"):
cond = col_obj.get_sqla_col().in_(eq)
if "<NULL>" in eq:
cond = or_(cond, col_obj.get_sqla_col() == None) # noqa
if op == "not in":
cond = ~cond
where_clause_and.append(cond)
else:
if col_obj.is_num:
eq = utils.string_to_num(flt["val"])
if op == "==":
where_clause_and.append(col_obj.get_sqla_col() == eq)
elif op == "!=":
where_clause_and.append(col_obj.get_sqla_col() != eq)
elif op == ">":
where_clause_and.append(col_obj.get_sqla_col() > eq)
elif op == "<":
where_clause_and.append(col_obj.get_sqla_col() < eq)
elif op == ">=":
where_clause_and.append(col_obj.get_sqla_col() >= eq)
elif op == "<=":
where_clause_and.append(col_obj.get_sqla_col() <= eq)
elif op == "LIKE":
where_clause_and.append(col_obj.get_sqla_col().like(eq))
elif op == "IS NULL":
where_clause_and.append(col_obj.get_sqla_col() == None) # noqa
elif op == "IS NOT NULL":
where_clause_and.append(col_obj.get_sqla_col() != None) # noqa
col_obj = cols.get(col)
if col_obj:
is_list_target = op in ("in", "not in")
eq = self.filter_values_handler(
flt.get("val"),
target_column_is_numeric=col_obj.is_num,
is_list_target=is_list_target,
)
if op in ("in", "not in"):
cond = col_obj.get_sqla_col().in_(eq)
if "<NULL>" in eq:
cond = or_(cond, col_obj.get_sqla_col() == None) # noqa
if op == "not in":
cond = ~cond
where_clause_and.append(cond)
else:
if col_obj.is_num:
eq = utils.string_to_num(flt["val"])
if op == "==":
where_clause_and.append(col_obj.get_sqla_col() == eq)
elif op == "!=":
where_clause_and.append(col_obj.get_sqla_col() != eq)
elif op == ">":
where_clause_and.append(col_obj.get_sqla_col() > eq)
elif op == "<":
where_clause_and.append(col_obj.get_sqla_col() < eq)
elif op == ">=":
where_clause_and.append(col_obj.get_sqla_col() >= eq)
elif op == "<=":
where_clause_and.append(col_obj.get_sqla_col() <= eq)
elif op == "LIKE":
where_clause_and.append(col_obj.get_sqla_col().like(eq))
elif op == "IS NULL":
where_clause_and.append(col_obj.get_sqla_col() == None) # noqa
elif op == "IS NOT NULL":
where_clause_and.append(col_obj.get_sqla_col() != None) # noqa
if extras:
where = extras.get("where")
if where:
Expand Down
20 changes: 0 additions & 20 deletions tests/model_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,23 +289,3 @@ def test_query_with_non_existent_metrics(self):
tbl.get_query_str(query_obj)

self.assertTrue("Metric 'invalid' does not exist", context.exception)

def test_query_with_non_existent_filter_columns(self):
tbl = self.get_table_by_name("birth_names")

query_obj = dict(
groupby=[],
metrics=["count"],
filter=[{"col": "invalid", "op": "==", "val": "male"}],
is_timeseries=False,
columns=["name"],
granularity=None,
from_dttm=None,
to_dttm=None,
extras={},
)

with self.assertRaises(Exception) as context:
tbl.get_query_str(query_obj)

self.assertTrue("Column 'invalid' does not exist", context.exception)

0 comments on commit af462fe

Please sign in to comment.