Skip to content

Fixed #383 -- Feed the proper SQL to cursor.execute (the one with placeholders). #417

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

Merged
merged 1 commit into from
Oct 18, 2013
Merged

Fixed #383 -- Feed the proper SQL to cursor.execute (the one with placeholders). #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions debug_toolbar/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ class SQLSelectForm(forms.Form):
"""
Validate params

sql: urlencoded sql with positional arguments
sql: The sql statement with interpolated params
raw_sql: The sql statement with placeholders
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
"""
sql = forms.CharField()
raw_sql = forms.CharField()
params = forms.CharField()
alias = forms.CharField(required=False, initial='default')
duration = forms.FloatField()
Expand All @@ -39,8 +41,8 @@ def __init__(self, *args, **kwargs):
for name in self.fields:
self.fields[name].widget = forms.HiddenInput()

def clean_sql(self):
value = self.cleaned_data['sql']
def clean_raw_sql(self):
value = self.cleaned_data['raw_sql']

if not value.lower().strip().startswith('select'):
raise ValidationError("Only 'select' queries are allowed.")
Expand Down Expand Up @@ -72,8 +74,7 @@ def clean_hash(self):
return hash

def reformat_sql(self):
sql, params = self.cleaned_data['sql'], self.cleaned_data['params']
return reformat_sql(self.cursor.db.ops.last_executed_query(self.cursor, sql, params))
return reformat_sql(self.cleaned_data['sql'])

def make_hash(self, data):
params = force_text(settings.SECRET_KEY) + data['sql'] + data['params']
Expand Down
6 changes: 3 additions & 3 deletions debug_toolbar/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def sql_select(request):
form = SQLSelectForm(request.POST or None)

if form.is_valid():
sql = form.cleaned_data['sql']
sql = form.cleaned_data['raw_sql']
params = form.cleaned_data['params']
cursor = form.cursor
cursor.execute(sql, params)
Expand All @@ -43,7 +43,7 @@ def sql_explain(request):
form = SQLSelectForm(request.POST or None)

if form.is_valid():
sql = form.cleaned_data['sql']
sql = form.cleaned_data['raw_sql']
params = form.cleaned_data['params']
cursor = form.cursor

Expand Down Expand Up @@ -80,7 +80,7 @@ def sql_profile(request):
form = SQLSelectForm(request.POST or None)

if form.is_valid():
sql = form.cleaned_data['sql']
sql = form.cleaned_data['raw_sql']
params = form.cleaned_data['params']
cursor = form.cursor
result = None
Expand Down