From 404f43894a63cea858189240c4027a7451b87bf2 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 20 Oct 2009 17:12:58 +0000 Subject: merge r6418 from 0.5, dedupe expressions on clause ident, not string value [ticket:1574] --- lib/sqlalchemy/sql/compiler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy/sql/compiler.py') 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: -- cgit v1.2.1