Author: mtredinnick
Date: 2008-02-22 18:23:57 -0600 (Fri, 22 Feb 2008)
New Revision: 7146
Modified:
django/branches/queryset-refactor/django/db/models/manager.py
django/branches/queryset-refactor/django/db/models/sql/query.py
django/branches/queryset-refactor/tests/modeltests/update/models.py
Log:
queryset-refactor: Fixed the case of calling update() on a model manager.
Modified: django/branches/queryset-refactor/django/db/models/manager.py
===================================================================
--- django/branches/queryset-refactor/django/db/models/manager.py
2008-02-22 12:50:10 UTC (rev 7145)
+++ django/branches/queryset-refactor/django/db/models/manager.py
2008-02-23 00:23:57 UTC (rev 7146)
@@ -102,7 +102,7 @@
return self.get_query_set().values(*args, **kwargs)
def update(self, *args, **kwargs):
- return self.get_query_set().updated(*args, **kwargs)
+ return self.get_query_set().update(*args, **kwargs)
def _insert(self, *args, **kwargs):
return self.get_query_set()._insert(*args, **kwargs)
Modified: django/branches/queryset-refactor/django/db/models/sql/query.py
===================================================================
--- django/branches/queryset-refactor/django/db/models/sql/query.py
2008-02-22 12:50:10 UTC (rev 7145)
+++ django/branches/queryset-refactor/django/db/models/sql/query.py
2008-02-23 00:23:57 UTC (rev 7146)
@@ -1240,7 +1240,8 @@
values.append('%s = NULL' % qn(name))
result.append(', '.join(values))
where, params = self.where.as_sql()
- result.append('WHERE %s' % where)
+ if where:
+ result.append('WHERE %s' % where)
return ' '.join(result), tuple(update_params + params)
def clear_related(self, related_field, pk_list):
Modified: django/branches/queryset-refactor/tests/modeltests/update/models.py
===================================================================
--- django/branches/queryset-refactor/tests/modeltests/update/models.py
2008-02-22 12:50:10 UTC (rev 7145)
+++ django/branches/queryset-refactor/tests/modeltests/update/models.py
2008-02-23 00:23:57 UTC (rev 7146)
@@ -56,5 +56,12 @@
>>> d.value, d.another_value
(u'fruit', u'peaches')
+In the rare case you want to update every instance of a model, update() is also
+a manager method.
+
+>>> DataPoint.objects.update(value='thing')
+>>> DataPoint.objects.values('value').distinct()
+[{'value': u'thing'}]
+
"""
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
