summaryrefslogtreecommitdiff
path: root/contrib/fulltextindex
diff options
context:
space:
mode:
authorBruce Momjian2002-10-18 18:41:22 +0000
committerBruce Momjian2002-10-18 18:41:22 +0000
commitaa4c702eac936964649f905741b4a99f4b489200 (patch)
tree517d3c28aa3d28eb95b19c8676c940b5cefe2031 /contrib/fulltextindex
parentfb9bc342fffc157d6ca4b635aeeaccb3c1370b91 (diff)
Update /contrib for "autocommit TO 'on'".
Create objects in public schema. Make spacing/capitalization consistent. Remove transaction block use for object creation. Remove unneeded function GRANTs.
Diffstat (limited to 'contrib/fulltextindex')
-rw-r--r--contrib/fulltextindex/fti.pl2
-rw-r--r--contrib/fulltextindex/fti.sql.in7
-rw-r--r--contrib/fulltextindex/uninstall.sql5
3 files changed, 12 insertions, 2 deletions
diff --git a/contrib/fulltextindex/fti.pl b/contrib/fulltextindex/fti.pl
index 5b660ed815f..60c7d97c6bd 100644
--- a/contrib/fulltextindex/fti.pl
+++ b/contrib/fulltextindex/fti.pl
@@ -166,6 +166,8 @@ sub main {
return 1;
}
+ PQexec($PG_CONN, "SET search_path = public");
+ PQexec($PG_CONN, "SET autocommit TO 'on'");
PQexec($PG_CONN, "begin");
$query = "declare C cursor for select (\"";
diff --git a/contrib/fulltextindex/fti.sql.in b/contrib/fulltextindex/fti.sql.in
index f52a358385c..d109aa9a107 100644
--- a/contrib/fulltextindex/fti.sql.in
+++ b/contrib/fulltextindex/fti.sql.in
@@ -1,5 +1,8 @@
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
+
+SET autocommit TO 'on';
+
CREATE OR REPLACE FUNCTION fti() RETURNS trigger AS
'MODULE_PATHNAME', 'fti'
LANGUAGE 'C' VOLATILE CALLED ON NULL INPUT;
-
-GRANT EXECUTE ON FUNCTION fti() TO PUBLIC;
diff --git a/contrib/fulltextindex/uninstall.sql b/contrib/fulltextindex/uninstall.sql
index 02ad6ee602a..5a330546ab0 100644
--- a/contrib/fulltextindex/uninstall.sql
+++ b/contrib/fulltextindex/uninstall.sql
@@ -1 +1,6 @@
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
+
+SET autocommit TO 'on';
+
DROP FUNCTION fti() CASCADE;