From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 7 May 2011 16:57:07 +0000 (-0400)
Subject: -add some annotation regarding [ticket:2153]
X-Git-Tag: rel_0_6_8~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd034659942ba2e256c54c112815010674ad9e72;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

-add some annotation regarding [ticket:2153]
---

diff --git a/CHANGES b/CHANGES
index d3ce0e9102..1b93682ad2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,7 +41,10 @@ CHANGES
     to unrelated tables when determining inherit
     condition between parent and child class.
     This is equivalent to behavior already 
-    applied to declarative.  [ticket:2153]
+    applied to declarative.  Note that 0.7 has a 
+    more comprehensive solution to this, altering
+    how join() itself determines an FK error.
+    [ticket:2153]
 
 - sql
   - Fixed bug whereby if FetchedValue was passed
diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index 074451c94c..b51db33c6c 100644
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -1463,7 +1463,8 @@ class InhCondTest(testing.TestBase):
         # for mapper(), not just declarative, in the first place.  
         # there is no case where the failure would be silent - 
         # there is either a single join condition between the two tables 
-        # or there's not.
+        # or there's not.  0.7 changes how join conditions are determined
+        # so that we get the correct FK error here.
         assert_raises_message(
             sa_exc.ArgumentError,
             "Can't find any foreign key relationships between "