database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

Revert use singular for -1 (commits 9ee7d533da and 5da9868ed9

Browse Source 
Turns out you can specify negative values using plurals:

	https://english.stackexchange.com/questions/9735/is-1-followed-by-a-singular-or-plural-noun

so the previous code was correct enough, and consistent with other usage
in our code.  Also add comment in the two places where this could be
confused.

Reported-by: Noah Misch

Diagnosed-by: 20210425115726.GA2353095@rfd.leadboat.com
This commit is contained in:
Bruce Momjian
2021-05-01 10:42:44 -04:00
parent e6f9539dc3
commit 651d005e76
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/interfaces/ecpg/pgtypeslib/interval.c
View File

@ -694,7 +694,7 @@ AddVerboseIntPart(char *cp, int value, const char *units,
}
else if (*is_before)
value = -value;
sprintf(cp, " %d %s%s", value, units, (abs(value) == 1) ? "" : "s");
sprintf(cp, " %d %s%s", value, units, (value == 1) ? "" : "s");
*is_zero = false;
return cp + strlen(cp);
}
@ -711,7 +711,7 @@ AddPostgresIntPart(char *cp, int value, const char *units,
(*is_before && value > 0) ? "+" : "",
value,
units,
(abs(value) != 1) ? "s" : "");
(value != 1) ? "s" : "");
/*
* Each nonzero field sets is_before for (only) the next one. This is a
@ -924,6 +924,7 @@ EncodeInterval(struct /* pg_ */ tm *tm, fsec_t fsec, int style, char *str)
*cp++ = '-';
AppendSeconds(cp, sec, fsec, MAX_INTERVAL_PRECISION, false);
cp += strlen(cp);
/* We output "ago", not negatives, so use abs(). */
sprintf(cp, " sec%s",
(abs(sec) != 1 || fsec != 0) ? "s" : "");
is_zero = false;

4
src/interfaces/libpq/fe-print.c
View File

@ -303,7 +303,7 @@ PQprint(FILE *fout, const PGresult *res, const PQprintOpt *po)
}
if (po->header && !po->html3)
fprintf(fout, "(%d row%s)\n\n", PQntuples(res),
(abs(PQntuples(res)) == 1) ? "" : "s");
(PQntuples(res) == 1) ? "" : "s");
if (po->html3 && !po->expanded)
fputs("</table>\n", fout);
free(fieldMax);
@ -662,7 +662,7 @@ PQdisplayTuples(const PGresult *res,
if (!quiet)
fprintf(fp, "\nQuery returned %d row%s.\n", PQntuples(res),
(abs(PQntuples(res)) == 1) ? "" : "s");
(PQntuples(res) == 1) ? "" : "s");
fflush(fp);