Commit29faadc

committed

Make unaccent's install/uninstall scripts look more like all the others.

Set search_path explicitly, don't use IF EXISTS, etc.

1 parentda8d684 commit29faadcCopy full SHA for 29faadc

File tree

+16

-13

lines changed

+16

-13

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,17 @@`
`1`		`-/* $PostgreSQL: pgsql/contrib/unaccent/unaccent.sql.in,v 1.1 2009/08/18 10:34:39 teodor Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/contrib/unaccent/unaccent.sql.in,v 1.2 2009/11/14 18:24:32 tgl Exp $ */`
	`2`	`+`
	`3`	`+-- Adjust this setting to control where the objects get created.`
	`4`	`+SET search_path = public;`
`2`	`5`
`3`	`6`	`CREATE OR REPLACE FUNCTION unaccent(regdictionary, text)`
`4`	`7`	`RETURNS text`
`5`	`8`	`AS 'MODULE_PATHNAME', 'unaccent_dict'`
`6`		`-LANGUAGE CRETURNS NULL ON NULL INPUT IMMUTABLE;`
	`9`	`+LANGUAGE CSTRICT;`
`7`	`10`
`8`	`11`	`CREATE OR REPLACE FUNCTION unaccent(text)`
`9`	`12`	`RETURNS text`
`10`	`13`	`AS 'MODULE_PATHNAME', 'unaccent_dict'`
`11`		`-LANGUAGE CRETURNS NULL ON NULL INPUT IMMUTABLE;`
	`14`	`+LANGUAGE CSTRICT;`
`12`	`15`
`13`	`16`	`CREATE OR REPLACE FUNCTION unaccent_init(internal)`
`14`	`17`	`RETURNS internal`
`@@ -21,13 +24,11 @@ CREATE OR REPLACE FUNCTION unaccent_lexize(internal,internal,internal,internal)`
`21`	`24`	`LANGUAGE C;`
`22`	`25`
`23`	`26`	`CREATE TEXT SEARCH TEMPLATE unaccent (`
`24`		`-INIT = unaccent_init,`
	`27`	`+INIT = unaccent_init,`
`25`	`28`	`LEXIZE = unaccent_lexize`
`26`	`29`	`);`
`27`	`30`
`28`		`-`
`29`	`31`	`CREATE TEXT SEARCH DICTIONARY unaccent (`
`30`	`32`	`TEMPLATE = unaccent,`
`31`	`33`	`RULES = 'unaccent'`
`32`	`34`	`);`
`33`		`-`

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`		`-/* $PostgreSQL: pgsql/contrib/unaccent/uninstall_unaccent.sql,v 1.1 2009/08/18 10:34:39 teodor Exp $*/`
	`1`	`+/* $PostgreSQL: pgsql/contrib/unaccent/uninstall_unaccent.sql,v 1.2 2009/11/14 18:24:32 tgl Exp $*/`
`2`	`2`
`3`		`-DROPFUNCTION IF EXISTS unaccent(regdictionary,text) CASCADE;`
`4`		`-DROPFUNCTION IF EXISTS unaccent(text) CASCADE;`
`5`		`-DROPTEXT SEARCH DICTIONARY IF EXISTS unaccent CASCADE;`
`6`		`-DROPTEXT SEARCH TEMPLATE IF EXISTS unaccent CASCADE;`
`7`		`-DROPFUNCTION IF EXISTS unaccent_init(internal) CASCADE;`
`8`		`-DROPFUNCTION IF EXISTS unaccent_lexize(internal,internal,internal,internal) CASCADE;`
	`3`	`+-- Adjust this setting to control where the objects get dropped.`
	`4`	`+SET search_path= public;`
`9`	`5`
	`6`	`+DROPFUNCTION unaccent(regdictionary,text);`
	`7`	`+DROPFUNCTION unaccent(text);`
	`8`	`+DROPTEXT SEARCH DICTIONARY unaccent;`
	`9`	`+DROPTEXT SEARCH TEMPLATE unaccent;`
	`10`	`+DROPFUNCTION unaccent_init(internal);`
	`11`	`+DROPFUNCTION unaccent_lexize(internal,internal,internal,internal);`

Comments

(0)