-add some annotation regarding [ticket:2153]

diff --git a/CHANGES b/CHANGES
index d3ce0e9102728f96591a8ce4ea4761ee4d023534..1b93682ad26756a524f6e2c61de9f813591c0ce2 100644 (file)
--- 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 074451c94c8c06441d18abadcec5e1f0db93cb0d..b51db33c6cc6276350ba6912d17c4bbc9757ddb5 100644 (file)
--- 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 "