Fixed #1454 -- Improved DB API quote_only_if_word() so that it doesn't quote 'select' parameters that are not all word characters. Thanks, dja@cdc.msbx.net

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-06-01 04:47:56 +00:00
parent a371eb3c90
commit b4be0d2487
1 changed files with 2 additions and 2 deletions

View File

@ -3,8 +3,8 @@ from django.db.models.fields import DateField, FieldDoesNotExist
from django.db.models import signals from django.db.models import signals
from django.dispatch import dispatcher from django.dispatch import dispatcher
from django.utils.datastructures import SortedDict from django.utils.datastructures import SortedDict
import operator import operator
import re
# For Python 2.3 # For Python 2.3
if not hasattr(__builtins__, 'set'): if not hasattr(__builtins__, 'set'):
@ -59,7 +59,7 @@ def orderlist2sql(order_list, opts, prefix=''):
return ', '.join(output) return ', '.join(output)
def quote_only_if_word(word): def quote_only_if_word(word):
if ' ' in word: if re.search('\W', word): # Don't quote if there are spaces or non-word chars.
return word return word
else: else:
return backend.quote_name(word) return backend.quote_name(word)