From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 15 Nov 2013 03:11:22 +0000 (-0500)
Subject: sync up some changes for #2604 and #2607 from 0.7.10, 0.8.0b2
X-Git-Tag: rel_0_9_0~120^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6545f7db78d8bd930685019678f6e7df056ed22;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

sync up some changes for #2604 and #2607 from 0.7.10, 0.8.0b2
---

diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst
index 68e03a2e25..40dcc832c0 100644
--- a/doc/build/changelog/changelog_07.rst
+++ b/doc/build/changelog/changelog_07.rst
@@ -128,6 +128,27 @@
     :version: 0.7.10
     :released: Thu Feb 7 2013
 
+    .. change::
+        :tags: engine, bug
+        :tickets: 2604
+        :versions: 0.8.0b2
+
+      Fixed :meth:`.MetaData.reflect` to correctly use
+      the given :class:`.Connection`, if given, without
+      opening a second connection from that connection's
+      :class:`.Engine`.
+
+    .. change::
+        :tags: mssql, bug
+        :tickets:2607
+        :versions: 0.8.0b2
+
+      Fixed bug whereby using "key" with Column
+      in conjunction with "schema" for the owning
+      Table would fail to locate result rows due
+      to the MSSQL dialect's "schema rendering"
+      logic's failure to take .key into account.
+
     .. change::
         :tags: sql, mysql, gae
         :tickets: 2649
diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 15c78a3dc3..3a5844bbb4 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -1687,26 +1687,6 @@
       The "reflect=True" argument to :class:`~sqlalchemy.schema.MetaData` is deprecated.
       Please use the :meth:`.MetaData.reflect` method.
 
-    .. change::
-        :tags: engine, bug
-        :tickets: 2604
-
-      Fixed :meth:`.MetaData.reflect` to correctly use
-      the given :class:`.Connection`, if given, without
-      opening a second connection from that connection's
-      :class:`.Engine`.  Also in 0.7.10.
-
-    .. change::
-        :tags: mssql, bug
-        :tickets: 2607
-
-      Fixed bug whereby using "key" with Column
-      in conjunction with "schema" for the owning
-      Table would fail to locate result rows due
-      to the MSSQL dialect's "schema rendering"
-      logic's failure to take .key into account.
-      Also in 0.7.10.
-
     .. change::
         :tags: sql, bug
         :tickets: 2603