From d5f9f122f67285d9426cee4bd7958a9a198ded3d Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 25 Nov 2007 03:45:20 +0000 Subject: [PATCH] OrderedSet to appease the unit tests....need to find a way to get rid of this --- lib/sqlalchemy/sql/compiler.py | 2 +- lib/sqlalchemy/sql/expression.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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: -- 2.47.2