Hopiu/django-watson
1
0
Fork 0
mirror of https://github.com/Hopiu/django-watson.git synced 2026-03-16 22:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #169 from joblicate/feature/fix-uuid

Browse source 
Make join work with uuid primary key models
This commit is contained in:
Dave Hall 2016-07-04 10:05:49 +01:00 committed by GitHub
commit ed0b1a89e8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/watson/backends.py
View file

@ -274,8 +274,11 @@ class PostgresSearchBackend(SearchBackend):
pk = model._meta.pk
if has_int_pk(model):
ref_name = "object_id_int"
ref_name_typecast = ""
else:
ref_name = "object_id"
# Cast to text to make join work with uuid columns
ref_name_typecast = "::text"
return queryset.extra(
tables = ("watson_searchentry",),
where = (
@ -283,10 +286,11 @@ class PostgresSearchBackend(SearchBackend):
"watson_searchentry.search_tsv @@ to_tsquery('{search_config}', %s)".format(
search_config = self.search_config
),
"watson_searchentry.{ref_name} = {table_name}.{pk_name}".format(
"watson_searchentry.{ref_name} = {table_name}.{pk_name}{ref_name_typecast}".format(
ref_name = ref_name,
table_name = connection.ops.quote_name(model._meta.db_table),
pk_name = connection.ops.quote_name(pk.db_column or pk.attname),
ref_name_typecast = ref_name_typecast
),
"watson_searchentry.content_type_id = %s"
),