Fix handling of dropped attributes in pglogical_apply

knizhnik · knizhnik · commit b23bb5e37e03 · 2016-09-28T17:15:08.000+03:00
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -413,18 +413,24 @@ read_tuple_parts(StringInfo s, Relation rel, TupleData *tup)
 
 	rnatts = pq_getmsgint(s, 2);
 
-	if (desc->natts != rnatts)
+	if (desc->natts < rnatts)
 		elog(ERROR, "tuple natts mismatch, %u vs %u", desc->natts, rnatts);
 
 	/* FIXME: unaligned data accesses */
 
 	for (i = 0; i < desc->natts; i++)
 	{
 		Form_pg_attribute att = desc->attrs[i];
-		char		kind = pq_getmsgbyte(s);
+		char		kind;
 		const char *data;
 		int			len;
 
+		if (att->atttypid == InvalidOid) { 
+			continue;
+		}
+
+		kind = pq_getmsgbyte(s);
+
 		switch (kind)
 		{
 			case 'n': /* null */
