- more oracle tweaks for returning; the method here is still kind of brittle and...

pks, multiple function calls

diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
index e2d98fb788b1d098f43726ff590e78fb75fb7427..ea1913c3844cea24f2aa386229c69eff87b62670 100644 (file)
--- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -350,11 +350,12 @@ class OracleExecutionContext_cx_oracle(OracleExecutionContext):
                     if not hasattr(self, 'out_parameters'):
                         self.out_parameters = {}
                     if dbtype is None:
-                        raise exc.InvalidRequestError("Cannot create out parameter for parameter "
-                                                        "%r - it's type %r is not supported by"
-                                                        " cx_oracle" %
-                                                        (name, bindparam.type)
-                                                        )
+                        raise exc.InvalidRequestError(
+                                    "Cannot create out parameter for parameter "
+                                    "%r - it's type %r is not supported by"
+                                    " cx_oracle" %
+                                    (bindparam.name, bindparam.type)
+                                    )
                     name = self.compiled.bind_names[bindparam]
                     self.out_parameters[name] = self.cursor.var(dbtype)
                     self.parameters[0][quoted_bind_names.get(name, name)] = \

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index fffe3a9a5b51856def68c2eb701efb9332b8e46a..8e4f0288f8dd70efb7b5e64d28874e6a791ad289 100644 (file)
--- 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,

diff --git a/test/dialect/test_oracle.py b/test/dialect/test_oracle.py
index fa6e4a85fe8f7222f39936dafd4a082745700c0d..1fbaf96ddec860449e1ff911b8cb403a8f2a7ce7 100644 (file)
--- a/test/dialect/test_oracle.py
+++ b/test/dialect/test_oracle.py
@@ -453,6 +453,23 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
                 "t1.c2, t1.c3 INTO :ret_0, :ret_1"
         )
 
+    def test_returning_insert_functional(self):
+        t1 = table('t1', column('c1'), column('c2', String()), column('c3', String()))
+        fn = func.lower(t1.c.c2, type_=String())
+        stmt = t1.insert().values(c1=1).returning(fn, t1.c.c3)
+        compiled = stmt.compile(dialect=oracle.dialect())
+        eq_(
+            compiled.result_map,
+            {'c3': ('c3', (t1.c.c3, 'c3', 'c3'), t1.c.c3.type),
+            'lower': ('lower', (), fn.type)}
+
+        )
+        self.assert_compile(
+            stmt,
+            "INSERT INTO t1 (c1) VALUES (:c1) RETURNING "
+                "lower(t1.c2), t1.c3 INTO :ret_0, :ret_1"
+        )
+
     def test_returning_insert_labeled(self):
         t1 = table('t1', column('c1'), column('c2'), column('c3'))
         self.assert_compile(