diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-10-20 17:12:58 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-10-20 17:12:58 +0000 |
| commit | 404f43894a63cea858189240c4027a7451b87bf2 (patch) | |
| tree | 9d8bfbcbcf78d4e53c01383784a4f0e0df1f3615 /lib/sqlalchemy | |
| parent | 7b457b973102c8fe7c3105d5984f48a3265a5168 (diff) | |
| download | sqlalchemy-404f43894a63cea858189240c4027a7451b87bf2.tar.gz | |
merge r6418 from 0.5, dedupe expressions on clause ident, not string value
[ticket:1574]
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index f07e6aca8..4c3130879 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -584,16 +584,16 @@ class SQLCompiler(engine.Compiled): column_clause_args = {} # the actual list of columns to print in the SELECT column list. - inner_columns = util.unique_list( + inner_columns = [ c for c in [ self.process( self.label_select_column(select, co, asfrom=asfrom), within_columns_clause=True, **column_clause_args) - for co in select.inner_columns + for co in util.unique_list(select.inner_columns) ] if c is not None - ) + ] text = "SELECT " # we're off to a good start ! if select._prefixes: |
