changelog updates

Change-Id: Ib21d015fda144204bdeaecd21f8af86a9b3b9e8e

diff --git a/doc/build/changelog/unreleased_14/6698.rst b/doc/build/changelog/unreleased_14/6698.rst
index 8ed8711fff27ca82929649a3a2ab876a032f4666..35c6f3167edd152d84ff041271ded4084233ca96 100644 (file)
--- a/doc/build/changelog/unreleased_14/6698.rst
+++ b/doc/build/changelog/unreleased_14/6698.rst
@@ -2,8 +2,8 @@
     :tags: bug, regression, orm
     :tickets: 6698
 
-    Fixed regression caused in 1.4.19 due to #6503 and related involving
-    :meth:`_orm.Query.with_entities` where the new structure used would be
-    inappropriately transferred to an enclosing :class:`_orm.Query` when making
-    use of set operations such as :meth:`_orm.Query.union`, causing the JOIN
-    instructions within to be applied to the outside query as well.
+    Fixed regression caused in 1.4.19 due to :ticket:`6503` and related
+    involving :meth:`_orm.Query.with_entities` where the new structure used
+    would be inappropriately transferred to an enclosing :class:`_orm.Query`
+    when making use of set operations such as :meth:`_orm.Query.union`, causing
+    the JOIN instructions within to be applied to the outside query as well.

diff --git a/doc/build/changelog/unreleased_14/6755.rst b/doc/build/changelog/unreleased_14/6755.rst
index 958ab0d5f7c14f040dbf1f1661a875a356e7eee2..acd86acee4aacc25969536483169989b91c68636 100644 (file)
--- a/doc/build/changelog/unreleased_14/6755.rst
+++ b/doc/build/changelog/unreleased_14/6755.rst
@@ -2,8 +2,9 @@
     :tags: bug, postgresql
     :tickets: 6755
 
-    Fixed issue where a too-long constraint name rendered as part of the "ON
-    CONFLICT ON CONSTRAINT" element of the :class:`_postgresql.Insert`
-    construct due to naming convention generation would not correctly truncate
-    the name in the same way that it normally renders within a CREATE TABLE
-    statement, thus producing a non-matching and too-long constraint name.
+    Fixed issue in :meth:`_postgresql.Insert.on_conflict_do_nothing` and
+    :meth:`_postgresql.Insert.on_conflict_do_update` where the name of a unique
+    constraint passed as the ``constraint`` parameter would not be properly
+    truncated for length if it were based on a naming convention that generated
+    a too-long name for the PostgreSQL max identifier length of 63 characters,
+    in the same way which occurs within a CREATE TABLE statement.
\ No newline at end of file