database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-19 13:42:17 +03:00
Code Activity

Create stub functions to support pg_upgrade of old contrib/tsearch2.

Browse Source 
Commits 9ff60273e3 and dbe2328959 adjusted the declarations
of some core functions referenced by contrib/tsearch2's install script,
forgetting that in a pg_upgrade situation, we'll be trying to restore
operator class definitions that reference the old signatures.  We've
hit this problem before; solve it in the same way as before, namely by
installing stub functions that have the expected signature and just
invoke the correct function.  Per report from Jeff Janes.

(Someday we ought to stop supporting contrib/tsearch2, but I'm not
sure today is that day.)
This commit is contained in:
Tom Lane
2016-03-02 17:37:54 -05:00
parent cc6077d4d5
commit eb43e851d6
6 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/utils/adt/tsginidx.c
View File

@@ -377,3 +377,23 @@ gin_tsquery_consistent_6args(PG_FUNCTION_ARGS)
elog(ERROR, "gin_tsquery_consistent requires eight arguments");
return gin_tsquery_consistent(fcinfo);
}
/*
* Likewise, a stub version of gin_extract_tsquery declared with argument
* types that are no longer considered appropriate.
*/
Datum
gin_extract_tsquery_oldsig(PG_FUNCTION_ARGS)
{
return gin_extract_tsquery(fcinfo);
}
/*
* Likewise, a stub version of gin_tsquery_consistent declared with argument
* types that are no longer considered appropriate.
*/
Datum
gin_tsquery_consistent_oldsig(PG_FUNCTION_ARGS)
{
return gin_tsquery_consistent(fcinfo);
}