favor a perfect match

wcs/sql.py

@@ -1579,7 +1579,7 @@ def do_global_views(conn, cur):
                 % (name, category.id)
             )
 
-    init_search_tokens_triggers(cur)
+    init_search_tokens(cur)
 
 
 def clean_global_views(conn, cur):
@@ -1703,6 +1703,7 @@ def init_search_tokens(conn=None, cur=None):
     init_search_tokens_data(cur)
 
     # Index at the end, small performance trick... not that useful, but it's free...
+    cur.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm;")
     cur.execute("CREATE INDEX IF NOT EXISTS wcs_search_tokens_trgm ON wcs_search_tokens USING gin(token gin_trgm_ops);")
 
     # And last: functions to use this brand new table
@@ -1715,7 +1716,13 @@ def init_search_tokens(conn=None, cur=None):
 AS $function$
 with
         tokenized as (select unnest(regexp_split_to_array($1, '\s+')) w),
-        super_tokenized as (select w, coalesce(tsquery_agg_or(plainto_tsquery(token) order by token <-> w desc), plainto_tsquery(w)) tokens from tokenized left join wcs_search_tokens on token % w group by w)
+        super_tokenized as (
+            select w,
+                coalesce(perfect.token, tsquery_agg_or(plainto_tsquery(token) order by token <-> w desc), plainto_tsquery(w)) tokens
+            from tokenized
+            left join wcs_search_tokens perfect on token = plainto_tsquery(w)
+            left join wcs_search_tokens on token % w and w not similar to '%[0-9]{2,}%'
+            group by w)
 select tsquery_agg_and(tokens) from super_tokenized;
 $function$;""")