From e05b91fa0dd54e4a973da6c462b023f64b7197fd Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 17 Feb 2017 10:08:15 -0500 Subject: [PATCH] Fix logical replication with different encodings --- src/backend/replication/libpqwalreceiver/libpqwalreceiver.c | 6 ++++++ src/backend/replication/logical/proto.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..71f57b89f6 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -22,6 +22,7 @@ #include "libpq-fe.h" #include "pqexpbuffer.h" #include "access/xlog.h" +#include "mb/pg_wchar.h" #include "miscadmin.h" #include "pgstat.h" #include "replication/logicalproto.h" @@ -134,6 +135,11 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, } keys[++i] = "fallback_application_name"; vals[i] = appname; + if (logical) + { + keys[++i] = "client_encoding"; + vals[i] = GetDatabaseEncodingName(); + } keys[++i] = NULL; vals[i] = NULL; diff --git a/src/backend/replication/logical/proto.c b/src/backend/replication/logical/proto.c index 142cd993cd..bc6e9b5a98 100644 --- a/src/backend/replication/logical/proto.c +++ b/src/backend/replication/logical/proto.c @@ -444,7 +444,7 @@ logicalrep_write_tuple(StringInfo out, Relation rel, HeapTuple tuple) outputstr = OidOutputFunctionCall(typclass->typoutput, values[i]); len = strlen(outputstr) + 1; /* null terminated */ pq_sendint(out, len, 4); /* length */ - appendBinaryStringInfo(out, outputstr, len); /* data */ + pq_sendstring(out, outputstr); /* data */ pfree(outputstr); -- 2.11.1