john-bodley commented on a change in pull request #17419:
URL: https://github.com/apache/superset/pull/17419#discussion_r748474732
##########
File path: tests/integration_tests/charts/api_tests.py
##########
@@ -2033,3 +2035,58 @@ def test_chart_data_series_limit(self):
self.assertEqual(
set(column for column in data[0].keys()), {"state", "name",
"sum__num"}
)
+
+ @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+ def test_chart_data_virtual_table_with_colons(self):
+ """
+ Chart data API: test query with literal colon characters in query,
metrics,
+ where clause and filters
+ """
+ self.login(username="admin")
+ owner = self.get_user("admin").id
+ user = db.session.query(security_manager.user_model).get(owner)
+
+ table = SqlaTable(
+ table_name="virtual_table_1",
+ schema=get_example_default_schema(),
+ owners=[user],
+ database=get_example_database(),
+ sql="select ':foo' as foo, ':bar:' as bar, state, num from
birth_names",
+ )
+ db.session.add(table)
+ db.session.commit()
+ table.fetch_metadata()
+
+ request_payload = get_query_context("birth_names")
+ request_payload["datasource"] = {
+ "type": "table",
+ "id": table.id,
+ }
+ request_payload["queries"][0]["columns"] = ["foo", "bar", "state"]
+ request_payload["queries"][0]["where"] = "':abc' != ':xyz:qwerty'"
+ request_payload["queries"][0]["orderby"] = None
+ request_payload["queries"][0]["metrics"] = [
+ {
+ "expressionType": AdhocMetricExpressionType.SQL,
+ "sqlExpression": "sum(case when state = ':asdf' then 0 else 1
end)",
+ "label": "count",
+ }
+ ]
+ request_payload["queries"][0]["filters"] = [
+ {"col": "foo", "op": "!=", "val": ":qwerty:",}
+ ]
+
+ rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
+ db.session.delete(table)
+ db.session.commit()
+ self.assertEqual(rv.status_code, 200)
Review comment:
```suggestion
assert rv.status_code == 200
```
##########
File path: superset/connectors/sqla/models.py
##########
@@ -930,9 +938,8 @@ def _get_sqla_row_level_filters(
filters_grouped: Dict[Union[int, str], List[str]] = defaultdict(list)
try:
for filter_ in security_manager.get_rls_filters(self):
- clause = text(
- f"({template_processor.process_template(filter_.clause)})"
- )
+ rendered_filter =
template_processor.process_template(filter_.clause)
+ clause = text(f"({rendered_filter})")
Review comment:
```suggestion
clause =
text(f"({template_processor.process_template(filter_.clause)})")
```
Maybe just inline this given that `rendered_filter` isn't used elsewhere.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
