Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix prefetch related with UUID fields #35

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

berndtj
Copy link

@berndtj berndtj commented Jul 9, 2014

Because the foreign key is stored as a string (char field) and
the uuid field is returned as a UUID (StringUUID) object, prefetch
related does not work.

This patch makes StringUUID dict keys equivelent to string dict
keys.

Because the foreign key is stored as a string (char field) and
the uuid field is returned as a UUID (StringUUID) object, prefetch
related does not work.

This patch makes StringUUID dict keys equivelent to string dict
keys.
@berndtj
Copy link
Author

berndtj commented Jul 9, 2014

This fixes the prefetch related issue and does not break existing code since the .hex method can still be called on the StringUUID object.

ydaniv added a commit to ydaniv/django-uuidfield that referenced this pull request Oct 1, 2014
@luto
Copy link
Collaborator

luto commented Nov 5, 2014

Looks good to me. Any concerns, @dcramer?

@sshishov
Copy link

The fix is not working when you are using hyphen = True in your model.
In this case in the dictionary it will be UUID with hyphen and checked against hex format what is incorrect.
IMHO you should __hash__ and __eq__ do against hex values always to be determenistic

Comment on lines +37 to +41
def __hash__(self):
return self.__unicode__().__hash__()

def __eq__(self, other):
return self.__unicode__().__eq__(unicode(other).replace('-', ''))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
def __hash__(self):
return self.__unicode__().__hash__()
def __eq__(self, other):
return self.__unicode__().__eq__(unicode(other).replace('-', ''))
def __hash__(self):
return self.__unicode__().replace('-', '').__hash__()
def __eq__(self, other):
return self.__unicode__().replace('-', '').__eq__(unicode(other).replace('-', ''))

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants