Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9cfd800

Browse files
committed
Add some enumeration commas, for consistency
1 parent173e29a commit9cfd800

File tree

11 files changed

+15
-15
lines changed

11 files changed

+15
-15
lines changed

‎src/backend/access/gist/gistbuild.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ gistValidateBufferingOption(char *value)
248248
ereport(ERROR,
249249
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
250250
errmsg("invalid value for \"buffering\" option"),
251-
errdetail("Valid values are \"on\", \"off\" and \"auto\".")));
251+
errdetail("Valid values are \"on\", \"off\", and \"auto\".")));
252252
}
253253
}
254254

‎src/backend/commands/async.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ AtPrepare_Notify(void)
739739
if (pendingActions||pendingNotifies)
740740
ereport(ERROR,
741741
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
742-
errmsg("cannot PREPARE a transaction that has executed LISTEN, UNLISTEN or NOTIFY")));
742+
errmsg("cannot PREPARE a transaction that has executed LISTEN, UNLISTEN, or NOTIFY")));
743743
}
744744

745745
/*

‎src/backend/commands/tablecmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2115,7 +2115,7 @@ renameatt_check(Oid myrelid, Form_pg_class classform, bool recursing)
21152115
relkind!=RELKIND_FOREIGN_TABLE)
21162116
ereport(ERROR,
21172117
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
2118-
errmsg("\"%s\" is not a table, view, composite type, index or foreign table",
2118+
errmsg("\"%s\" is not a table, view, composite type, index, or foreign table",
21192119
NameStr(classform->relname))));
21202120

21212121
/*

‎src/backend/libpq/hba.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,7 +1391,7 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
13911391
hbaline->auth_method!=uaGSS&&
13921392
hbaline->auth_method!=uaSSPI&&
13931393
hbaline->auth_method!=uaCert)
1394-
INVALID_AUTH_OPTION("map",gettext_noop("ident, peer, krb5, gssapi, sspi and cert"));
1394+
INVALID_AUTH_OPTION("map",gettext_noop("ident, peer, krb5, gssapi, sspi, and cert"));
13951395
hbaline->usermap=pstrdup(val);
13961396
}
13971397
elseif (strcmp(name,"clientcert")==0)
@@ -1510,15 +1510,15 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
15101510
if (hbaline->auth_method!=uaKrb5&&
15111511
hbaline->auth_method!=uaGSS&&
15121512
hbaline->auth_method!=uaSSPI)
1513-
INVALID_AUTH_OPTION("krb_realm",gettext_noop("krb5, gssapi and sspi"));
1513+
INVALID_AUTH_OPTION("krb_realm",gettext_noop("krb5, gssapi, and sspi"));
15141514
hbaline->krb_realm=pstrdup(val);
15151515
}
15161516
elseif (strcmp(name,"include_realm")==0)
15171517
{
15181518
if (hbaline->auth_method!=uaKrb5&&
15191519
hbaline->auth_method!=uaGSS&&
15201520
hbaline->auth_method!=uaSSPI)
1521-
INVALID_AUTH_OPTION("include_realm",gettext_noop("krb5, gssapi and sspi"));
1521+
INVALID_AUTH_OPTION("include_realm",gettext_noop("krb5, gssapi, and sspi"));
15221522
if (strcmp(val,"1")==0)
15231523
hbaline->include_realm= true;
15241524
else

‎src/backend/utils/adt/float.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2750,7 +2750,7 @@ width_bucket_float8(PG_FUNCTION_ARGS)
27502750
if (isnan(operand)||isnan(bound1)||isnan(bound2))
27512751
ereport(ERROR,
27522752
(errcode(ERRCODE_INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION),
2753-
errmsg("operand, lower bound and upper bound cannot be NaN")));
2753+
errmsg("operand, lower bound, and upper bound cannot be NaN")));
27542754

27552755
/* Note that we allow "operand" to be infinite */
27562756
if (isinf(bound1)||isinf(bound2))

‎src/backend/utils/adt/numeric.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@ width_bucket_numeric(PG_FUNCTION_ARGS)
12231223
NUMERIC_IS_NAN(bound2))
12241224
ereport(ERROR,
12251225
(errcode(ERRCODE_INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION),
1226-
errmsg("operand, lower bound and upper bound cannot be NaN")));
1226+
errmsg("operand, lower bound, and upper bound cannot be NaN")));
12271227

12281228
init_var(&result_var);
12291229
init_var(&count_var);

‎src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,7 +2240,7 @@ static struct config_int ConfigureNamesInt[] =
22402240
},
22412241
{
22422242
{"autovacuum_analyze_threshold",PGC_SIGHUP,AUTOVACUUM,
2243-
gettext_noop("Minimum number of tuple inserts, updates or deletes prior to analyze."),
2243+
gettext_noop("Minimum number of tuple inserts, updates, or deletes prior to analyze."),
22442244
NULL
22452245
},
22462246
&autovacuum_anl_thresh,
@@ -2494,7 +2494,7 @@ static struct config_real ConfigureNamesReal[] =
24942494
},
24952495
{
24962496
{"autovacuum_analyze_scale_factor",PGC_SIGHUP,AUTOVACUUM,
2497-
gettext_noop("Number of tuple inserts, updates or deletes prior to analyze as a fraction of reltuples."),
2497+
gettext_noop("Number of tuple inserts, updates, or deletes prior to analyze as a fraction of reltuples."),
24982498
NULL
24992499
},
25002500
&autovacuum_anl_scale,

‎src/bin/pg_basebackup/pg_basebackup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ main(int argc, char **argv)
12451245
streamwal= true;
12461246
else
12471247
{
1248-
fprintf(stderr,_("%s: invalid xlog option \"%s\", must be empty, \"fetch\" or \"stream\"\n"),
1248+
fprintf(stderr,_("%s: invalid xlog option \"%s\", must be empty, \"fetch\", or \"stream\"\n"),
12491249
progname,optarg);
12501250
exit(1);
12511251
}

‎src/bin/pg_dump/pg_dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ help(const char *progname)
817817
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
818818
printf(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
819819
printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n"));
820-
printf(_(" --section=SECTION dump named section (pre-data, data or post-data)\n"));
820+
printf(_(" --section=SECTION dump named section (pre-data, data, or post-data)\n"));
821821
printf(_(" --serializable-deferrable wait until the dump can run without anomalies\n"));
822822
printf(_(" --use-set-session-authorization\n"
823823
" use SET SESSION AUTHORIZATION commands instead of\n"

‎src/bin/pg_dump/pg_restore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ usage(const char *progname)
463463
" created\n"));
464464
printf(_(" --no-security-labels do not restore security labels\n"));
465465
printf(_(" --no-tablespaces do not restore tablespace assignments\n"));
466-
printf(_(" --section=SECTION restore named section (pre-data, data or post-data)\n"));
466+
printf(_(" --section=SECTION restore named section (pre-data, data, or post-data)\n"));
467467
printf(_(" --use-set-session-authorization\n"
468468
" use SET SESSION AUTHORIZATION commands instead of\n"
469469
" ALTER OWNER commands to set ownership\n"));

‎src/test/regress/expected/numeric.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,9 +746,9 @@ ERROR: count must be greater than zero
746746
SELECT width_bucket(3.5::float8, 3.0::float8, 3.0::float8, 888);
747747
ERROR: lower bound cannot equal upper bound
748748
SELECT width_bucket('NaN', 3.0, 4.0, 888);
749-
ERROR: operand, lower bound and upper bound cannot be NaN
749+
ERROR: operand, lower bound, and upper bound cannot be NaN
750750
SELECT width_bucket(0::float8, 'NaN', 4.0::float8, 888);
751-
ERROR: operand, lower bound and upper bound cannot be NaN
751+
ERROR: operand, lower bound, and upper bound cannot be NaN
752752
-- normal operation
753753
CREATE TABLE width_bucket_test (operand_num numeric, operand_f8 float8);
754754
COPY width_bucket_test (operand_num) FROM stdin;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp