Fix possible incorrect column reference in ERROR message

When creating a partition for a RANGE partitioned table, the reporting
of errors relating to converting the specified range values into
constant values for the partition key's type could display the name of a
previous partition key column when an earlier range was specified as
MINVALUE or MAXVALUE.

This was caused by the code not correctly incrementing the index that
tracks which partition key the foreach loop was working on after
processing MINVALUE/MAXVALUE ranges.

Fix by using foreach_current_index() to ensure the index variable is
always set to the List element being worked on.

Author: myzhen <zhenmingyang@yeah.net>
Reviewed-by: zhibin wang <killerwzb@gmail.com>
Discussion: https://postgr.es/m/273cab52.978.19b96fc75e7.Coremail.zhenmingyang@yeah.net
Backpatch-through: 14

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 68adf9caa04ccdf0f4f90d0fd0027aca97c86569..924a2de9918b4c81da87aaa7e0b7898e5b821402 100644 (file)
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -4158,12 +4158,14 @@ transformPartitionRangeBounds(ParseState *pstate, List *blist,
        int                     i,
                                j;
 
-       i = j = 0;
+       j = 0;
        foreach(lc, blist)
        {
                Node       *expr = lfirst(lc);
                PartitionRangeDatum *prd = NULL;
 
+               i = foreach_current_index(lc);
+
                /*
                 * Infinite range bounds -- "minvalue" and "maxvalue" -- get passed in
                 * as ColumnRefs.
@@ -4241,7 +4243,6 @@ transformPartitionRangeBounds(ParseState *pstate, List *blist,
                        prd = makeNode(PartitionRangeDatum);
                        prd->kind = PARTITION_RANGE_DATUM_VALUE;
                        prd->value = (Node *) value;
-                       ++i;
                }
 
                prd->location = exprLocation(expr);