diff options
| -rw-r--r-- | contrib/tsearch2/gendict/sql.IN | 2 | ||||
| -rw-r--r-- | contrib/tsearch2/tsearch.sql.in | 20 | ||||
| -rw-r--r-- | contrib/tsearch2/untsearch.sql.in | 10 | ||||
| -rw-r--r-- | src/backend/catalog/pg_proc.c | 41 |
4 files changed, 41 insertions, 32 deletions
diff --git a/contrib/tsearch2/gendict/sql.IN b/contrib/tsearch2/gendict/sql.IN index ff0d8423999..044230b4173 100644 --- a/contrib/tsearch2/gendict/sql.IN +++ b/contrib/tsearch2/gendict/sql.IN @@ -1,7 +1,7 @@ SET search_path = public; BEGIN; -HASINIT create function dinit_CFG_MODNAME(text) +HASINIT create function dinit_CFG_MODNAME(internal) HASINIT returns internal HASINIT as 'MODULE_PATHNAME' HASINIT language 'C'; diff --git a/contrib/tsearch2/tsearch.sql.in b/contrib/tsearch2/tsearch.sql.in index 35f96cd5cdb..b51b049b9a8 100644 --- a/contrib/tsearch2/tsearch.sql.in +++ b/contrib/tsearch2/tsearch.sql.in @@ -44,7 +44,7 @@ CREATE FUNCTION set_curdict(text) with (isstrict); --built-in dictionaries -CREATE FUNCTION dex_init(text) +CREATE FUNCTION dex_init(internal) returns internal as 'MODULE_PATHNAME' language 'C'; @@ -57,13 +57,13 @@ CREATE FUNCTION dex_lexize(internal,internal,int4) insert into pg_ts_dict select 'simple', - 'dex_init(text)', + 'dex_init(internal)', null, 'dex_lexize(internal,internal,int4)', 'Simple example of dictionary.' ; -CREATE FUNCTION snb_en_init(text) +CREATE FUNCTION snb_en_init(internal) returns internal as 'MODULE_PATHNAME' language 'C'; @@ -76,26 +76,26 @@ CREATE FUNCTION snb_lexize(internal,internal,int4) insert into pg_ts_dict select 'en_stem', - 'snb_en_init(text)', + 'snb_en_init(internal)', 'contrib/english.stop', 'snb_lexize(internal,internal,int4)', 'English Stemmer. Snowball.' ; -CREATE FUNCTION snb_ru_init(text) +CREATE FUNCTION snb_ru_init(internal) returns internal as 'MODULE_PATHNAME' language 'C'; insert into pg_ts_dict select 'ru_stem', - 'snb_ru_init(text)', + 'snb_ru_init(internal)', 'contrib/russian.stop', 'snb_lexize(internal,internal,int4)', 'Russian Stemmer. Snowball.' ; -CREATE FUNCTION spell_init(text) +CREATE FUNCTION spell_init(internal) returns internal as 'MODULE_PATHNAME' language 'C'; @@ -108,13 +108,13 @@ CREATE FUNCTION spell_lexize(internal,internal,int4) insert into pg_ts_dict select 'ispell_template', - 'spell_init(text)', + 'spell_init(internal)', null, 'spell_lexize(internal,internal,int4)', 'ISpell interface. Must have .dict and .aff files' ; -CREATE FUNCTION syn_init(text) +CREATE FUNCTION syn_init(internal) returns internal as 'MODULE_PATHNAME' language 'C'; @@ -127,7 +127,7 @@ CREATE FUNCTION syn_lexize(internal,internal,int4) insert into pg_ts_dict select 'synonym', - 'syn_init(text)', + 'syn_init(internal)', null, 'syn_lexize(internal,internal,int4)', 'Example of synonym dictionary' diff --git a/contrib/tsearch2/untsearch.sql.in b/contrib/tsearch2/untsearch.sql.in index b1883d5fbdf..2a658dfd933 100644 --- a/contrib/tsearch2/untsearch.sql.in +++ b/contrib/tsearch2/untsearch.sql.in @@ -34,14 +34,14 @@ DROP FUNCTION lexize(text, text); DROP FUNCTION lexize(text); DROP FUNCTION set_curdict(int); DROP FUNCTION set_curdict(text); -DROP FUNCTION dex_init(text); +DROP FUNCTION dex_init(internal); DROP FUNCTION dex_lexize(internal,internal,int4); -DROP FUNCTION snb_en_init(text); +DROP FUNCTION snb_en_init(internal); DROP FUNCTION snb_lexize(internal,internal,int4); -DROP FUNCTION snb_ru_init(text); -DROP FUNCTION spell_init(text); +DROP FUNCTION snb_ru_init(internal); +DROP FUNCTION spell_init(internal); DROP FUNCTION spell_lexize(internal,internal,int4); -DROP FUNCTION syn_init(text); +DROP FUNCTION syn_init(internal); DROP FUNCTION syn_lexize(internal,internal,int4); DROP FUNCTION set_curprs(int); DROP FUNCTION set_curprs(text); diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index a6a8632b9b6..f33d8b4106b 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.122 2004/12/31 21:59:38 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.122.4.1 2005/05/03 16:51:22 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -72,6 +72,8 @@ ProcedureCreate(const char *procedureName, const char *parameterNames[]) { int i; + bool genericParam = false; + bool internalParam = false; Relation rel; HeapTuple tup; HeapTuple oldtup; @@ -102,29 +104,36 @@ ProcedureCreate(const char *procedureName, /* * Do not allow return type ANYARRAY or ANYELEMENT unless at least one - * argument is also ANYARRAY or ANYELEMENT + * input argument is ANYARRAY or ANYELEMENT. Also, do not allow + * return type INTERNAL unless at least one input argument is INTERNAL. */ - if (returnType == ANYARRAYOID || returnType == ANYELEMENTOID) + for (i = 0; i < parameterCount; i++) { - bool genericParam = false; - - for (i = 0; i < parameterCount; i++) + switch (parameterTypes[i]) { - if (parameterTypes[i] == ANYARRAYOID || - parameterTypes[i] == ANYELEMENTOID) - { + case ANYARRAYOID: + case ANYELEMENTOID: genericParam = true; break; - } + case INTERNALOID: + internalParam = true; + break; } - - if (!genericParam) - ereport(ERROR, - (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), - errmsg("cannot determine result data type"), - errdetail("A function returning \"anyarray\" or \"anyelement\" must have at least one argument of either type."))); } + if ((returnType == ANYARRAYOID || returnType == ANYELEMENTOID) + && !genericParam) + ereport(ERROR, + (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), + errmsg("cannot determine result data type"), + errdetail("A function returning \"anyarray\" or \"anyelement\" must have at least one argument of either type."))); + + if (returnType == INTERNALOID && !internalParam) + ereport(ERROR, + (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), + errmsg("unsafe use of INTERNAL pseudo-type"), + errdetail("A function returning \"internal\" must have at least one \"internal\" argument."))); + /* Make sure we have a zero-padded param type array */ MemSet(typev, 0, FUNC_MAX_ARGS * sizeof(Oid)); if (parameterCount > 0) |