From 07d7c4905d65b7f28c1ffcbd33f81ee52c9fd847 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 24 Oct 2012 15:37:06 -0400 Subject: Fixed bug where keyword arguments passed to :meth:`.Compiler.process` wouldn't get propagated to the column expressions present in the columns clause of a SELECT statement. In particular this would come up when used by custom compilation schemes that relied upon special flags. [ticket:2593] --- lib/sqlalchemy/sql/compiler.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy/sql') diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 6da51c31c..0847335c2 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -1044,9 +1044,12 @@ class SQLCompiler(engine.Compiled): else: result_expr = col_expr + column_clause_args.update( + within_columns_clause=within_columns_clause, + add_to_result_map=add_to_result_map + ) return result_expr._compiler_dispatch( - self, within_columns_clause=within_columns_clause, - add_to_result_map=add_to_result_map, + self, **column_clause_args ) @@ -1098,7 +1101,12 @@ class SQLCompiler(engine.Compiled): self.stack.append({'from': correlate_froms, 'iswrapper': iswrapper}) - column_clause_args = {'positional_names': positional_names} + column_clause_args = kwargs.copy() + column_clause_args.update({ + 'positional_names': positional_names, + 'within_label_clause': False, + 'within_columns_clause': False + }) # the actual list of columns to print in the SELECT column list. inner_columns = [ -- cgit v1.2.1