Django

Code

Changeset 1274

Show
Ignore:
Timestamp:
11/17/05 09:00:23 (2 years ago)
Author:
adrian
Message:

Fixed #815 -- 'select' keyword in DB API calls is now quoted correctly. Thanks, Hugo

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/meta/__init__.py

    r1224 r1274  
    13811381 
    13821382    # Add any additional SELECTs passed in via kwargs. 
     1383    def quote_only_if_word(word): 
     1384        if word.find(' ')>=0: 
     1385            return word 
     1386        else: 
     1387            return db.db.quote_name(word) 
    13831388    if kwargs.get('select'): 
    1384         select.extend(['(%s) AS %s' % (db.db.quote_name(s[1]), db.db.quote_name(s[0])) for s in kwargs['select']]) 
     1389        select.extend(['(%s) AS %s' % (quote_only_if_word(s[1]), db.db.quote_name(s[0])) for s in kwargs['select']]) 
    13851390 
    13861391    # ORDER BY clause