p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

magic-removal: removed legacy 'import copy', and re-introduced Q() objects 

as positional parameters to the QuerySet methods that took keyword arguments


git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2198 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2006-01-31 02:04:45 +00:00
parent 34bf9e8d31
commit b72d8da3b2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/db/models/query.py
View File

@ -1,7 +1,7 @@
from django.db import backend, connection from django.db import backend, connection
from django.db.models.fields import DateField, FieldDoesNotExist from django.db.models.fields import DateField, FieldDoesNotExist
from django.utils.datastructures import SortedDict from django.utils.datastructures import SortedDict
import copy import operator
LOOKUP_SEPARATOR = '__' LOOKUP_SEPARATOR = '__'
@ -154,15 +154,15 @@ class QuerySet(object):
cursor.execute("SELECT COUNT(*)" + sql, params) cursor.execute("SELECT COUNT(*)" + sql, params)
return cursor.fetchone()[0] return cursor.fetchone()[0]
def get(self, **kwargs): def get(self, *args, **kwargs):
"Performs the SELECT and returns a single object matching the given keyword arguments." "Performs the SELECT and returns a single object matching the given keyword arguments."
obj_list = list(self.filter(**kwargs)) obj_list = list(self.filter(*args, **kwargs))
if len(obj_list) < 1: if len(obj_list) < 1:
raise self.model.DoesNotExist, "%s does not exist for %s" % (self.model._meta.object_name, kwargs) raise self.model.DoesNotExist, "%s does not exist for %s" % (self.model._meta.object_name, kwargs)
assert len(obj_list) == 1, "get() returned more than one %s -- it returned %s! Lookup parameters were %s" % (self.model._meta.object_name, len(obj_list), kwargs) assert len(obj_list) == 1, "get() returned more than one %s -- it returned %s! Lookup parameters were %s" % (self.model._meta.object_name, len(obj_list), kwargs)
return obj_list[0] return obj_list[0]
def delete(self, **kwargs): def delete(self, *args, **kwargs):
""" """
Deletes the records with the given kwargs. If no kwargs are given, Deletes the records with the given kwargs. If no kwargs are given,
deletes records in the current QuerySet. deletes records in the current QuerySet.
@ -175,7 +175,7 @@ class QuerySet(object):
raise TypeError, "SAFETY MECHANISM: Specify DELETE_ALL=True if you actually want to delete all data." raise TypeError, "SAFETY MECHANISM: Specify DELETE_ALL=True if you actually want to delete all data."
if kwargs: if kwargs:
del_query = self.filter(**kwargs) del_query = self.filter(*args, **kwargs)
else: else:
del_query = self._clone() del_query = self._clone()
# disable non-supported fields # disable non-supported fields
@ -252,11 +252,13 @@ class QuerySet(object):
# PUBLIC METHODS THAT RETURN A NEW QUERYSET # # PUBLIC METHODS THAT RETURN A NEW QUERYSET #
############################################# #############################################
def filter(self, **kwargs): def filter(self, *args, **kwargs):
"Returns a new QuerySet instance with the args ANDed to the existing set." "Returns a new QuerySet instance with the args ANDed to the existing set."
clone = self._clone() clone = self._clone()
if len(kwargs) > 0: if len(kwargs) > 0:
clone._filters = clone._filters & Q(**kwargs) clone._filters = clone._filters & Q(**kwargs)
if len(args) > 0:
clone._filters = clone._filters & reduce(operator.and_, args)
return clone return clone
def select_related(self, true_or_false=True): def select_related(self, true_or_false=True):