Fix wrong error reports in 'number of array dimensions exceeds the

maximum allowed' messages, that have reported one-less dimensions.

Alexey Klyukin

diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 58bcdddb16334f0750a3e97dd998c9901c8db56e..1c792387de7012023c0d807f3eace3c70941fc76 100644 (file)
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -278,7 +278,7 @@ ExecEvalArrayRef(ArrayRefExprState *astate,
            ereport(ERROR,
                    (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
                     errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
-                           i, MAXDIM)));
+                           i + 1, MAXDIM)));
 
        upper.indx[i++] = DatumGetInt32(ExecEvalExpr(eltstate,
                                                     econtext,
@@ -306,7 +306,7 @@ ExecEvalArrayRef(ArrayRefExprState *astate,
                ereport(ERROR,
                        (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
                         errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
-                               i, MAXDIM)));
+                               j + 1, MAXDIM)));
 
            lower.indx[j++] = DatumGetInt32(ExecEvalExpr(eltstate,
                                                         econtext,

diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index d67b167aeeede0a30338fe574f62f5a30482f442..81f8e35a67d8cb5255bc786abe095d1bde9d14a7 100644 (file)
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -196,7 +196,7 @@ array_in(PG_FUNCTION_ARGS)
            ereport(ERROR,
                    (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
                     errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
-                           ndim, MAXDIM)));
+                           ndim + 1, MAXDIM)));
 
        for (q = p; isdigit((unsigned char) *q) || (*q == '-') || (*q == '+'); q++);
        if (q == p)             /* no digits? */
@@ -448,7 +448,7 @@ ArrayCount(const char *str, int *dim, char typdelim)
                            ereport(ERROR,
                                    (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
                                     errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
-                                           nest_level, MAXDIM)));
+                                           nest_level + 1, MAXDIM)));
                        temp[nest_level] = 0;
                        nest_level++;
                        if (ndim < nest_level)