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.