Django

Code

Changeset 1550

Show
Ignore:
Timestamp:
12/05/05 11:40:19 (3 years ago)
Author:
jacob
Message:

Fixed bug in get_next_by_FOO/get_previous_by_FOO methods that caused a database error when using those methods along with joining lookup contraints (i.e. "obj.get_next_by_pub_date(relatedidin=some_list)")

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/meta/__init__.py

    r1547 r1550  
    12461246def method_get_next_or_previous(get_object_func, opts, field, is_next, self, **kwargs): 
    12471247    op = is_next and '>' or '<' 
    1248     kwargs.setdefault('where', []).append('(%s %s %%s OR (%s = %%s AND %s %s %%s))' % \ 
     1248    kwargs.setdefault('where', []).append('(%s %s %%s OR (%s = %%s AND %s.%s %s %%s))' % \ 
    12491249        (db.db.quote_name(field.column), op, db.db.quote_name(field.column), 
    1250         db.db.quote_name(opts.pk.column), op)) 
     1250        db.db.quote_name(opts.db_table), db.db.quote_name(opts.pk.column), op)) 
    12511251    param = str(getattr(self, field.attname)) 
    12521252    kwargs.setdefault('params', []).extend([param, param, getattr(self, opts.pk.attname)])