upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-05-27 12:00:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add missing serial commas

Browse source
This commit is contained in:
Peter Eisentraut 2026-05-04 11:53:04 +02:00
parent 2fcc8aaeb2
commit b83a94a73b
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/backend/statistics/extended_stats_funcs.c
View file

@ -520,7 +520,7 @@ extended_statistics_update(FunctionCallInfo fcinfo)
{
ereport(WARNING,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("cannot specify parameters \"%s\", \"%s\" or \"%s\"",
errmsg("cannot specify parameters \"%s\", \"%s\", or \"%s\"",
extarginfo[MOST_COMMON_VALS_ARG].argname,
extarginfo[MOST_COMMON_FREQS_ARG].argname,
extarginfo[MOST_COMMON_BASE_FREQS_ARG].argname),
@ -544,7 +544,7 @@ extended_statistics_update(FunctionCallInfo fcinfo)
{
ereport(WARNING,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("could not use \"%s\", \"%s\" and \"%s\": missing one or more parameters",
errmsg("could not use \"%s\", \"%s\", and \"%s\": missing one or more parameters",
extarginfo[MOST_COMMON_VALS_ARG].argname,
extarginfo[MOST_COMMON_FREQS_ARG].argname,
extarginfo[MOST_COMMON_BASE_FREQS_ARG].argname));

2
src/backend/utils/adt/pg_dependencies.c
View file

@ -396,7 +396,7 @@ dependencies_object_field_start(void *state, char *fname, bool isnull)
errsave(parse->escontext,
errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed pg_dependencies: \"%s\"", parse->str),
errdetail("Only allowed keys are \"%s\", \"%s\" and \"%s\".",
errdetail("Only allowed keys are \"%s\", \"%s\", and \"%s\".",
PG_DEPENDENCIES_KEY_ATTRIBUTES,
PG_DEPENDENCIES_KEY_DEPENDENCY,
PG_DEPENDENCIES_KEY_DEGREE));

16
src/test/regress/expected/pg_dependencies.out
View file

@ -60,22 +60,22 @@ SELECT '[{"attributes_invalid" : [2,3], "dependency" : 4}]'::pg_dependencies;
ERROR: malformed pg_dependencies: "[{"attributes_invalid" : [2,3], "dependency" : 4}]"
LINE 1: SELECT '[{"attributes_invalid" : [2,3], "dependency" : 4}]':...
^
DETAIL: Only allowed keys are "attributes", "dependency" and "degree".
DETAIL: Only allowed keys are "attributes", "dependency", and "degree".
SELECT '[{"attributes" : [2,3], "invalid" : 3, "dependency" : 4}]'::pg_dependencies;
ERROR: malformed pg_dependencies: "[{"attributes" : [2,3], "invalid" : 3, "dependency" : 4}]"
LINE 1: SELECT '[{"attributes" : [2,3], "invalid" : 3, "dependency" ...
^
DETAIL: Only allowed keys are "attributes", "dependency" and "degree".
DETAIL: Only allowed keys are "attributes", "dependency", and "degree".
SELECT * FROM pg_input_error_info('[{"attributes_invalid" : [2,3], "dependency" : 4}]', 'pg_dependencies');
message | detail | hint | sql_error_code
---------------------------------------------------------------------------------+----------------------------------------------------------------+------+----------------
malformed pg_dependencies: "[{"attributes_invalid" : [2,3], "dependency" : 4}]" | Only allowed keys are "attributes", "dependency" and "degree". | | 22P02
message | detail | hint | sql_error_code
---------------------------------------------------------------------------------+-----------------------------------------------------------------+------+----------------
malformed pg_dependencies: "[{"attributes_invalid" : [2,3], "dependency" : 4}]" | Only allowed keys are "attributes", "dependency", and "degree". | | 22P02
(1 row)
SELECT * FROM pg_input_error_info('[{"attributes" : [2,3], "invalid" : 3, "dependency" : 4}]', 'pg_dependencies');
message | detail | hint | sql_error_code
----------------------------------------------------------------------------------------+----------------------------------------------------------------+------+----------------
malformed pg_dependencies: "[{"attributes" : [2,3], "invalid" : 3, "dependency" : 4}]" | Only allowed keys are "attributes", "dependency" and "degree". | | 22P02
message | detail | hint | sql_error_code
----------------------------------------------------------------------------------------+-----------------------------------------------------------------+------+----------------
malformed pg_dependencies: "[{"attributes" : [2,3], "invalid" : 3, "dependency" : 4}]" | Only allowed keys are "attributes", "dependency", and "degree". | | 22P02
(1 row)
-- Missing keys

8
src/test/regress/expected/stats_import.out
View file

@ -2021,7 +2021,7 @@ SELECT pg_catalog.pg_restore_extended_stats(
{two,"(2,2.2,TWO,02-02-2002,\"[true, 4, \"\"six\"\"]\")"}}'::text[],
'most_common_freqs', '{0.25,0.25,0.25,0.25}'::double precision[],
'most_common_base_freqs', '{0.0625,0.0625,0.0625,0.0625}'::double precision[]);
WARNING: cannot specify parameters "most_common_vals", "most_common_freqs" or "most_common_base_freqs"
WARNING: cannot specify parameters "most_common_vals", "most_common_freqs", or "most_common_base_freqs"
HINT: Extended statistics object "stats_import.test_stat_dependencies" does not support statistics of this type.
pg_restore_extended_stats
---------------------------
@ -2037,7 +2037,7 @@ SELECT pg_catalog.pg_restore_extended_stats(
'inherited', false,
'most_common_freqs', '{0.25,0.25,0.25,0.25}'::double precision[],
'most_common_base_freqs', '{0.0625,0.0625,0.0625,0.0625}'::double precision[]);
WARNING: could not use "most_common_vals", "most_common_freqs" and "most_common_base_freqs": missing one or more parameters
WARNING: could not use "most_common_vals", "most_common_freqs", and "most_common_base_freqs": missing one or more parameters
pg_restore_extended_stats
---------------------------
f
@ -2054,7 +2054,7 @@ SELECT pg_catalog.pg_restore_extended_stats(
{tre,"(3,3.3,TRE,03-03-2003,)"},
{two,"(2,2.2,TWO,02-02-2002,\"[true, 4, \"\"six\"\"]\")"}}'::text[],
'most_common_base_freqs', '{0.0625,0.0625,0.0625,0.0625}'::double precision[]);
WARNING: could not use "most_common_vals", "most_common_freqs" and "most_common_base_freqs": missing one or more parameters
WARNING: could not use "most_common_vals", "most_common_freqs", and "most_common_base_freqs": missing one or more parameters
pg_restore_extended_stats
---------------------------
f
@ -2071,7 +2071,7 @@ SELECT pg_catalog.pg_restore_extended_stats(
{tre,"(3,3.3,TRE,03-03-2003,)"},
{two,"(2,2.2,TWO,02-02-2002,\"[true, 4, \"\"six\"\"]\")"}}'::text[],
'most_common_freqs', '{0.25,0.25,0.25,0.25}'::double precision[]);
WARNING: could not use "most_common_vals", "most_common_freqs" and "most_common_base_freqs": missing one or more parameters
WARNING: could not use "most_common_vals", "most_common_freqs", and "most_common_base_freqs": missing one or more parameters
pg_restore_extended_stats
---------------------------
f