Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7feb60c

Browse files
committed
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: <CAEZATCW3yzJo-NMSiQs5jXNFbTsCEftZS-Og8=FvFdiU+kYuSA@mail.gmail.com>
1 parent e415831 commit 7feb60c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

doc/src/sgml/func.sgml

+3-3
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@
702702
<literal><function>ceil(<type>dp</type> or <type>numeric</type>)</function></literal>
703703
</entry>
704704
<entry>(same as input)</entry>
705-
<entry>smallest integer not less than argument</entry>
705+
<entry>nearest integer greater than or equal to argument</entry>
706706
<entry><literal>ceil(-42.8)</literal></entry>
707707
<entry><literal>-42</literal></entry>
708708
</row>
@@ -715,7 +715,7 @@
715715
<literal><function>ceiling(<type>dp</type> or <type>numeric</type>)</function></literal>
716716
</entry>
717717
<entry>(same as input)</entry>
718-
<entry>smallest integer not less than argument (alias for <function>ceil</function>)</entry>
718+
<entry>nearest integer greater than or equal to argument (same as <function>ceil</function>)</entry>
719719
<entry><literal>ceiling(-95.3)</literal></entry>
720720
<entry><literal>-95</literal></entry>
721721
</row>
@@ -768,7 +768,7 @@
768768
<literal><function>floor(<type>dp</type> or <type>numeric</type>)</function></literal>
769769
</entry>
770770
<entry>(same as input)</entry>
771-
<entry>largest integer not greater than argument</entry>
771+
<entry>nearest integer less than or equal to argument</entry>
772772
<entry><literal>floor(-42.8)</literal></entry>
773773
<entry><literal>-43</literal></entry>
774774
</row>

src/include/catalog/pg_proc.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,11 @@ DESCR("round to nearest integer");
416416
DATA(insert OID = 229 ( dtrunc PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dtrunc _null_ _null_ _null_ ));
417417
DESCR("truncate to integer");
418418
DATA(insert OID = 2308 ( ceil PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dceil _null_ _null_ _null_ ));
419-
DESCR("smallest integer >= value");
419+
DESCR("nearest integer >= value");
420420
DATA(insert OID = 2320 ( ceiling PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dceil _null_ _null_ _null_ ));
421-
DESCR("smallest integer >= value");
421+
DESCR("nearest integer >= value");
422422
DATA(insert OID = 2309 ( floor PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dfloor _null_ _null_ _null_ ));
423-
DESCR("largest integer <= value");
423+
DESCR("nearest integer <= value");
424424
DATA(insert OID = 2310 ( sign PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dsign _null_ _null_ _null_ ));
425425
DESCR("sign of value");
426426
DATA(insert OID = 230 ( dsqrt PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 701 "701" _null_ _null_ _null_ _null_ _null_ dsqrt _null_ _null_ _null_ ));
@@ -2249,11 +2249,11 @@ DESCR("value truncated to 'scale'");
22492249
DATA(insert OID = 1710 ( trunc PGNSP PGUID 14 1 0 0 0 f f f f t f i s 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ "select pg_catalog.trunc($1,0)" _null_ _null_ _null_ ));
22502250
DESCR("value truncated to 'scale' of zero");
22512251
DATA(insert OID = 1711 ( ceil PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ numeric_ceil _null_ _null_ _null_ ));
2252-
DESCR("smallest integer >= value");
2252+
DESCR("nearest integer >= value");
22532253
DATA(insert OID = 2167 ( ceiling PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ numeric_ceil _null_ _null_ _null_ ));
2254-
DESCR("smallest integer >= value");
2254+
DESCR("nearest integer >= value");
22552255
DATA(insert OID = 1712 ( floor PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ numeric_floor _null_ _null_ _null_ ));
2256-
DESCR("largest integer <= value");
2256+
DESCR("nearest integer <= value");
22572257
DATA(insert OID = 1718 ( numeric_eq PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "1700 1700" _null_ _null_ _null_ _null_ _null_ numeric_eq _null_ _null_ _null_ ));
22582258
DATA(insert OID = 1719 ( numeric_ne PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "1700 1700" _null_ _null_ _null_ _null_ _null_ numeric_ne _null_ _null_ _null_ ));
22592259
DATA(insert OID = 1720 ( numeric_gt PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "1700 1700" _null_ _null_ _null_ _null_ _null_ numeric_gt _null_ _null_ _null_ ));

0 commit comments

Comments
 (0)