From: Mike Bayer Date: Sun, 25 Nov 2007 03:45:20 +0000 (+0000) Subject: OrderedSet to appease the unit tests....need to find a way to get rid of this X-Git-Tag: rel_0_4_2~148 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d5f9f122f67285d9426cee4bd7958a9a198ded3d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git OrderedSet to appease the unit tests....need to find a way to get rid of this --- diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index a31997d1b3..9b24dd5213 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -510,7 +510,7 @@ class DefaultCompiler(engine.Compiled): whereclause = sql.and_(w, whereclause) else: whereclause = w - + if froms: text += " \nFROM " text += string.join(from_strings, ', ') diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 039145006e..c21b102c72 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -3015,7 +3015,7 @@ class Select(_SelectBaseMixin, FromClause): correlating. """ - froms = util.Set() + froms = util.OrderedSet() hide_froms = util.Set() for col in self._raw_columns: