aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/datetime.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2021-03-30 18:34:27 -0400
committerBruce Momjian <bruce@momjian.us>2021-03-30 18:34:27 -0400
commit5da9868ed983f95cc1cff80dcd81252a513774f8 (patch)
treea2e80418e7510442018d52fb94087547ab143583 /src/backend/utils/adt/datetime.c
parent6131ffc43ff3d2f566e93f017e56a09e4e717318 (diff)
downloadpostgresql-5da9868ed983f95cc1cff80dcd81252a513774f8.tar.gz
postgresql-5da9868ed983f95cc1cff80dcd81252a513774f8.zip
In messages, use singular nouns for -1, like we do for +1.
This outputs "-1 year", not "-1 years". Reported-by: neverov.max@gmail.com Bug: 16939 Discussion: https://postgr.es/m/16939-cceeb03fb72736ee@postgresql.org
Diffstat (limited to 'src/backend/utils/adt/datetime.c')
-rw-r--r--src/backend/utils/adt/datetime.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 350b0c55eac..889077f55c5 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -4190,7 +4190,7 @@ AddPostgresIntPart(char *cp, int value, const char *units,
(*is_before && value > 0) ? "+" : "",
value,
units,
- (value != 1) ? "s" : "");
+ (abs(value) != 1) ? "s" : "");
/*
* Each nonzero field sets is_before for (only) the next one. This is a
@@ -4216,7 +4216,7 @@ AddVerboseIntPart(char *cp, int value, const char *units,
}
else if (*is_before)
value = -value;
- sprintf(cp, " %d %s%s", value, units, (value == 1) ? "" : "s");
+ sprintf(cp, " %d %s%s", value, units, (abs(value) == 1) ? "" : "s");
*is_zero = false;
return cp + strlen(cp);
}