Commitd79eeef

committed

Treat a zero-D array as empty in int_enum(), per Andrew@supernews.

1 parent3842892 commitd79eeefCopy full SHA for d79eeef

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,8 @@ int_enum(PG_FUNCTION_ARGS)`
`243`	`243`	`pc->flags=0;`
`244`	`244`	`}`
`245`	`245`	`/* Now that we have a detoasted array, verify dimensions */`
`246`		`-if (pc->p->a.ndim!=1)`
	`246`	`+/* We'll treat a zero-D array as empty, below */`
	`247`	`+if (pc->p->a.ndim>1)`
`247`	`248`	`elog(ERROR,"int_enum only accepts 1-D arrays");`
`248`	`249`	`pc->num=0;`
`249`	`250`	`fcinfo->context= (Node*)pc;`
`@@ -252,7 +253,7 @@ int_enum(PG_FUNCTION_ARGS)`
`252`	`253`	`else/* use an existing one */`
`253`	`254`	`pc= (CTX*)fcinfo->context;`
`254`	`255`	`/* Are we done yet? */`
`255`		`-if (pc->num >=pc->p->items)`
	`256`	`+if (pc->p->a.ndim<1\|\|pc->num >=pc->p->items)`
`256`	`257`	`{`
`257`	`258`	`/* We are done */`
`258`	`259`	`if (pc->flags&TOASTED)`

Comments

(0)