Commit97c4d9b

committed

Don't emit non-canonical empty arrays in array_remove().

Dean Rasheed

1 parent01497e7 commit97c4d9bCopy full SHA for 97c4d9b

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5398,6 +5398,14 @@ array_replace_internal(ArrayType *array,`
`5398`	`5398`	`returnarray;`
`5399`	`5399`	`}`
`5400`	`5400`
	`5401`	`+/* If all elements were removed return an empty array */`
	`5402`	`+if (nresult==0)`
	`5403`	`+{`
	`5404`	`+pfree(values);`
	`5405`	`+pfree(nulls);`
	`5406`	`+returnconstruct_empty_array(element_type);`
	`5407`	`+}`
	`5408`	`+`
`5401`	`5409`	`/* Allocate and initialize the result array */`
`5402`	`5410`	`if (hasnulls)`
`5403`	`5411`	`{`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1577,6 +1577,12 @@ select array_remove(array['A','CC','D','C','RR'], 'RR');`
`1577`	`1577`
`1578`	`1578`	`select array_remove('{{1,2,2},{1,4,3}}', 2); -- not allowed`
`1579`	`1579`	`ERROR: removing elements from multidimensional arrays is not supported`
	`1580`	`+select array_remove(array['X','X','X'], 'X') = '{}';`
	`1581`	`+ ?column?`
	`1582`	`+----------`
	`1583`	`+ t`
	`1584`	`+(1 row)`
	`1585`	`+`
`1580`	`1586`	`select array_replace(array[1,2,5,4],5,3);`
`1581`	`1587`	`array_replace`
`1582`	`1588`	`---------------`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -438,6 +438,7 @@ select array_remove(array[1,2,2,3], 5);`
`438`	`438`	`select array_remove(array[1,NULL,NULL,3],NULL);`
`439`	`439`	`select array_remove(array['A','CC','D','C','RR'],'RR');`
`440`	`440`	`select array_remove('{{1,2,2},{1,4,3}}',2);-- not allowed`
	`441`	`+select array_remove(array['X','X','X'],'X')='{}';`
`441`	`442`	`select array_replace(array[1,2,5,4],5,3);`
`442`	`443`	`select array_replace(array[1,2,5,4],5,NULL);`
`443`	`444`	`select array_replace(array[1,2,NULL,4,NULL],NULL,5);`

Comments

(0)