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

Commitf72c822

Browse files
committed
Merge branch 'REL9_5_STABLE' into PGPRO9_5
2 parents8ae20e0 +e5bdaa1 commitf72c822

File tree

4 files changed

+25
-19
lines changed

4 files changed

+25
-19
lines changed

‎doc/src/sgml/func.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@
659659
<literal><function>ceil(<type>dp</type> or <type>numeric</type>)</function></literal>
660660
</entry>
661661
<entry>(same as input)</entry>
662-
<entry>smallest integernot lessthan argument</entry>
662+
<entry>nearest integergreaterthan or equal to argument</entry>
663663
<entry><literal>ceil(-42.8)</literal></entry>
664664
<entry><literal>-42</literal></entry>
665665
</row>
@@ -672,7 +672,7 @@
672672
<literal><function>ceiling(<type>dp</type> or <type>numeric</type>)</function></literal>
673673
</entry>
674674
<entry>(same as input)</entry>
675-
<entry>smallest integernot lessthan argument (alias for <function>ceil</function>)</entry>
675+
<entry>nearest integergreaterthanor equal toargument (same as <function>ceil</function>)</entry>
676676
<entry><literal>ceiling(-95.3)</literal></entry>
677677
<entry><literal>-95</literal></entry>
678678
</row>
@@ -725,7 +725,7 @@
725725
<literal><function>floor(<type>dp</type> or <type>numeric</type>)</function></literal>
726726
</entry>
727727
<entry>(same as input)</entry>
728-
<entry>largest integernot greaterthan argument</entry>
728+
<entry>nearest integerlessthan or equal to argument</entry>
729729
<entry><literal>floor(-42.8)</literal></entry>
730730
<entry><literal>-43</literal></entry>
731731
</row>

‎src/backend/catalog/aclchk.c

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4068,7 +4068,8 @@ pg_foreign_data_wrapper_aclmask(Oid fdw_oid, Oid roleid,
40684068
tuple=SearchSysCache1(FOREIGNDATAWRAPPEROID,ObjectIdGetDatum(fdw_oid));
40694069
if (!HeapTupleIsValid(tuple))
40704070
ereport(ERROR,
4071-
(errmsg("foreign-data wrapper with OID %u does not exist",
4071+
(errcode(ERRCODE_UNDEFINED_OBJECT),
4072+
errmsg("foreign-data wrapper with OID %u does not exist",
40724073
fdw_oid)));
40734074
fdwForm= (Form_pg_foreign_data_wrapper)GETSTRUCT(tuple);
40744075

@@ -4129,7 +4130,8 @@ pg_foreign_server_aclmask(Oid srv_oid, Oid roleid,
41294130
tuple=SearchSysCache1(FOREIGNSERVEROID,ObjectIdGetDatum(srv_oid));
41304131
if (!HeapTupleIsValid(tuple))
41314132
ereport(ERROR,
4132-
(errmsg("foreign server with OID %u does not exist",
4133+
(errcode(ERRCODE_UNDEFINED_OBJECT),
4134+
errmsg("foreign server with OID %u does not exist",
41334135
srv_oid)));
41344136
srvForm= (Form_pg_foreign_server)GETSTRUCT(tuple);
41354137

@@ -4188,27 +4190,30 @@ pg_type_aclmask(Oid type_oid, Oid roleid, AclMode mask, AclMaskHow how)
41884190
tuple=SearchSysCache1(TYPEOID,ObjectIdGetDatum(type_oid));
41894191
if (!HeapTupleIsValid(tuple))
41904192
ereport(ERROR,
4191-
(errmsg("type with OID %u does not exist",
4193+
(errcode(ERRCODE_UNDEFINED_OBJECT),
4194+
errmsg("type with OID %u does not exist",
41924195
type_oid)));
41934196
typeForm= (Form_pg_type)GETSTRUCT(tuple);
41944197

4195-
/* "True" array types don't manage permissions of their own */
4196-
if (typeForm->typelem!=0&&typeForm->typlen==-1)
4198+
/*
4199+
* "True" array types don't manage permissions of their own; consult the
4200+
* element type instead.
4201+
*/
4202+
if (OidIsValid(typeForm->typelem)&&typeForm->typlen==-1)
41974203
{
41984204
Oidelttype_oid=typeForm->typelem;
41994205

42004206
ReleaseSysCache(tuple);
42014207

42024208
tuple=SearchSysCache1(TYPEOID,ObjectIdGetDatum(elttype_oid));
4209+
/* this case is not a user-facing error, so elog not ereport */
42034210
if (!HeapTupleIsValid(tuple))
4204-
ereport(ERROR,
4205-
(errmsg("type with OID %u does not exist",
4206-
type_oid)));
4211+
elog(ERROR,"cache lookup failed for type %u",elttype_oid);
42074212
typeForm= (Form_pg_type)GETSTRUCT(tuple);
42084213
}
42094214

42104215
/*
4211-
*Normal case:get the type's ACL frompg_type
4216+
*Nowget the type'sowner andACL fromthe tuple
42124217
*/
42134218
ownerId=typeForm->typowner;
42144219

‎src/include/catalog/pg_proc.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -412,11 +412,11 @@ DESCR("round to nearest integer");
412412
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_ ));
413413
DESCR("truncate to integer");
414414
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_ ));
415-
DESCR("smallest integer >= value");
415+
DESCR("nearest integer >= value");
416416
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_ ));
417-
DESCR("smallest integer >= value");
417+
DESCR("nearest integer >= value");
418418
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_ ));
419-
DESCR("largest integer <= value");
419+
DESCR("nearest integer <= value");
420420
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_ ));
421421
DESCR("sign of value");
422422
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_ ));
@@ -2319,11 +2319,11 @@ DESCR("value truncated to 'scale'");
23192319
DATA(insert OID = 1710 ( truncPGNSP 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_ ));
23202320
DESCR("value truncated to 'scale' of zero");
23212321
DATA(insert OID = 1711 ( ceilPGNSP 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_ ));
2322-
DESCR("smallest integer >= value");
2322+
DESCR("nearest integer >= value");
23232323
DATA(insert OID = 2167 ( ceilingPGNSP 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_ ));
2324-
DESCR("smallest integer >= value");
2324+
DESCR("nearest integer >= value");
23252325
DATA(insert OID = 1712 ( floorPGNSP 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_ ));
2326-
DESCR("largest integer <= value");
2326+
DESCR("nearest integer <= value");
23272327
DATA(insert OID = 1718 ( numeric_eqPGNSP 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_ ));
23282328
DATA(insert OID = 1719 ( numeric_nePGNSP 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_ ));
23292329
DATA(insert OID = 1720 ( numeric_gtPGNSP 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_ ));

‎src/interfaces/libpq/win32.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,9 @@ LIB32_OBJS= \
167167
"$(INTDIR)\win32error.obj"\
168168
"$(INTDIR)\win32setlocale.obj"\
169169
"$(INTDIR)\pthread-win32.obj"
170+
170171
!IFDEF USE_OPENSSL
171-
LIB32_OBJS=$(LIB32_OBJS) "$(INTDIR)\fe-secure-openssl.obj"
172+
LIB32_OBJS=$(LIB32_OBJS) "$(INTDIR)\fe-secure-openssl.obj"
172173
!ENDIF
173174

174175

0 commit comments

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