From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 7 Aug 2015 01:08:08 +0000 (-0400)
Subject: 9.5 release notes:  mention ON CONFLICT DO NOTHING for FDWs
X-Git-Tag: REL9_6_BETA1~1531
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58e09b902418d07545caec675d67265f1d510f4b;p=thirdparty%2Fpostgresql.git

9.5 release notes:  mention ON CONFLICT DO NOTHING for FDWs

Report by Peter Geoghegan

Backpatch through 9.5
---

diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml
index b1a3b2dbece..6aeefd24a7b 100644
--- a/doc/src/sgml/release-9.5.sgml
+++ b/doc/src/sgml/release-9.5.sgml
@@ -2447,6 +2447,24 @@ FIXME: Improve description, link
 
       <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>