- fixed a fairly critical bug in clause adaption/corresponding column in conjunction with annotations

- implicit order by is removed, modified many tests to explicitly set ordering, probably many more to go
once it hits the buildbot.

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index 944a68def..6c8ef8f5a 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -147,6 +147,11 @@ class Annotated(object):
             )
 
     def __init__(self, element, values):
+        # force FromClause to generate their internal 
+        # collections into __dict__
+        if isinstance(element, expression.FromClause):
+            element.c
+        
         self.__dict__ = element.__dict__.copy()
         self.__element = element
         self._annotations = values
@@ -357,7 +362,7 @@ class ClauseAdapter(visitors.ReplacingCloningVisitor):
         self.include = include
         self.exclude = exclude
         self.equivalents = equivalents or {}
-
+        
     def _corresponding_column(self, col, require_embedded):
         newcol = self.selectable.corresponding_column(col, require_embedded=require_embedded)