From: mike bayer <mike_mp@zzzcomputing.com>
Date: Tue, 14 Jun 2016 19:23:17 +0000 (-0400)
Subject: Merge "Add ON CONFLICT support for Postgresql"
X-Git-Tag: rel_1_1_0b1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfb59ecc9bbd2f5040dd5bb8c82491851b186681;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge "Add ON CONFLICT support for Postgresql"
---

cfb59ecc9bbd2f5040dd5bb8c82491851b186681
diff --cc doc/build/changelog/changelog_11.rst
index 923148232d,6151ec3ffe..662bad00aa
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@@ -21,14 -21,18 +21,26 @@@
  .. changelog::
      :version: 1.1.0b1
  
 +    .. change::
 +        :tags: bug, sql
 +        :tickets: 3724
 +
 +        :meth:`.FromClause.count` is deprecated.  This function makes use of
 +        an arbitrary column in the table and is not reliable; for Core use,
 +        ``func.count()`` should be preferred.
 +
+     .. change::
+         :tags: feature, postgresql
+         :tickets: 3529
+ 
+         Added support for Postgresql's INSERT..ON CONFLICT using a new
+         Postgresql-specific :class:`.postgresql.dml.Insert` object.
+         Pull request and extensive efforts here by Robin Thomas.
+ 
+         .. seealso::
+ 
+             :ref:`change_3529`
+ 
      .. change::
          :tags: feature, postgresql
          :pullreq: bitbucket:84