From: Tom Lane Date: Thu, 9 Jun 2016 15:58:00 +0000 (-0400) Subject: Clarify documentation of ceil/ceiling/floor functions. X-Git-Tag: REL9_5_4~83 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=719dd9a64af5f2ec07a9cac16fb161a3c5c18010;p=thirdparty%2Fpostgresql.git Clarify documentation of ceil/ceiling/floor functions. Document these as "nearest integer >= argument" and "nearest integer <= argument", which will hopefully be less confusing than the old formulation. New wording is from Matlab via Dean Rasheed. I changed the pg_description entries as well as the SGML docs. In the back branches, this will only affect installations initdb'd in the future, but it should be harmless otherwise. Discussion: --- diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 82e04125746..a15cf2d1791 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -659,7 +659,7 @@ ceil(dp or numeric) (same as input) - smallest integer not less than argument + nearest integer greater than or equal to argument ceil(-42.8) -42 @@ -672,7 +672,7 @@ ceiling(dp or numeric) (same as input) - smallest integer not less than argument (alias for ceil) + nearest integer greater than or equal to argument (same as ceil) ceiling(-95.3) -95 @@ -725,7 +725,7 @@ floor(dp or numeric) (same as input) - largest integer not greater than argument + nearest integer less than or equal to argument floor(-42.8) -43 diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 5c58108bda9..dadf7604251 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -411,11 +411,11 @@ DESCR("round to nearest integer"); DATA(insert OID = 229 ( dtrunc PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dtrunc _null_ _null_ _null_ )); DESCR("truncate to integer"); DATA(insert OID = 2308 ( ceil PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dceil _null_ _null_ _null_ )); -DESCR("smallest integer >= value"); +DESCR("nearest integer >= value"); DATA(insert OID = 2320 ( ceiling PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dceil _null_ _null_ _null_ )); -DESCR("smallest integer >= value"); +DESCR("nearest integer >= value"); DATA(insert OID = 2309 ( floor PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dfloor _null_ _null_ _null_ )); -DESCR("largest integer <= value"); +DESCR("nearest integer <= value"); DATA(insert OID = 2310 ( sign PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dsign _null_ _null_ _null_ )); DESCR("sign of value"); DATA(insert OID = 230 ( dsqrt PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dsqrt _null_ _null_ _null_ )); @@ -2318,11 +2318,11 @@ DESCR("value truncated to 'scale'"); DATA(insert OID = 1710 ( trunc PGNSP PGUID 14 1 0 0 0 f f f f t f i 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ "select pg_catalog.trunc($1,0)" _null_ _null_ _null_ )); DESCR("value truncated to 'scale' of zero"); DATA(insert OID = 1711 ( ceil PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ numeric_ceil _null_ _null_ _null_ )); -DESCR("smallest integer >= value"); +DESCR("nearest integer >= value"); DATA(insert OID = 2167 ( ceiling PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ numeric_ceil _null_ _null_ _null_ )); -DESCR("smallest integer >= value"); +DESCR("nearest integer >= value"); DATA(insert OID = 1712 ( floor PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ numeric_floor _null_ _null_ _null_ )); -DESCR("largest integer <= value"); +DESCR("nearest integer <= value"); DATA(insert OID = 1718 ( numeric_eq PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "1700 1700" _null_ _null_ _null_ _null_ _null_ numeric_eq _null_ _null_ _null_ )); DATA(insert OID = 1719 ( numeric_ne PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "1700 1700" _null_ _null_ _null_ _null_ _null_ numeric_ne _null_ _null_ _null_ )); DATA(insert OID = 1720 ( numeric_gt PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "1700 1700" _null_ _null_ _null_ _null_ _null_ numeric_gt _null_ _null_ _null_ ));