Commit9a01285

committed

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

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

1 parent6bfa6b0 commit9a01285Copy full SHA for 9a01285

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -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`	`+i+1,MAXDIM)));`
`298`	`298`
`299`	`299`	`upper.indx[i++]=DatumGetInt32(ExecEvalExpr(eltstate,`
`300`	`300`	`econtext,`
`@@ -322,7 +322,7 @@ ExecEvalArrayRef(ArrayRefExprState *astate,`
`322`	`322`	`ereport(ERROR,`
`323`	`323`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`324`	`324`	`errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",`
`325`		`-i,MAXDIM)));`
	`325`	`+j+1,MAXDIM)));`
`326`	`326`
`327`	`327`	`lower.indx[j++]=DatumGetInt32(ExecEvalExpr(eltstate,`
`328`	`328`	`econtext,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ array_in(PG_FUNCTION_ARGS)`
`202`	`202`	`ereport(ERROR,`
`203`	`203`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`204`	`204`	`errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",`
`205`		`-ndim,MAXDIM)));`
	`205`	`+ndim+1,MAXDIM)));`
`206`	`206`
`207`	`207`	`for (q=p;isdigit((unsignedchar)q)\|\| (q=='-')\|\| (*q=='+');q++);`
`208`	`208`	`if (q==p)/* no digits? */`
`@@ -481,7 +481,7 @@ ArrayCount(const char str, int dim, char typdelim)`
`481`	`481`	`ereport(ERROR,`
`482`	`482`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`483`	`483`	`errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",`
`484`		`-nest_level,MAXDIM)));`
	`484`	`+nest_level+1,MAXDIM)));`
`485`	`485`	`temp[nest_level]=0;`
`486`	`486`	`nest_level++;`
`487`	`487`	`if (ndim<nest_level)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3763,7 +3763,7 @@ exec_assign_value(PLpgSQL_execstate *estate,`
`3763`	`3763`	`ereport(ERROR,`
`3764`	`3764`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`3765`	`3765`	`errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",`
`3766`		`-nsubscripts,MAXDIM)));`
	`3766`	`+nsubscripts+1,MAXDIM)));`
`3767`	`3767`	`subscripts[nsubscripts++]=arrayelem->subscript;`
`3768`	`3768`	`target=estate->datums[arrayelem->arrayparentno];`
`3769`	`3769`	`}while (target->dtype==PLPGSQL_DTYPE_ARRAYELEM);`

Comments

(0)