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.

diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c
index ff900401935beed095ce1d821a7e1107f6522d16..72b87eb14405f99b99d20bd6af6dca21fef18ee5 100644 (file)
--- 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 0dabcc130e013d779e947fb69b55fae21daf6776..89f7056a6dbd57c341cf4167e9ac1454837e951b 100644 (file)
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -1452,7 +1452,13 @@ ProcessUtilitySlow(Node *parsetree,
                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 8ea6f39afd2ca3d42f5a3617ea65901dccf4f4b3..3a57a95c84969e9f22bd7066b79e3191cad2a712 100644 (file)
--- 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 (file)
index 0000000..afc352f
--- /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 (file)
index 0000000..ac13e21
--- /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;