postgres_fdw: make_tuple_from_result_row should set cur_attno for ctid.

robertmhaas · robertmhaas · commit 4a46a99d8936 · 2016-03-15T16:51:56.000-04:00
There's no reason for this function to do this for every other attribute number and omit it for CTID, especially since conversion_error_callback has code to handle that case. This seems to be an oversight in commit e690b95. Etsuro Fujita
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
@@ -3803,18 +3803,17 @@ make_tuple_from_result_row(PGresult *res,
 			valstr = PQgetvalue(res, row, j);
 
 		/* convert value to internal representation */
+		errpos.cur_attno = i;
 		if (i > 0)
 		{
 			/* ordinary column */
 			Assert(i <= tupdesc->natts);
 			nulls[i - 1] = (valstr == NULL);
 			/* Apply the input function even to nulls, to support domains */
-			errpos.cur_attno = i;
 			values[i - 1] = InputFunctionCall(&attinmeta->attinfuncs[i - 1],
 											  valstr,
 											  attinmeta->attioparams[i - 1],
 											  attinmeta->atttypmods[i - 1]);
-			errpos.cur_attno = 0;
 		}
 		else if (i == SelfItemPointerAttributeNumber)
 		{
@@ -3827,6 +3826,7 @@ make_tuple_from_result_row(PGresult *res,
 				ctid = (ItemPointer) DatumGetPointer(datum);
 			}
 		}
+		errpos.cur_attno = 0;
 
 		j++;
 	}

Original file line number	Diff line number	Diff line change
`@@ -3803,18 +3803,17 @@ make_tuple_from_result_row(PGresult *res,`
`3803`	`3803`	`valstr = PQgetvalue(res, row, j);`
`3804`	`3804`
`3805`	`3805`	`/* convert value to internal representation */`
	`3806`	`+ errpos.cur_attno = i;`
`3806`	`3807`	`if (i > 0)`
`3807`	`3808`	`{`
`3808`	`3809`	`/* ordinary column */`
`3809`	`3810`	`Assert(i <= tupdesc->natts);`
`3810`	`3811`	`nulls[i - 1] = (valstr == NULL);`
`3811`	`3812`	`/* Apply the input function even to nulls, to support domains */`
`3812`		`- errpos.cur_attno = i;`
`3813`	`3813`	`values[i - 1] = InputFunctionCall(&attinmeta->attinfuncs[i - 1],`
`3814`	`3814`	`valstr,`
`3815`	`3815`	`attinmeta->attioparams[i - 1],`
`3816`	`3816`	`attinmeta->atttypmods[i - 1]);`
`3817`		`- errpos.cur_attno = 0;`
`3818`	`3817`	`}`
`3819`	`3818`	`else if (i == SelfItemPointerAttributeNumber)`
`3820`	`3819`	`{`
`@@ -3827,6 +3826,7 @@ make_tuple_from_result_row(PGresult *res,`
`3827`	`3826`	`ctid = (ItemPointer) DatumGetPointer(datum);`
`3828`	`3827`	`}`
`3829`	`3828`	`}`
	`3829`	`+ errpos.cur_attno = 0;`
`3830`	`3830`
`3831`	`3831`	`j++;`
`3832`	`3832`	`}`