Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #815 -- 'select' keyword in DB API calls is now quoted correctl…

…y. Thanks, Hugo

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 56e40c5884e17f037ddbe7091d42fe6f8e602814 1 parent bb505a8
@adrianholovaty adrianholovaty authored
Showing with 6 additions and 1 deletion.
  1. +6 −1 django/core/meta/__init__.py
View
7 django/core/meta/__init__.py
@@ -1380,8 +1380,13 @@ def function_get_sql_clause(opts, **kwargs):
_fill_table_cache(opts, select, tables, where, opts.db_table, [opts.db_table])
# Add any additional SELECTs passed in via kwargs.
+ def quote_only_if_word(word):
+ if word.find(' ')>=0:
+ return word
+ else:
+ return db.db.quote_name(word)
if kwargs.get('select'):
- select.extend(['(%s) AS %s' % (db.db.quote_name(s[1]), db.db.quote_name(s[0])) for s in kwargs['select']])
+ select.extend(['(%s) AS %s' % (quote_only_if_word(s[1]), db.db.quote_name(s[0])) for s in kwargs['select']])
# ORDER BY clause
order_by = []
Please sign in to comment.
Something went wrong with that request. Please try again.