Commit a2c7fe52 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Fixed #11886 -- Corrected handling of F() expressions that use... 

[1.1.X] Fixed #11886 -- Corrected handling of F() expressions that use parentheses. Thanks to Brent Hagany for the report.

Merge of r11581 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 6febb7ef

django/db/models/sql/expressions.py

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ class SQLEvaluator(object): 
            else:

                sql, params = '%s', (child,)



            if hasattr(child, 'children') > 1:

            if len(getattr(child, 'children', [])) > 1:

                format = '(%s)'

            else:

                format = '%s'

tests/modeltests/expressions/models.py

+10 −0
Original line number Diff line number Diff line
@@ -56,6 +56,16 @@ __test__ = {'API_TESTS': """ 
>>> company_query

[{'num_chairs': 2302, 'name': u'Example Inc.', 'num_employees': 2300}, {'num_chairs': 5, 'name': u'Foobar Ltd.', 'num_employees': 3}, {'num_chairs': 34, 'name': u'Test GmbH', 'num_employees': 32}]



# Law of order of operations is followed

>>> _ =company_query.update(num_chairs=F('num_employees') + 2 * F('num_employees'))

>>> company_query

[{'num_chairs': 6900, 'name': u'Example Inc.', 'num_employees': 2300}, {'num_chairs': 9, 'name': u'Foobar Ltd.', 'num_employees': 3}, {'num_chairs': 96, 'name': u'Test GmbH', 'num_employees': 32}]



# Law of order of operations can be overridden by parentheses

>>> _ =company_query.update(num_chairs=((F('num_employees') + 2) * F('num_employees')))

>>> company_query

[{'num_chairs': 5294600, 'name': u'Example Inc.', 'num_employees': 2300}, {'num_chairs': 15, 'name': u'Foobar Ltd.', 'num_employees': 3}, {'num_chairs': 1088, 'name': u'Test GmbH', 'num_employees': 32}]



# The relation of a foreign key can become copied over to an other foreign key.

>>> Company.objects.update(point_of_contact=F('ceo'))

3