fix SQL replacement syntax

This commit is contained in:
Schuyler Erle 2011-08-31 03:46:26 -07:00
parent 79aca4260f
commit da14548849

View File

@ -35,9 +35,9 @@ class FeatureSearchManager(models.GeoManager):
self.set_threshold(threshold) self.set_threshold(threshold)
text = text.replace("'", "''") # escape the ' text = text.replace("'", "''") # escape the '
# use the pg_trgm index # use the pg_trgm index
qset = qset.extra(select={"similarity":"similarity(preferred_name, '%s')"}, qset = qset.extra(select={"similarity":"similarity(preferred_name, %s)"},
select_params=[text], select_params=[text],
where=["preferred_name %% '%s'"], where=["preferred_name %% %s"],
params=[text], params=[text],
order_by=["-similarity"]) order_by=["-similarity"])
if adm1: qset = qset.filter(admin1__exact=adm1) if adm1: qset = qset.filter(admin1__exact=adm1)