[patch] order_by breaks for column in a custom SELECT

[feiyu.xie@…]

Here is an example:

        select = {
                'votes': 'SELECT COUNT(*) FROM faxian_vote WHERE story_id=faxian_story.id',
        }
        order_by = '-votes'
        sl = Story.objects.extra(select=select,).filter(promotion_ts__isnull=False,).order_by(order_by)[:10]

The problematic line is in django\models\query.py, line 430:

        if "." not in col_name and col_name not in [k[0] for k in (self._select or ())]:

k[0] will be the first letter of the key name in self._select, in this case, 'v'

So it should be changed to:

        if "." not in col_name and col_name not in [k for k in (self._select or ())]:

[Adrian Holovaty]

(In [2803]) magic-removal: Fixed #1685 -- order_by no longer breaks when using a custom 'select'. Thanks, feiyu.xie

[Adrian Holovaty]

Milestone Version 0.92 deleted