From 9ab8dcda199a4f0d592f020f99ce694e3dbb66bd Mon Sep 17 00:00:00 2001 From: Greg Sabino Mullane Date: Sun, 3 Sep 2006 02:43:26 +0000 Subject: [PATCH] Explicitly use 'default' locale for tsearch2 queries. --- includes/SearchPostgres.php | 4 ++-- maintenance/postgres/tables.sql | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/SearchPostgres.php b/includes/SearchPostgres.php index 8d8ceea0bc..faf53f027a 100644 --- a/includes/SearchPostgres.php +++ b/includes/SearchPostgres.php @@ -99,7 +99,7 @@ class SearchPostgres extends SearchEngine { $query = "SELECT page_id, page_namespace, page_title, old_text AS page_text ". "FROM page p, revision r, pagecontent c WHERE p.page_latest = r.rev_id " . - "AND r.rev_text_id = c.old_id AND $fulltext @@ to_tsquery('$match')"; + "AND r.rev_text_id = c.old_id AND $fulltext @@ to_tsquery('default','$match')"; ## Redirects if (! $this->showRedirects) @@ -113,7 +113,7 @@ class SearchPostgres extends SearchEngine { $query .= " AND page_namespace IN ($namespaces)"; } - $query .= " ORDER BY rank($fulltext, to_tsquery('$fulltext')) DESC"; + $query .= " ORDER BY rank($fulltext, to_tsquery('default','$fulltext')) DESC"; $query .= $this->db->limitResult( '', $this->limit, $this->offset ); diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index 46b428baf9..17f51e785b 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -406,9 +406,9 @@ CREATE FUNCTION ts2_page_title() RETURNS TRIGGER LANGUAGE plpgsql AS $mw$ BEGIN IF TG_OP = 'INSERT' THEN - NEW.titlevector = to_tsvector(NEW.page_title); + NEW.titlevector = to_tsvector('default',NEW.page_title); ELSIF NEW.page_title != OLD.page_title THEN - NEW.titlevector := to_tsvector(NEW.page_title); + NEW.titlevector := to_tsvector('default',NEW.page_title); END IF; RETURN NEW; END; @@ -424,9 +424,9 @@ CREATE FUNCTION ts2_page_text() RETURNS TRIGGER LANGUAGE plpgsql AS $mw$ BEGIN IF TG_OP = 'INSERT' THEN - NEW.textvector = to_tsvector(NEW.old_text); + NEW.textvector = to_tsvector('default',NEW.old_text); ELSIF NEW.old_text != OLD.old_text THEN - NEW.textvector := to_tsvector(NEW.old_text); + NEW.textvector := to_tsvector('default',NEW.old_text); END IF; RETURN NEW; END; -- 2.20.1