git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml

index b1a3b2dbece0c2153cd289961efa0b22ae9f0f0b..6aeefd24a7bf286ba279a5083b25d4af904c2403 100644 (file)

--- a/doc/src/sgml/release-9.5.sgml

+++ b/doc/src/sgml/release-9.5.sgml

<listitem>

<!--

+2015年05月08日 [168d580] Andres..: Add support for INSERT ... ON CONFLICT DO NOTHI..

+2015年05月08日 [2c8f483] Andres..: Represent columns requiring insert and update p..

+-->

+ <para>

+ Foreign tables can now take part in <command>INSERT ... ON CONFLICT

+ DO NOTHING</> queries (Peter Geoghegan, Heikki Linnakangas,

+ Andres Freund)

+ </para>

+

+ <para>

+ Foreign data wrappers must be modified to handle this.

+ <command>INSERT ... ON CONFLICT DO UPDATE</> is not supported on

+ foreign tables.

+ </para>

+ </listitem>

+

+ <listitem>

+<!--

2014年12月18日 [4a14f13] Tom Lane: Improve hash_create's API for selecting simple-..

-->

<para>