mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Dean Rasheed
This commit is contained in:
Noah Misch 2013-05-31 21:50:59 -04:00
parent 01497e738e
commit 97c4d9b7c7
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/utils/adt/arrayfuncs.c
View File

@ -5398,6 +5398,14 @@ array_replace_internal(ArrayType *array,
return array;
}
/* If all elements were removed return an empty array */
if (nresult == 0)
{
pfree(values);
pfree(nulls);
return construct_empty_array(element_type);
}
/* Allocate and initialize the result array */
if (hasnulls)
{

6
src/test/regress/expected/arrays.out
View File

@ -1577,6 +1577,12 @@ select array_remove(array['A','CC','D','C','RR'], 'RR');
select array_remove('{{1,2,2},{1,4,3}}', 2); -- not allowed
ERROR: removing elements from multidimensional arrays is not supported
select array_remove(array['X','X','X'], 'X') = '{}';
?column?
----------
t
(1 row)
select array_replace(array[1,2,5,4],5,3);
array_replace
---------------

1
src/test/regress/sql/arrays.sql
View File

@ -438,6 +438,7 @@ select array_remove(array[1,2,2,3], 5);
select array_remove(array[1,NULL,NULL,3], NULL);
select array_remove(array['A','CC','D','C','RR'], 'RR');
select array_remove('{{1,2,2},{1,4,3}}', 2); -- not allowed
select array_remove(array['X','X','X'], 'X') = '{}';
select array_replace(array[1,2,5,4],5,3);
select array_replace(array[1,2,5,4],5,NULL);
select array_replace(array[1,2,NULL,4,NULL],NULL,5);