From cc4e4d9aee0b3ebfb45bee01aec79edc9e144c78 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Thu, 15 Jan 2009 11:06:34 +0000 Subject: Fixed #3566 -- Added support for aggregation to the ORM. See the documentation for details on usage. Many thanks to: * Nicolas Lara, who worked on this feature during the 2008 Google Summer of Code. * Alex Gaynor for his help debugging and fixing a number of issues. * Justin Bronn for his help integrating with contrib.gis. * Karen Tracey for her help with cross-platform testing. * Ian Kelly for his help testing and fixing Oracle support. * Malcolm Tredinnick for his invaluable review notes. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9742 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/manager.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'django/db/models/manager.py') diff --git a/django/db/models/manager.py b/django/db/models/manager.py index 683a8f8d10..4e8c6e94fb 100644 --- a/django/db/models/manager.py +++ b/django/db/models/manager.py @@ -101,6 +101,12 @@ class Manager(object): def filter(self, *args, **kwargs): return self.get_query_set().filter(*args, **kwargs) + def aggregate(self, *args, **kwargs): + return self.get_query_set().aggregate(*args, **kwargs) + + def annotate(self, *args, **kwargs): + return self.get_query_set().annotate(*args, **kwargs) + def complex_filter(self, *args, **kwargs): return self.get_query_set().complex_filter(*args, **kwargs) -- cgit v1.3