Subqueries with non-"id" OneToOneField primary keys try to join against the wrong column name

[ris]

Hi, your favourite ORM obscure-query bug reporter again here...

Using Django 1.7.1 & postgres, example models.py:

class ModelA ( models.Model ):
	x = models.TextField ()

class ModelB ( models.Model ):
	a = models.OneToOneField ( ModelA , primary_key = True )

issuing the query

>>> ModelB.objects.filter ( pk__in = ModelB.objects.filter ( a__x = "abc" ) )

results in

FieldError: Cannot resolve keyword u'id' into field. Choices are: a, a_id

A workaround exists:

>>> ModelB.objects.filter ( pk__in = ModelB.objects.filter ( a__x = "abc" ).values ( "pk" ) )

which behaves correctly.

[ris]

Having said the workaround behaves correctly, I realize adding .values (...) screws up the ordering of the subquery, which is important if using .distinct (...). Similar effects to #23622

[Tim Graham]

I can reproduce using the attached test. Doesn't appear to be a recent regression though (I tested back to 1.5).

[Tim Graham]

​PR from Anssi.

[Tim Graham <timograham@…>]

In 9ed8215:

Fixed #23791 -- Corrected object type check for pkin=qs

When the pk was a relation field, qs.filter(pkin=qs) didn't work.

In addition, fixed Restaurant.objects.filter(place=restaurant_instance),
where place is an OneToOneField and the primary key of Restaurant.

A big thank you to Josh for review and to Tim for review and cosmetic
edits.

Thanks to Beauhurst for commissioning the work on this ticket.