summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-02-02 17:27:09 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2016-02-02 17:27:09 -0500
commit6d58934791eaf56323bebc9b143379b3c4ae0590 (patch)
treef9a590d321a7a3988c893d967e4271815e770f48
parentba1bfef0f281dc131eb296eb84cec915638cd012 (diff)
parentc6d630ca819239bf1b18bd6e51f265fb1be951c9 (diff)
downloadsqlalchemy-6d58934791eaf56323bebc9b143379b3c4ae0590.tar.gz
Merge branch 'master' of https://bitbucket.org/carlrivers/sqlalchemy
-rw-r--r--lib/sqlalchemy/dialects/oracle/zxjdbc.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/zxjdbc.py b/lib/sqlalchemy/dialects/oracle/zxjdbc.py
index 8a9a6650b..c3259feae 100644
--- a/lib/sqlalchemy/dialects/oracle/zxjdbc.py
+++ b/lib/sqlalchemy/dialects/oracle/zxjdbc.py
@@ -70,8 +70,7 @@ class OracleCompiler_zxjdbc(OracleCompiler):
expression._select_iterables(returning_cols))
# within_columns_clause=False so that labels (foo AS bar) don't render
- columns = [self.process(c, within_columns_clause=False,
- result_map=self.result_map)
+ columns = [self.process(c, within_columns_clause=False)
for c in self.returning_cols]
if not hasattr(self, 'returning_parameters'):