From: Carlos Rivas <carlos@twobitcoder.com>
Date: Sat, 23 Jan 2016 09:23:46 +0000 (+0000)
Subject: Removed entry that causes AttributeError (#3621) - Oracle zxJDBC fails with Attribute... 
X-Git-Tag: rel_1_0_12~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d3962371c115f225250c328ff5a288b1a2d7cb4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Removed entry that causes AttributeError (#3621) - Oracle zxJDBC fails with AttributeError in object OracleCompiler_zxjdbc
(cherry picked from commit edc0b8678bc06ae27fa0f7e80c3eb074978fbe10)
---

diff --git a/lib/sqlalchemy/dialects/oracle/zxjdbc.py b/lib/sqlalchemy/dialects/oracle/zxjdbc.py
index 8a9a6650b1..c3259feae0 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'):