From 12bd7dd317e8f4346fb3507578aca790ede6ebea Mon Sep 17 00:00:00 2001 From: Stephen Frost Date: Thu, 22 Dec 2016 17:08:43 -0500 Subject: [PATCH] Use TSConfigRelationId in AlterTSConfiguration() When we are altering a text search configuration, we are getting the tuple from pg_ts_config and using its OID, so use TSConfigRelationId when invoking any post-alter hooks and setting the object address. Further, in the functions called from AlterTSConfiguration(), we're saving information about the command via EventTriggerCollectAlterTSConfig(), so we should be setting commandCollected to true. Also add a regression test to test_ddl_deparse for ALTER TEXT SEARCH CONFIGURATION. Author: Artur Zakirov, a few additional comments by me Discussion: https://www.postgresql.org/message-id/57a71eba-f2c7-e7fd-6fc0-2126ec0b39bd%40postgrespro.ru Back-patch the fix for the InvokeObjectPostAlterHook() call to 9.3 where it was introduced, and the fix for the ObjectAddressSet() call and setting commandCollected to true to 9.5 where those changes to ProcessUtilitySlow() were introduced. --- src/backend/commands/tsearchcmds.c | 4 ++-- src/backend/tcop/utility.c | 8 +++++++- src/test/modules/test_ddl_deparse/Makefile | 1 + .../modules/test_ddl_deparse/expected/alter_ts_config.out | 8 ++++++++ src/test/modules/test_ddl_deparse/sql/alter_ts_config.sql | 8 ++++++++ 5 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 src/test/modules/test_ddl_deparse/expected/alter_ts_config.out create mode 100644 src/test/modules/test_ddl_deparse/sql/alter_ts_config.sql diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index b24011371c..2b84848cf5 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -1215,10 +1215,10 @@ AlterTSConfiguration(AlterTSConfigurationStmt *stmt) /* Update dependencies */ makeConfigurationDependencies(tup, true, relMap); - InvokeObjectPostAlterHook(TSConfigMapRelationId, + InvokeObjectPostAlterHook(TSConfigRelationId, HeapTupleGetOid(tup), 0); - ObjectAddressSet(address, TSConfigMapRelationId, cfgId); + ObjectAddressSet(address, TSConfigRelationId, cfgId); heap_close(relMap, RowExclusiveLock); diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index fd4eff4907..2e89ad783a 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -1479,7 +1479,13 @@ ProcessUtilitySlow(ParseState *pstate, break; case T_AlterTSConfigurationStmt: - address = AlterTSConfiguration((AlterTSConfigurationStmt *) parsetree); + AlterTSConfiguration((AlterTSConfigurationStmt *) parsetree); + /* + * Commands are stashed in MakeConfigurationMapping and + * DropConfigurationMapping, which are called from + * AlterTSConfiguration + */ + commandCollected = true; break; case T_AlterTableMoveAllStmt: diff --git a/src/test/modules/test_ddl_deparse/Makefile b/src/test/modules/test_ddl_deparse/Makefile index 8ea6f39afd..3a57a95c84 100644 --- a/src/test/modules/test_ddl_deparse/Makefile +++ b/src/test/modules/test_ddl_deparse/Makefile @@ -23,6 +23,7 @@ REGRESS = test_ddl_deparse \ comment_on \ alter_function \ alter_sequence \ + alter_ts_config \ alter_type_enum \ opfamily \ defprivs \ diff --git a/src/test/modules/test_ddl_deparse/expected/alter_ts_config.out b/src/test/modules/test_ddl_deparse/expected/alter_ts_config.out new file mode 100644 index 0000000000..afc352fc5f --- /dev/null +++ b/src/test/modules/test_ddl_deparse/expected/alter_ts_config.out @@ -0,0 +1,8 @@ +-- +-- ALTER TEXT SEARCH CONFIGURATION +-- +CREATE TEXT SEARCH CONFIGURATION en (copy=english); +NOTICE: DDL test: type simple, tag CREATE TEXT SEARCH CONFIGURATION +ALTER TEXT SEARCH CONFIGURATION en + ALTER MAPPING FOR host, email, url, sfloat WITH simple; +NOTICE: DDL test: type alter text search configuration, tag ALTER TEXT SEARCH CONFIGURATION diff --git a/src/test/modules/test_ddl_deparse/sql/alter_ts_config.sql b/src/test/modules/test_ddl_deparse/sql/alter_ts_config.sql new file mode 100644 index 0000000000..ac13e21dda --- /dev/null +++ b/src/test/modules/test_ddl_deparse/sql/alter_ts_config.sql @@ -0,0 +1,8 @@ +-- +-- ALTER TEXT SEARCH CONFIGURATION +-- + +CREATE TEXT SEARCH CONFIGURATION en (copy=english); + +ALTER TEXT SEARCH CONFIGURATION en + ALTER MAPPING FOR host, email, url, sfloat WITH simple;