8000 Support for very long SQL queries in SQL panel by aflukasz · Pull Request #357 · django-commons/django-debug-toolbar · GitHub
Skip to content

Support for very long SQL queries in SQL panel #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Support for very long SQL queries in SQL panel #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06c3dd5
Make it possible to use remoteCall via POST
aflukasz Feb 19, 2013
52dea7a
Use POST in SQL panel views to allow for long queries (issue GH-269)
aflukasz Feb 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions debug_toolbar/static/debug_toolbar/js/toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,20 @@ window.djdt = (function(window, document, jQuery) {
$('#djDebugToolbar li').removeClass('active');
return false;
});
$('#djDebug a.remoteCall').live('click', function() {
$('#djDebugWindow').load(this.href, function(response, status, xhr) {
$('#djDebug a.remoteCall').live('click', function(e) {
var data = '';
var a = $(this);
if (a.hasClass('remoteCallPost')) {
data = {};
var prefix = 'data-';
$.each(this.attributes, function(idx, attribute) {
if (attribute.name.indexOf(prefix) === 0) {
var param = attribute.name.substring(prefix.length);
data[param] = param ? decodeURIComponent(a.attr(attribute.name)) : undefined;
}
});
}
$('#djDebugWindow').load(this.href, data, function(response, status, xhr) {
if (status == "error") {
var message = '<div class="djDebugPanelTitle"><a class="djDebugClose djDebugBack" href="">Back</a><h3>'+xhr.status+': '+xhr.statusText+'</h3></div>';
$('#djDebugWindow').html(message);
Expand Down
6 changes: 3 additions & 3 deletions debug_toolbar/templates/debug_toolbar/panels/sql.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
<td class="actions">
{% if query.params %}
{% if query.is_select %}
<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&amp;params={{ query.params|urlencode }}&amp;duration={{ query.duration|floatformat:"2"|urlencode }}&amp;hash={{ query.hash }}&amp;alias={{ query.alias|urlencode }}">Sel</a>
<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&amp;params={{ query.params|urlencode }}&amp;duration={{ query.duration|floatformat:"2"|urlencode }}&amp;hash={{ query.hash }}&amp;alias={{ query.alias|urlencode }}">Expl</a>
<a class="remoteCall remoteCallPost" href="/__debug__/sql_select/" data-sql="{{ query.raw_sql|urlencode }}" data-params="{{ query.params|urlencode }}" data-duration="{{ query.duration|floatformat:"2"|urlencode }}" data-hash="{{ query.hash }}" data-alias="{{ query.alias|urlencode }}">Sel</a>
<a class="remoteCall remoteCallPost" href="/__debug__/sql_explain/" data-sql="{{ query.raw_sql|urlencode }}" data-params="{{ query.params|urlencode }}" data-duration="{{ query.duration|floatformat:"2"|urlencode }}" data-hash="{{ query.hash }}" data-alias="{{ query.alias|urlencode }}">Expl</a>
{% ifequal query.engine 'mysql' %}
<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&amp;params={{ query.params|urlencode }}&amp;duration={{ query.duration|floatformat:"2"|urlencode }}&amp;hash={{ query.hash }}&amp;alias={{ query.alias|urlencode }}">Prof</a>
<a class="remoteCall remoteCallPost" href="/__debug__/sql_profile/" data-sql="{{ query.raw_sql|urlencode }}" data-params="{{ query.params|urlencode }}" data-duration="{{ query.duration|floatformat:"2"|urlencode }}" data-hash="{{ query.hash }}" data-alias="{{ query.alias|urlencode }}">Prof</a>
{% endifequal %}
{% endif %}
{% endif %}
Expand Down
36 changes: 18 additions & 18 deletions debug_toolbar/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ def sql_select(request):
"""
Returns the output of the SQL SELECT statement.

Expected GET variables:
Expected POST variables:
sql: urlencoded sql with positional arguments
params: JSON encoded parameter values
duration: time for SQL to execute passed in from toolbar just for redisplay
hash: the hash of (secret + sql + params) for tamper checking
"""
from debug_toolbar.panels.sql import reformat_sql
sql = request.GET.get('sql', '')
params = request.GET.get('params', '')
alias = request.GET.get('alias', 'default')
sql = request.POST.get('sql', '')
params = request.POST.get('params', '')
alias = request.POST.get('alias', 'default')
hash = sha1(settings.SECRET_KEY + sql + params).hexdigest()
if hash != request.GET.get('hash', ''):
if hash != request.POST.get('hash', ''):
return HttpResponseBadRequest('Tamper alert') # SQL Tampering alert
if sql.lower().strip().startswith('select'):
params = json.loads(params)
Expand All @@ -58,7 +58,7 @@ def sql_select(request):
context = {
'result': result,
'sql': reformat_sql(cursor.db.ops.last_executed_query(cursor, sql, params)),
'duration': request.GET.get('duration', 0.0),
'duration': request.POST.get('duration', 0.0),
'headers': headers,
'alias': alias,
}
Expand All @@ -70,18 +70,18 @@ def sql_explain(request):
"""
Returns the output of the SQL EXPLAIN on the given query.

Expected GET variables:
Expected POST variables:
sql: urlencoded sql with positional arguments
params: JSON encoded parameter values
duration: time for SQL to execute passed in from toolbar just for redisplay
hash: the hash of (secret + sql + params) for tamper checking
"""
from debug_toolbar.panels.sql import reformat_sql
sql = request.GET.get('sql', '')
params = request.GET.get('params', '')
alias = request.GET.get('alias', 'default')
sql = request.POST.get('sql', '')
params = request.POST.get('params', '')
alias = request.POST.get('alias', 'default')
hash = sha1(settings.SECRET_KEY + sql + params).hexdigest()
if hash != request.GET.get('hash', ''):
if hash != request.POST.get('hash', ''):
return HttpResponseBadRequest('Tamper alert') # SQL Tampering alert
if sql.lower().strip().startswith('select'):
params = json.loads(params)
Expand All @@ -104,7 +104,7 @@ def sql_explain(request):
context = {
'result': result,
'sql': reformat_sql(cursor.db.ops.last_executed_query(cursor, sql, params)),
'duration': request.GET.get('duration', 0.0),
'duration': request.POST.get('duration', 0.0),
'headers': headers,
'alias': alias,
}
Expand All @@ -116,18 +116,18 @@ def sql_profile(request):
"""
Returns the output of running the SQL and getting the profiling statistics.

Expected GET variables:
Expected POST variables:
sql: urlencoded sql with positional arguments
params: JSON encoded parameter values
duration: time for SQL to execute passed in from toolbar just for redisplay
hash: the hash of (secret + sql + params) for tamper checking
"""
from debug_toolbar.panels.sql import reformat_sql
sql = request.GET.get('sql', '')
params = request.GET.get('params', '')
alias = request.GET.get('alias', 'default')
sql = request.POST.get('sql', '')
params = request.POST.get('params', '')
alias = request.POST.get('alias', 'default')
hash = sha1(settings.SECRET_KEY + sql + params).hexdigest()
if hash != request.GET.get('hash', ''):
if hash != request.POST.get('hash', ''):
return HttpResponseBadRequest('Tamper alert') # SQL Tampering alert
if sql.lower().strip().startswith('select'):
params = json.loads(params)
Expand All @@ -150,7 +150,7 @@ def sql_profile(request):
'result': result,
'result_error': result_error,
'sql': reformat_sql(cursor.db.ops.last_executed_query(cursor, sql, params)),
'duration': request.GET.get('duration', 0.0),
'duration': request.POST.get('duration', 0.0),
'headers': headers,
'alias': alias,
}
Expand Down