Commit13a9a7b

committed

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

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

1 parentf62f223 commit13a9a7bCopy full SHA for 13a9a7b

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ ExecEvalArrayRef(ArrayRefExprState *astate,`
`266`	`266`	`ereport(ERROR,`
`267`	`267`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`268`	`268`	`errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",`
`269`		`-i,MAXDIM)));`
	`269`	`+i+1,MAXDIM)));`
`270`	`270`
`271`	`271`	`upper.indx[i++]=DatumGetInt32(ExecEvalExpr(eltstate,`
`272`	`272`	`econtext,`
`@@ -294,7 +294,7 @@ ExecEvalArrayRef(ArrayRefExprState *astate,`
`294`	`294`	`ereport(ERROR,`
`295`	`295`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`296`	`296`	`errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",`
`297`		`-i,MAXDIM)));`
	`297`	`+j+1,MAXDIM)));`
`298`	`298`
`299`	`299`	`lower.indx[j++]=DatumGetInt32(ExecEvalExpr(eltstate,`
`300`	`300`	`econtext,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ array_in(PG_FUNCTION_ARGS)`
`200`	`200`	`ereport(ERROR,`
`201`	`201`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`202`	`202`	`errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",`
`203`		`-ndim,MAXDIM)));`
	`203`	`+ndim+1,MAXDIM)));`
`204`	`204`
`205`	`205`	`for (q=p;isdigit((unsignedchar)q)\|\| (q=='-')\|\| (*q=='+');q++);`
`206`	`206`	`if (q==p)/* no digits? */`
`@@ -452,7 +452,7 @@ ArrayCount(const char str, int dim, char typdelim)`
`452`	`452`	`ereport(ERROR,`
`453`	`453`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`454`	`454`	`errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",`
`455`		`-nest_level,MAXDIM)));`
	`455`	`+nest_level+1,MAXDIM)));`
`456`	`456`	`temp[nest_level]=0;`
`457`	`457`	`nest_level++;`
`458`	`458`	`if (ndim<nest_level)`

Comments

(0)