doc_ja_18_3のマージ

.abi-compliance-history

@@ -18,6 +18,18 @@
 # Be sure to replace "<ADD JUSTIFICATION HERE>" with details of your change and
 # why it is deemed acceptable.
 
+8d9a97e0bb6d820dac553848f0d5d8cc3f3e219d
+#
+# Avoid name collision with NOT NULL constraints
+# 2026-02-21 12:22:08 +0100
+#
+# AddRelationNotNullConstraints() needs to receive the names of constraints
+# already created, so that it can avoid those names when assigning names to
+# not-null constraints.  The purpose of this function is rather obscure, and
+# furthermore it's new in 18, so I don't expect any third-party code to break.
+#
+# Discussion: https://postgr.es/m/19393-6a82427485a744cf@postgresql.org
+
 33e3de6d77e87d6c3c6f8f878dd8de42d37c3b8f
 #
 # Add file_extend_method=posix_fallocate,write_zeros.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PostgreSQL 18.2.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 18.3.
 #
 # Report bugs to <pgsql-bugs@lists.postgresql.org>.
 #
@@ -582,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='18.2'
-PACKAGE_STRING='PostgreSQL 18.2'
+PACKAGE_VERSION='18.3'
+PACKAGE_STRING='PostgreSQL 18.3'
 PACKAGE_BUGREPORT='pgsql-bugs@lists.postgresql.org'
 PACKAGE_URL='https://www.postgresql.org/'
 
@@ -1468,7 +1468,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PostgreSQL 18.2 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 18.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1533,7 +1533,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 18.2:";;
+     short | recursive ) echo "Configuration of PostgreSQL 18.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1724,7 +1724,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 18.2
+PostgreSQL configure 18.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2477,7 +2477,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PostgreSQL $as_me 18.2, which was
+It was created by PostgreSQL $as_me 18.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -20089,7 +20089,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PostgreSQL $as_me 18.2, which was
+This file was extended by PostgreSQL $as_me 18.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20160,7 +20160,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-PostgreSQL config.status 18.2
+PostgreSQL config.status 18.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [18.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
+AC_INIT([PostgreSQL], [18.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not

contrib/hstore/hstore_io.c

@@ -385,7 +385,8 @@ hstoreUniquePairs(Pairs *a, int32 l, int32 *buflen)
 			if (ptr->needfree)
 			{
 				pfree(ptr->key);
-				pfree(ptr->val);
+				if (ptr->val != NULL)
+					pfree(ptr->val);
 			}
 		}
 		else

contrib/pg_trgm/trgm_op.c

@@ -533,7 +533,7 @@ generate_trgm_only(growable_trgm_array *dst, char *str, int slen, TrgmBound **bo
 		{
 			if (bounds_allocated < dst->length)
 			{
-				bounds = repalloc0_array(bounds, TrgmBound, bounds_allocated, dst->allocated);
+				bounds = *bounds_p = repalloc0_array(bounds, TrgmBound, bounds_allocated, dst->allocated);
 				bounds_allocated = dst->allocated;
 			}
 

contrib/pgcrypto/expected/pgp-pubkey-session.out

@@ -44,4 +44,4 @@ ff62c0a33d9143dd3f639893f47732c11c5a12c6052d1935f4d507b7ae1f76ab0e9a69b8
 7305a7f7c19bd509daf4903bff614bc26d118f03e461469c72c12d3a2bb4f78e4d342ce8
 487723649a01ed2b9eb11c662134502c098d55dfcd361939d8370873422c3da75a515a75
 9ffedfe7df44fb3c20f81650801a30d43b5c90b98b3eee'::bytea);
-ERROR:  Public key too big
+ERROR:  Session key too big

contrib/pgcrypto/px.c

@@ -65,7 +65,7 @@ static const struct error_desc px_err_list[] = {
 	{PXE_PGP_UNEXPECTED_PKT, "Unexpected packet in key data"},
 	{PXE_PGP_MATH_FAILED, "Math operation failed"},
 	{PXE_PGP_SHORT_ELGAMAL_KEY, "Elgamal keys must be at least 1024 bits long"},
-	{PXE_PGP_KEY_TOO_BIG, "Public key too big"},
+	{PXE_PGP_KEY_TOO_BIG, "Session key too big"},
 	{PXE_PGP_UNKNOWN_PUBALGO, "Unknown public-key encryption algorithm"},
 	{PXE_PGP_WRONG_KEY, "Wrong key"},
 	{PXE_PGP_MULTIPLE_KEYS,

contrib/postgres_fdw/expected/postgres_fdw.out

@@ -6489,20 +6489,31 @@ UPDATE ft2 d SET c2 = CASE WHEN random() >= 0 THEN d.c2 ELSE 0 END
 ALTER SERVER loopback OPTIONS (DROP extensions);
 INSERT INTO ft2 (c1,c2,c3)
   SELECT id, id % 10, to_char(id, 'FM00000') FROM generate_series(2001, 2010) id;
+-- this will do a remote seqscan, causing unstable result order, so sort
 EXPLAIN (verbose, costs off)
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;            -- can't be pushed down
-                                                QUERY PLAN                                                
-----------------------------------------------------------------------------------------------------------
- Update on public.ft2
-   Output: c1, c2, c3, c4, c5, c6, c7, c8
-   Remote SQL: UPDATE "S 1"."T 1" SET c3 = $2 WHERE ctid = $1 RETURNING "C 1", c2, c3, c4, c5, c6, c7, c8
-   ->  Foreign Scan on public.ft2
-         Output: 'bar'::text, ctid, ft2.*
-         Filter: (postgres_fdw_abs(ft2.c1) > 2000)
-         Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8, ctid FROM "S 1"."T 1" FOR UPDATE
-(7 rows)
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;          -- can't be pushed down
+                                                    QUERY PLAN                                                    
+------------------------------------------------------------------------------------------------------------------
+ Sort
+   Output: cte.c1, cte.c2, cte.c3, cte.c4, cte.c5, cte.c6, cte.c7, cte.c8
+   Sort Key: cte.c1
+   CTE cte
+     ->  Update on public.ft2
+           Output: ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8
+           Remote SQL: UPDATE "S 1"."T 1" SET c3 = $2 WHERE ctid = $1 RETURNING "C 1", c2, c3, c4, c5, c6, c7, c8
+           ->  Foreign Scan on public.ft2
+                 Output: 'bar'::text, ft2.ctid, ft2.*
+                 Filter: (postgres_fdw_abs(ft2.c1) > 2000)
+                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8, ctid FROM "S 1"."T 1" FOR UPDATE
+   ->  CTE Scan on cte
+         Output: cte.c1, cte.c2, cte.c3, cte.c4, cte.c5, cte.c6, cte.c7, cte.c8
+(13 rows)
 
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;
   c1  | c2 | c3  | c4 | c5 | c6 |     c7     | c8 
 ------+----+-----+----+----+----+------------+----
  2001 |  1 | bar |    |    |    | ft2        | 

contrib/postgres_fdw/sql/postgres_fdw.sql

@@ -1608,9 +1608,16 @@ UPDATE ft2 d SET c2 = CASE WHEN random() >= 0 THEN d.c2 ELSE 0 END
 ALTER SERVER loopback OPTIONS (DROP extensions);
 INSERT INTO ft2 (c1,c2,c3)
   SELECT id, id % 10, to_char(id, 'FM00000') FROM generate_series(2001, 2010) id;
+
+-- this will do a remote seqscan, causing unstable result order, so sort
 EXPLAIN (verbose, costs off)
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;            -- can't be pushed down
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;          -- can't be pushed down
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;
+
 EXPLAIN (verbose, costs off)
 UPDATE ft2 SET c3 = 'baz'
   FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)

doc/src/sgml/ref/create_policy.sgml

@@ -414,7 +414,9 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
        <para>
 <!--
          If an <literal>INSERT</literal> has an <literal>ON CONFLICT DO
-         NOTHING/UPDATE</literal> clause, <literal>SELECT</literal>
+         UPDATE</literal> clause, or an <literal>ON CONFLICT DO
+         NOTHING</literal> clause with an arbiter index or constraint
+         specification, then <literal>SELECT</literal>
          permissions are required on the relation, and the rows proposed for
          insertion are checked using the relation's <literal>SELECT</literal>
          policies.  If a row proposed for insertion does not satisfy the
@@ -427,9 +429,9 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
          <literal>UPDATE</literal> is <emphasis>never</emphasis> silently
          avoided).
 -->
-<literal>INSERT</literal>に<literal>ON CONFLICT DO NOTHING/UPDATE</literal>句がある場合、リレーションに対する<literal>SELECT</literal>権限が必要であり、挿入される予定の行はリレーションの<literal>SELECT</literal>ポリシーを使って検査されます。
+<literal>INSERT</literal>に<literal>ON CONFLICT DO UPDATE</literal>句、あるいは競合解決インデックスや制約の指定を伴う<literal>ON CONFLICT DO NOTHING</literal>句がある場合、リレーションに対する<literal>SELECT</literal>権限が必要であり、挿入される予定の行はリレーションの<literal>SELECT</literal>ポリシーを使って検査されます。
 挿入される予定の行がリレーションの<literal>SELECT</literal>ポリシーを満たさない場合、エラーが発生します（<literal>INSERT</literal>は<emphasis>決して</emphasis>暗黙的に回避されません）。
-さらに、<literal>UPDATE</literal>のパスが取られた場合、更新される行と新しい更新された行はリレーションの<literal>SELECT</literal>ポリシーを使って検査され、満たされない場合はエラーが発生します（補助的な<literal>UPDATE</literal>は<emphasis>決して</emphasis>暗黙的に回避されません）。
+さらに、<literal>UPDATE</literal>のパスが取られた場合、更新される行と新しく更新された行はリレーションの<literal>SELECT</literal>ポリシーを使って検査され、満たされない場合はエラーが発生します（補助的な<literal>UPDATE</literal>は<emphasis>決して</emphasis>暗黙的に回避されません）。
        </para>
        <para>
 <!--

doc/src/sgml/ref/insert.sgml

@@ -164,14 +164,18 @@ INSERT INTO <replaceable class="parameter">table_name</replaceable> [ AS <replac
    <literal>INSERT</literal> privilege on the listed columns.
    Similarly, when <literal>ON CONFLICT DO UPDATE</literal> is specified, you
    only need <literal>UPDATE</literal> privilege on the column(s) that are
-   listed to be updated.  However, <literal>ON CONFLICT DO UPDATE</literal>
-   also requires <literal>SELECT</literal> privilege on any column whose
-   values are read in the <literal>ON CONFLICT DO UPDATE</literal>
-   expressions or <replaceable>condition</replaceable>.
+   listed to be updated.  However, all forms of <literal>ON CONFLICT</literal>
+   also require <literal>SELECT</literal> privilege on any column whose values
+   are read.  This includes any column mentioned in
+   <replaceable>conflict_target</replaceable> (including columns referred to
+   by the arbiter constraint), and any column mentioned in an
+   <literal>ON CONFLICT DO UPDATE</literal> <replaceable>expression</replaceable>,
+   or a <literal>WHERE</literal> clause <replaceable>condition</replaceable>.
 -->
 列リストを指定する場合は、列挙された列に対する<literal>INSERT</literal>権限のみが必要です。
 同様に、<literal>ON CONFLICT DO UPDATE</literal>が指定されている場合、更新対象として列挙されている列についてのみ、<literal>UPDATE</literal>権限が必要です。
-しかし、<literal>ON CONFLICT DO UPDATE</literal>は、値が<literal>ON CONFLICT DO UPDATE</literal>式あるいは<replaceable>condition</replaceable>で読み取られるすべての列について<literal>SELECT</literal>権限も必要です。
+しかし、すべての形式の<literal>ON CONFLICT</literal>は、値が読み取られる列に対する<literal>SELECT</literal>権限も必要とします。
+これには、<replaceable>conflict_target</replaceable>で言及されている列（競合解決制約で参照される列も含む）や、<literal>ON CONFLICT DO UPDATE</literal>の<replaceable>expression</replaceable>や<literal>WHERE</literal>句の<replaceable>condition</replaceable>で言及されている列が含まれます。
   </para>
 
   <para>