summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/compiler.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-08-25 19:41:14 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2012-08-25 19:41:14 +0000
commit4d40f1b71ec293af5a7ce16a66429976895a8545 (patch)
treeb3b7b81b8cb42066d58646ce4182db6d32a4217d /lib/sqlalchemy/sql/compiler.py
parent752750ea7e4cd026655f0dea19998821a08ac35a (diff)
downloadsqlalchemy-4d40f1b71ec293af5a7ce16a66429976895a8545.tar.gz
- more oracle tweaks for returning; the method here is still kind of brittle and might have issues with
pks, multiple function calls
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
-rw-r--r--lib/sqlalchemy/sql/compiler.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index fffe3a9a5..8e4f0288f 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -958,7 +958,9 @@ class SQLCompiler(engine.Compiled):
else:
add_to_result_map = None
- if isinstance(column, sql.Label):
+ if not within_columns_clause:
+ result_expr = col_expr
+ elif isinstance(column, sql.Label):
if col_expr is not column:
result_expr = _CompileLabel(
col_expr,