diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-11-25 03:45:20 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-11-25 03:45:20 +0000 |
| commit | d5f9f122f67285d9426cee4bd7958a9a198ded3d (patch) | |
| tree | 2d5787f2e67a3f0c31494dcdae599032b2956d3c /lib/sqlalchemy/sql | |
| parent | cf18eecd704f5eb6fde4e0c362cfdb322e3e559a (diff) | |
| download | sqlalchemy-d5f9f122f67285d9426cee4bd7958a9a198ded3d.tar.gz | |
OrderedSet to appease the unit tests....need to find a way to get rid of this
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 2 | ||||
| -rw-r--r-- | 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 a31997d1b..9b24dd521 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 039145006..c21b102c7 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: |