Fix sql(params_inline=True) not inlining subquery filter values#2116
Open
worksbyfriday wants to merge 1 commit intotortoise:developfrom
Open
Fix sql(params_inline=True) not inlining subquery filter values#2116worksbyfriday wants to merge 1 commit intotortoise:developfrom
worksbyfriday wants to merge 1 commit intotortoise:developfrom
Conversation
When using sql(params_inline=True) on a query with Subquery filters, the subquery's filter values were rendered as placeholders instead of being inlined. This happened because Subquery.get_sql() unconditionally called get_parameterized_sql(), which creates a new Parameterizer even when the outer context expects inline values. The fix checks whether the SqlContext has an active parameterizer: - If yes (parameterized mode): use get_parameterized_sql() so values are collected into the outer query's parameterizer - If no (inline mode): use get_sql() so values are rendered inline Fixes tortoise#1800
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #1800
Subquery.get_sql()unconditionally calledget_parameterized_sql(), which creates a newParameterizereven when the outer context expects inline values. This caused subquery filter values to be rendered as?placeholders instead of being inlined.The fix checks whether the
SqlContexthas an active parameterizer:get_parameterized_sql()so values are collected into the outer query's parameterizerget_sql()so values are rendered directlyBefore
After
Changes
tortoise/expressions.py: Checkctx.parameterizerbefore choosing betweenget_sql()andget_parameterized_sql()tests/test_query_api.py: Added regression test verifying subquery values are inlinedTest plan
test_subquery_params_inline)test_queryset.py -k subquery)params_inlinetests pass (test_case_when.py)