Fix dblink to treat connection names longer than NAMEDATALEN-2 (62 bytes).

Now long names are adjusted with truncate_identifier() and NOTICE messages
are raised if names are actually truncated.

Backported to release 8.0.

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 256bcad41cda387380d0387809fd1135997397d1..b239ba33163878156611978feef499ff47d67ea7 100644 (file)
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -48,6 +48,7 @@
 #include "nodes/execnodes.h"
 #include "nodes/pg_list.h"
 #include "parser/parse_type.h"
+#include "parser/scansup.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
@@ -2075,13 +2076,13 @@ static remoteConn *
 getConnectionByName(const char *name)
 {
        remoteConnHashEnt *hentry;
-       char            key[NAMEDATALEN];
+       char       *key;
 
        if (!remoteConnHash)
                remoteConnHash = createConnHash();
 
-       MemSet(key, 0, NAMEDATALEN);
-       snprintf(key, NAMEDATALEN - 1, "%s", name);
+       key = pstrdup(name);
+       truncate_identifier(key, strlen(key), true);
        hentry = (remoteConnHashEnt *) hash_search(remoteConnHash,
                                                                                           key, HASH_FIND, NULL);
 
@@ -2107,13 +2108,13 @@ createNewConnection(const char *name, remoteConn * con)
 {
        remoteConnHashEnt *hentry;
        bool            found;
-       char            key[NAMEDATALEN];
+       char       *key;
 
        if (!remoteConnHash)
                remoteConnHash = createConnHash();
 
-       MemSet(key, 0, NAMEDATALEN);
-       snprintf(key, NAMEDATALEN - 1, "%s", name);
+       key = pstrdup(name);
+       truncate_identifier(key, strlen(key), true);
        hentry = (remoteConnHashEnt *) hash_search(remoteConnHash, key,
                                                                                           HASH_ENTER, &found);
 
@@ -2136,14 +2137,13 @@ deleteConnection(const char *name)
 {
        remoteConnHashEnt *hentry;
        bool            found;
-       char            key[NAMEDATALEN];
+       char       *key;
 
        if (!remoteConnHash)
                remoteConnHash = createConnHash();
 
-       MemSet(key, 0, NAMEDATALEN);
-       snprintf(key, NAMEDATALEN - 1, "%s", name);
-
+       key = pstrdup(name);
+       truncate_identifier(key, strlen(key), true);
        hentry = (remoteConnHashEnt *) hash_search(remoteConnHash,
                                                                                           key, HASH_REMOVE, &found);