clean re-apply of fa0ca21

kelvich · kelvich · commit ee20dac05678 · 2017-09-07T20:25:31.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -4265,8 +4265,8 @@ Datum mtm_make_table_local(PG_FUNCTION_ARGS)
 		/* Form a tuple. */
 		memset(nulls, false, sizeof(nulls));
 
-		values[Anum_mtm_local_tables_rel_schema - 1] = CStringGetTextDatum(schemaName);
-		values[Anum_mtm_local_tables_rel_name - 1] = CStringGetTextDatum(tableName);
+		values[Anum_mtm_local_tables_rel_schema - 1] = CStringGetDatum(schemaName);
+		values[Anum_mtm_local_tables_rel_name - 1] = CStringGetDatum(tableName);
 
 		tup = heap_form_tuple(tupDesc, values, nulls);
 
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -871,7 +871,7 @@ process_remote_insert(StringInfo s, Relation rel)
 	if (strcmp(RelationGetRelationName(rel), MULTIMASTER_LOCAL_TABLES_TABLE) == 0 &&
 		strcmp(get_namespace_name(RelationGetNamespace(rel)), MULTIMASTER_SCHEMA_NAME) == 0)
 	{
-		MtmMakeTableLocal(TextDatumGetCString(new_tuple.values[0]), TextDatumGetCString(new_tuple.values[1]));
+		MtmMakeTableLocal((char*)DatumGetPointer(new_tuple.values[0]), (char*)DatumGetPointer(new_tuple.values[1]));
 	}
 		
     ExecResetTupleTable(estate->es_tupleTable, true);

Original file line number	Diff line number	Diff line change
`@@ -871,7 +871,7 @@ process_remote_insert(StringInfo s, Relation rel)`
`871`	`871`	`if (strcmp(RelationGetRelationName(rel), MULTIMASTER_LOCAL_TABLES_TABLE) == 0 &&`
`872`	`872`	`strcmp(get_namespace_name(RelationGetNamespace(rel)), MULTIMASTER_SCHEMA_NAME) == 0)`
`873`	`873`	`{`
`874`		`- MtmMakeTableLocal(TextDatumGetCString(new_tuple.values[0]), TextDatumGetCString(new_tuple.values[1]));`
	`874`	`+ MtmMakeTableLocal((char)DatumGetPointer(new_tuple.values[0]), (char)DatumGetPointer(new_tuple.values[1]));`
`875`	`875`	`}`
`876`	`876`
`877`	`877`	`ExecResetTupleTable(estate->es_tupleTable, true);`