Skip to content

Commit b575a26

Browse files
danielgustafssondanielgustafsson
committed
Add proargnames to multi-argument aggregate functions
Having argument names makes it easier to understand how to use the aggregate functions when inspecting them with \dfa or similar. Author: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> Reviewed-by: Vik Fearing <vik@postgresfriends.org> Reviewed-by: Jim Jones <jim.jones@uni-muenster.de> Discussion: https://postgr.es/m/877cw3jl8y.fsf@wibble.ilmari.org
1 parent 27449cc commit b575a26

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

‎src/include/catalog/catversion.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@
5757
*/
5858

5959
/* yyyymmddN */
60-
#define CATALOG_VERSION_NO 202308231
60+
#define CATALOG_VERSION_NO 202308241
6161

6262
#endif

‎src/include/catalog/pg_proc.dat

+11-10
Original file line numberDiff line numberDiff line change
@@ -5004,7 +5004,7 @@
50045004
{ oid => '3538', descr => 'concatenate aggregate input into a string',
50055005
proname => 'string_agg', prokind => 'a', proisstrict => 'f',
50065006
prorettype => 'text', proargtypes => 'text text',
5007-
prosrc => 'aggregate_dummy' },
5007+
proargnames => '{value,delimiter}', prosrc => 'aggregate_dummy' },
50085008
{ oid => '3543', descr => 'aggregate transition function',
50095009
proname => 'bytea_string_agg_transfn', proisstrict => 'f',
50105010
prorettype => 'internal', proargtypes => 'internal bytea bytea',
@@ -5016,7 +5016,7 @@
50165016
{ oid => '3545', descr => 'concatenate aggregate input into a bytea',
50175017
proname => 'string_agg', prokind => 'a', proisstrict => 'f',
50185018
prorettype => 'bytea', proargtypes => 'bytea bytea',
5019-
prosrc => 'aggregate_dummy' },
5019+
proargnames => '{value,delimiter}', prosrc => 'aggregate_dummy' },
50205020

50215021
# To ASCII conversion
50225022
{ oid => '1845', descr => 'encode text from DB encoding to ASCII text',
@@ -8971,21 +8971,22 @@
89718971
{ oid => '3197', descr => 'aggregate input into a json object',
89728972
proname => 'json_object_agg', prokind => 'a', proisstrict => 'f',
89738973
provolatile => 's', prorettype => 'json', proargtypes => 'any any',
8974-
prosrc => 'aggregate_dummy' },
8974+
proargnames => '{key,value}', prosrc => 'aggregate_dummy' },
89758975
{ oid => '6280', descr => 'aggregate non-NULL input into a json object',
89768976
proname => 'json_object_agg_strict', prokind => 'a', proisstrict => 'f',
89778977
provolatile => 's', prorettype => 'json', proargtypes => 'any any',
8978-
prosrc => 'aggregate_dummy' },
8978+
proargnames => '{key,value}', prosrc => 'aggregate_dummy' },
89798979
{ oid => '6281',
89808980
descr => 'aggregate input into a json object with unique keys',
89818981
proname => 'json_object_agg_unique', prokind => 'a', proisstrict => 'f',
89828982
provolatile => 's', prorettype => 'json', proargtypes => 'any any',
8983-
prosrc => 'aggregate_dummy' },
8983+
proargnames => '{key,value}', prosrc => 'aggregate_dummy' },
89848984
{ oid => '6282',
89858985
descr => 'aggregate non-NULL input into a json object with unique keys',
89868986
proname => 'json_object_agg_unique_strict', prokind => 'a',
89878987
proisstrict => 'f', provolatile => 's', prorettype => 'json',
8988-
proargtypes => 'any any', prosrc => 'aggregate_dummy' },
8988+
proargtypes => 'any any', proargnames => '{key,value}',
8989+
prosrc => 'aggregate_dummy' },
89898990
{ oid => '3198', descr => 'build a json array from any inputs',
89908991
proname => 'json_build_array', provariadic => 'any', proisstrict => 'f',
89918992
provolatile => 's', prorettype => 'json', proargtypes => 'any',
@@ -9899,22 +9900,22 @@
98999900
prosrc => 'jsonb_object_agg_finalfn' },
99009901
{ oid => '3270', descr => 'aggregate inputs into jsonb object',
99019902
proname => 'jsonb_object_agg', prokind => 'a', proisstrict => 'f',
9902-
prorettype => 'jsonb', proargtypes => 'any any',
9903+
prorettype => 'jsonb', proargtypes => 'any any', proargnames => '{key,value}',
99039904
prosrc => 'aggregate_dummy' },
99049905
{ oid => '6288', descr => 'aggregate non-NULL inputs into jsonb object',
99059906
proname => 'jsonb_object_agg_strict', prokind => 'a', proisstrict => 'f',
9906-
prorettype => 'jsonb', proargtypes => 'any any',
9907+
prorettype => 'jsonb', proargtypes => 'any any', proargnames => '{key,value}',
99079908
prosrc => 'aggregate_dummy' },
99089909
{ oid => '6289',
99099910
descr => 'aggregate inputs into jsonb object checking key uniqueness',
99109911
proname => 'jsonb_object_agg_unique', prokind => 'a', proisstrict => 'f',
9911-
prorettype => 'jsonb', proargtypes => 'any any',
9912+
prorettype => 'jsonb', proargtypes => 'any any', proargnames => '{key,value}',
99129913
prosrc => 'aggregate_dummy' },
99139914
{ oid => '6290',
99149915
descr => 'aggregate non-NULL inputs into jsonb object checking key uniqueness',
99159916
proname => 'jsonb_object_agg_unique_strict', prokind => 'a',
99169917
proisstrict => 'f', prorettype => 'jsonb', proargtypes => 'any any',
9917-
prosrc => 'aggregate_dummy' },
9918+
proargnames => '{key,value}', prosrc => 'aggregate_dummy' },
99189919
{ oid => '3271', descr => 'build a jsonb array from any inputs',
99199920
proname => 'jsonb_build_array', provariadic => 'any', proisstrict => 'f',
99209921
provolatile => 's', prorettype => 'jsonb', proargtypes => 'any',

0 commit comments

Comments
 (0)