From f00d75b8d7a5e101b1a7434c282c17f7bb90aaa1 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 16 Nov 2007 00:34:54 +0000 Subject: [PATCH] Add snb_ru_init(internal) to list of stub functions in tsearch2 compatibility module. Needed to support loading of 8.1-era tsearch2 configuration data. --- contrib/tsearch2/tsearch2.c | 3 ++- contrib/tsearch2/tsearch2.sql.in | 7 ++++++- contrib/tsearch2/uninstall_tsearch2.sql | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/contrib/tsearch2/tsearch2.c b/contrib/tsearch2/tsearch2.c index e0f0f651b8..3a64a8a79c 100644 --- a/contrib/tsearch2/tsearch2.c +++ b/contrib/tsearch2/tsearch2.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.c,v 1.3 2007/11/15 21:14:31 momjian Exp $ + * $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.c,v 1.4 2007/11/16 00:34:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -122,6 +122,7 @@ UNSUPPORTED_FUNCTION(tsa_snb_en_init); UNSUPPORTED_FUNCTION(tsa_snb_lexize); UNSUPPORTED_FUNCTION(tsa_snb_ru_init_koi8); UNSUPPORTED_FUNCTION(tsa_snb_ru_init_utf8); +UNSUPPORTED_FUNCTION(tsa_snb_ru_init); UNSUPPORTED_FUNCTION(tsa_spell_init); UNSUPPORTED_FUNCTION(tsa_spell_lexize); diff --git a/contrib/tsearch2/tsearch2.sql.in b/contrib/tsearch2/tsearch2.sql.in index 82c6163481..bea599c4e6 100644 --- a/contrib/tsearch2/tsearch2.sql.in +++ b/contrib/tsearch2/tsearch2.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.2 2007/11/13 22:14:50 tgl Exp $ */ +/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.3 2007/11/16 00:34:54 tgl Exp $ */ -- Adjust this setting to control where the objects get created. SET search_path = public; @@ -74,6 +74,11 @@ CREATE FUNCTION snb_ru_init_utf8(internal) as 'MODULE_PATHNAME', 'tsa_snb_ru_init_utf8' LANGUAGE C; +CREATE FUNCTION snb_ru_init(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_snb_ru_init' + LANGUAGE C; + CREATE FUNCTION spell_init(internal) RETURNS internal as 'MODULE_PATHNAME', 'tsa_spell_init' diff --git a/contrib/tsearch2/uninstall_tsearch2.sql b/contrib/tsearch2/uninstall_tsearch2.sql index 8eaf4a54de..180b021d2c 100644 --- a/contrib/tsearch2/uninstall_tsearch2.sql +++ b/contrib/tsearch2/uninstall_tsearch2.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/tsearch2/uninstall_tsearch2.sql,v 1.1 2007/11/13 21:02:29 tgl Exp $ */ +/* $PostgreSQL: pgsql/contrib/tsearch2/uninstall_tsearch2.sql,v 1.2 2007/11/16 00:34:54 tgl Exp $ */ -- Adjust this setting to control where the objects get dropped. SET search_path = public, pg_catalog; @@ -34,6 +34,7 @@ DROP FUNCTION snb_en_init(internal); DROP FUNCTION snb_lexize(internal,internal,int4); DROP FUNCTION snb_ru_init_koi8(internal); DROP FUNCTION snb_ru_init_utf8(internal); +DROP FUNCTION snb_ru_init(internal); DROP FUNCTION spell_init(internal); DROP FUNCTION spell_lexize(internal,internal,int4); DROP FUNCTION syn_init(internal);