From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 23 Mar 2010 19:01:21 +0000 (-0400)
Subject: merge tip
X-Git-Tag: rel_0_6beta3~12^2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93ebb379aaefd313f1f5e972f973ef39b6cf5b38;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge tip
---

93ebb379aaefd313f1f5e972f973ef39b6cf5b38
diff --cc CHANGES
index 7db2a05075,1cb4625d0e..4640408e38
--- a/CHANGES
+++ b/CHANGES
@@@ -12,13 -12,12 +12,18 @@@ CHANGE
      join(prop) would fail to render the second join outside the
      subquery, when joining on the same criterion as was on the 
      inside.
+ 
+   - Fixed bug in Query whereby the usage of aliased() constructs
+     would fail if the underlying table (but not the actual alias) 
+     were referenced inside the subquery generated by 
+     q.from_self() or q.select_from().
      
 +  - Fixed bug which affected all eagerload() and similar options 
 +    such that "remote" eager loads, i.e. eagerloads off of a lazy
 +    load such as query(A).options(eagerload(A.b, B.c))
 +    wouldn't eagerload anything, but using eagerload("b.c") would
 +    work fine.
 +     
  0.6beta2
  ========