diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2009-09-16 12:12:54 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2009-09-16 12:12:54 +0000 |
| commit | a2c7fe52a8e2d938621d1f7607e3d8a7a84ebf1e (patch) | |
| tree | 209ec8386698c4efe59c2c536afce76a25a63262 | |
| parent | 6febb7ef1584b73d24b079463057740c98cddfb3 (diff) | |
[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
| -rw-r--r-- | django/db/models/sql/expressions.py | 2 | ||||
| -rw-r--r-- | tests/modeltests/expressions/models.py | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/django/db/models/sql/expressions.py b/django/db/models/sql/expressions.py index 920cbffe73..0914c2b3c1 100644 --- a/django/db/models/sql/expressions.py +++ b/django/db/models/sql/expressions.py @@ -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' diff --git a/tests/modeltests/expressions/models.py b/tests/modeltests/expressions/models.py index 27daabad71..b515682a9c 100644 --- a/tests/modeltests/expressions/models.py +++ b/tests/modeltests/expressions/models.py @@ -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 |