- somejoin.select(fold_equivalents=True) is no longer

deprecated, and will eventually be rolled into a more
comprehensive version of the feature for [ticket:1729].

diff --git a/CHANGES b/CHANGES
index f027db6475d79194177c44244fdab5b028a280d4..6fe3cbdc5886ad247cc305d07e23018d540b9c66 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -68,6 +68,10 @@ CHANGES
     an UPDATE.  Test coverage which wasn't present in 0.5
     has been added.  [ticket:1755]
 
+  - somejoin.select(fold_equivalents=True) is no longer 
+    deprecated, and will eventually be rolled into a more 
+    comprehensive version of the feature for [ticket:1729].
+    
   - the Numeric type raises an *enormous* warning when expected
     to convert floats to Decimal from a DBAPI that returns floats.
     This includes SQLite, Oracle, Sybase, MS-SQL.

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 1222a144fecf892ac753e4548f866aa0013a83db..fc6b5ad97035b1bb7db242009df1003690d2f5ad 100644 (file)
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -2892,18 +2892,13 @@ class Join(FromClause):
           select, for columns that are calculated to be "equivalent"
           based on the join criterion of this :class:`Join`. This will
           recursively apply to any joins directly nested by this one
-          as well.  This flag is specific to a particular use case
-          by the ORM and is deprecated as of 0.6.
+          as well.
 
         :param \**kwargs: all other kwargs are sent to the 
           underlying :func:`select()` function.
 
         """
         if fold_equivalents:
-            global sql_util
-            if not sql_util:
-                from sqlalchemy.sql import util as sql_util
-            util.warn_deprecated("fold_equivalents is deprecated.")
             collist = sql_util.folded_equivalents(self)
         else:
             collist = [self.left, self.right]