aminghadersohi commented on code in PR #44428:
URL: https://github.com/apache/superset/pull/44428#discussion_r4051404163
##########
tests/unit_tests/sql_lab_test.py:
##########
@@ -559,6 +560,77 @@ def test_get_sql_results_oauth2(mocker: MockerFixture,
app) -> None:
app_context.pop()
+def _capture_execution_context(mocker: MockerFixture) -> dict[str, Any]:
+ """
+ Stub out ``execute_sql_statements`` and record the context it runs under.
+ """
+ captured: dict[str, Any] = {}
+
+ def execute_sql_statements(*args: Any, **kwargs: Any) -> dict[str, Any]:
+ captured["rls_tenant"] = session.get("rls_tenant")
+ captured["has_request_context"] = has_request_context()
+ captured["user"] = g.user
+ return {"status": QueryStatus.SUCCESS}
+
+ mocker.patch(
+ "superset.sql_lab.execute_sql_statements",
+ side_effect=execute_sql_statements,
+ )
+ mocker.patch(
+ "superset.sql_lab.security_manager.find_user",
+ return_value="the-user",
+ )
+ return captured
+
+
+def test_get_sql_results_reuses_the_active_request(
+ mocker: MockerFixture, app: SupersetApp
+) -> None:
+ """
+ Test that a synchronous run keeps the real Flask session.
+
+ SQL Lab's synchronous executor invokes this task directly rather than
through
+ Celery, so it already runs inside the authenticated request. Fabricating a
+ second request context there would swap the real session for an empty one
and
+ break RLS clauses whose Jinja macros read ``flask.session``.
+ """
+ captured = _capture_execution_context(mocker)
+
+ # Pushed/popped manually (rather than via a ``with`` block) so the
+ # ``finally`` below still pops it if an assertion fails, preventing the
+ # request context from leaking into later tests in the same session.
+ app_context = app.test_request_context()
+ app_context.push()
+
+ try:
+ session["rls_tenant"] = "acme"
+ get_sql_results(query_id=1, rendered_query="SELECT 1")
+ finally:
+ app_context.pop()
+
+ assert captured["rls_tenant"] == "acme"
Review Comment:
bito's suggested `has_request_context` assertion can't catch that regression
— it is `True` for a nested context too. On the pinned Flask 3.1.3, forcing
`app.test_request_context()` unconditionally still passes with only that
assertion; this `rls_tenant` line is what reds. No change needed.
--
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]
