Fix infinite recursion bug with SQL and Cache panels #630
Conversation
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
tim-schilling
force-pushed
the
master
branch
from
523aa53 to
417e83c
Compare
Contributor
|
I'm not really sure of how all this works -- which means you can merge it if it works for you :-) However, if that isn't too hard, it would be nice to have a test for the recursion detection. |
Member
Author
|
So I was able to reproduce it manually, but I can't seem to reproduce it with Django's test runner. I believe it has something to do with the test runner forcing |
Move the get_template_info stacktrace loop into a utility method. Check for calls to get_template_context to prevent the infinite recursion. The bug requires TEMPLATE_DEBUG=True, for the template to extend another template and SQL to be run in the template loader. With this configuration the SQL Panel would identify the SQL query while loading the template, then try to load the template again which would create a new SQL query ending in an infinite recursion. Skip the infinite recursion regression test for Django < 1.5 The test is being skipped because Django 1.4 loads the TEMPLATE_LOADERS before override_settings can modify it. This means that the SQL query isn't run when loading the template which causes the test to fail. The other solution would have been to add a conditional setting, but that could introduce unexpected results in future tests. Skipping this test is the safer, more conservative approach. Closes #598.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Move the stack trace loop into a utility method. Check for calls to get_template_context.
I wasn't sure about the logic to check the current file. I had it done programmatically, but that was ugly and probably more confusing than just checking the string value of the name.
Closes #598