innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #1857 -- Fixed get_previous_by_FIELD and get_next_by_FIELD to work 

properly with keyword arguments. Patch from tom@jerakeen.org.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2006-06-20 02:17:14 +00:00
parent ed6d7285dd
commit a8a133cc6c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/base.py
View File

@ -271,13 +271,13 @@ class Model(object):
value = getattr(self, field.attname) value = getattr(self, field.attname)
return dict(field.choices).get(value, value) return dict(field.choices).get(value, value)
def _get_next_or_previous_by_FIELD(self, field, is_next): def _get_next_or_previous_by_FIELD(self, field, is_next, **kwargs):
op = is_next and '>' or '<' op = is_next and '>' or '<'
where = '(%s %s %%s OR (%s = %%s AND %s.%s %s %%s))' % \ where = '(%s %s %%s OR (%s = %%s AND %s.%s %s %%s))' % \
(backend.quote_name(field.column), op, backend.quote_name(field.column), (backend.quote_name(field.column), op, backend.quote_name(field.column),
backend.quote_name(self._meta.db_table), backend.quote_name(self._meta.pk.column), op) backend.quote_name(self._meta.db_table), backend.quote_name(self._meta.pk.column), op)
param = str(getattr(self, field.attname)) param = str(getattr(self, field.attname))
q = self.__class__._default_manager.order_by((not is_next and '-' or '') + field.name, (not is_next and '-' or '') + self._meta.pk.name) q = self.__class__._default_manager.filter(**kwargs).order_by((not is_next and '-' or '') + field.name, (not is_next and '-' or '') + self._meta.pk.name)
q._where.append(where) q._where.append(where)
q._params.extend([param, param, getattr(self, self._meta.pk.attname)]) q._params.extend([param, param, getattr(self, self._meta.pk.attname)])
try: try:

2
tests/modeltests/lookup/models.py
View File

@ -128,6 +128,8 @@ True
<Article: Article 2> <Article: Article 2>
>>> a2.get_next_by_pub_date() >>> a2.get_next_by_pub_date()
<Article: Article 3> <Article: Article 3>
>>> a2.get_next_by_pub_date( headline__endswith = '6' )
<Article: Article 6>
>>> a3.get_next_by_pub_date() >>> a3.get_next_by_pub_date()
<Article: Article 7> <Article: Article 7>
>>> a4.get_next_by_pub_date() >>> a4.get_next_by_pub_date()