From d3621ae961a869c6bdb68dc8738bb732d5b00dc1 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 9 May 2008 23:58:30 +0000 Subject: - 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. --- lib/sqlalchemy/sql/util.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/sql') 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) -- cgit v1.2.1