Oracle COLUMN_VALUE is a column name, not a keyword

Fixed issue in Oracle compiler where the syntax for
:meth:`.FunctionElement.column_valued` was incorrect, rendering the name
``COLUMN_VALUE`` without qualifying the source table correctly.

Fixes: #8945
Change-Id: Ia04bbdc68168e78b67a74bb3834a63f5d5000627
(cherry picked from commit 655be0237367462a01a9c86cdef9e9afab06d6d6)

diff --git a/doc/build/changelog/unreleased_14/8827.rst b/doc/build/changelog/unreleased_14/8827.rst
index 677277e45d73e847612d1a23e9db23ee2ccd518c..2201cefb5b3e2caa1bc5346815c41f8dd1a81a90 100644 (file)
--- a/doc/build/changelog/unreleased_14/8827.rst
+++ b/doc/build/changelog/unreleased_14/8827.rst
@@ -2,8 +2,11 @@
     :tags: bug, sql
     :tickets: 8827
 
-    Fixed a series of issues regarding positionally rendered bound parameters,
-    such as those used for SQLite, asyncpg, MySQL and others. Some compiled
-    forms would not maintain the order of parameters correctly, such as the
-    PostgreSQL ``regexp_replace()`` function as well as within the "nesting"
-    feature of the :class:`.CTE` construct first introduced in :ticket:`4123`.
+    Fixed a series of issues regarding the position and sometimes the identity
+    of rendered bound parameters, such as those used for SQLite, asyncpg,
+    MySQL, Oracle and others. Some compiled forms would not maintain the order
+    of parameters correctly, such as the PostgreSQL ``regexp_replace()``
+    function, the "nesting" feature of the :class:`.CTE` construct first
+    introduced in :ticket:`4123`, and selectable tables formed by using the
+    :meth:`.FunctionElement.column_valued` method with Oracle.
+

diff --git a/doc/build/changelog/unreleased_14/8945.rst b/doc/build/changelog/unreleased_14/8945.rst
new file mode 100644 (file)
index 0000000..e1b4bd6
--- /dev/null
+++ b/doc/build/changelog/unreleased_14/8945.rst
@@ -0,0 +1,8 @@
+.. change::
+    :tags: bug, oracle
+    :tickets: 8945
+    :versions: 2.0.0b5
+
+    Fixed issue in Oracle compiler where the syntax for
+    :meth:`.FunctionElement.column_valued` was incorrect, rendering the name
+    ``COLUMN_VALUE`` without qualifying the source table correctly.

diff --git a/doc/build/tutorial/data_select.rst b/doc/build/tutorial/data_select.rst
index 9b0b887da1529a346a9c015993e10a493207c33f..b34ab648cd38a429991a71e5a170ef29e2e1c38d 100644 (file)
--- a/doc/build/tutorial/data_select.rst
+++ b/doc/build/tutorial/data_select.rst
@@ -1737,7 +1737,7 @@ it is usable for custom SQL functions::
     >>> from sqlalchemy.dialects import oracle
     >>> stmt = select(func.scalar_strings(5).column_valued("s"))
     >>> print(stmt.compile(dialect=oracle.dialect()))
-    SELECT COLUMN_VALUE s
+    SELECT s.COLUMN_VALUE
     FROM TABLE (scalar_strings(:scalar_strings_1)) s
 
 

diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 417ab84b7b732ba4a8a2e0802f8e37ecc3b6fd9c..934d4c719e2192c3c694548bb7ebf74954103fdb 100644 (file)
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -948,7 +948,7 @@ class OracleCompiler(compiler.SQLCompiler):
         text = super(OracleCompiler, self).visit_table_valued_column(
             element, **kw
         )
-        text = "COLUMN_VALUE " + text
+        text = text + ".COLUMN_VALUE"
         return text
 
     def default_from(self):

diff --git a/test/base/test_tutorials.py b/test/base/test_tutorials.py
index bde7baa750536dfdee486362d0e02ca5da52f3a0..05d884b4da6b1fbe30ad8660208ae6479ec2a7c1 100644 (file)
--- a/test/base/test_tutorials.py
+++ b/test/base/test_tutorials.py
@@ -14,6 +14,7 @@ from sqlalchemy.testing import requires
 
 class DocTest(fixtures.TestBase):
     __requires__ = ("python3",)
+    __only_on__ = "sqlite+pysqlite"
 
     def _setup_logger(self):
         rootlogger = logging.getLogger("sqlalchemy.engine.Engine")

diff --git a/test/dialect/oracle/test_compiler.py b/test/dialect/oracle/test_compiler.py
index 2c586990813666ae9281922e62b1625aa3abd36f..08b68f0f0301cd51b76ae308edc71f7722352b38 100644 (file)
--- a/test/dialect/oracle/test_compiler.py
+++ b/test/dialect/oracle/test_compiler.py
@@ -1580,19 +1580,41 @@ class TableValuedFunctionTest(fixtures.TestBase, testing.AssertsCompiledSQL):
         stmt = select(fn.alias().column)
         self.assert_compile(
             stmt,
-            "SELECT COLUMN_VALUE anon_1 "
+            "SELECT anon_1.COLUMN_VALUE "
             "FROM TABLE (scalar_strings(:scalar_strings_1)) anon_1",
         )
 
+    def test_scalar_alias_multi_columns(self):
+        fn1 = func.scalar_strings(5)
+        fn2 = func.scalar_strings(3)
+        stmt = select(fn1.alias().column, fn2.alias().column)
+        self.assert_compile(
+            stmt,
+            "SELECT anon_1.COLUMN_VALUE, anon_2.COLUMN_VALUE FROM TABLE "
+            "(scalar_strings(:scalar_strings_1)) anon_1, "
+            "TABLE (scalar_strings(:scalar_strings_2)) anon_2",
+        )
+
     def test_column_valued(self):
         fn = func.scalar_strings(5)
         stmt = select(fn.column_valued())
         self.assert_compile(
             stmt,
-            "SELECT COLUMN_VALUE anon_1 "
+            "SELECT anon_1.COLUMN_VALUE "
             "FROM TABLE (scalar_strings(:scalar_strings_1)) anon_1",
         )
 
+    def test_multi_column_valued(self):
+        fn1 = func.scalar_strings(5)
+        fn2 = func.scalar_strings(3)
+        stmt = select(fn1.column_valued(), fn2.column_valued().label("x"))
+        self.assert_compile(
+            stmt,
+            "SELECT anon_1.COLUMN_VALUE, anon_2.COLUMN_VALUE AS x FROM "
+            "TABLE (scalar_strings(:scalar_strings_1)) anon_1, "
+            "TABLE (scalar_strings(:scalar_strings_2)) anon_2",
+        )
+
     def test_table_valued(self):
         fn = func.three_pairs().table_valued("string1", "string2")
         stmt = select(fn.c.string1, fn.c.string2)

diff --git a/test/dialect/oracle/test_dialect.py b/test/dialect/oracle/test_dialect.py
index f494b59aeff371d76e65406b9feeb603ea2405af..8a388889321e7ff3c1088aed33283a4f63615a30 100644 (file)
--- a/test/dialect/oracle/test_dialect.py
+++ b/test/dialect/oracle/test_dialect.py
@@ -1,5 +1,6 @@
 # coding: utf-8
 
+import itertools
 import re
 
 from sqlalchemy import bindparam
@@ -1058,7 +1059,7 @@ class TableValuedTest(fixtures.TestBase):
         connection.exec_driver_sql(
             r"""
 CREATE OR REPLACE FUNCTION scalar_strings (
-   count_in IN INTEGER)
+   count_in IN INTEGER, string_in IN VARCHAR2)
    RETURN strings_t
    AUTHID DEFINER
 IS
@@ -1068,7 +1069,7 @@ BEGIN
 
    FOR indx IN 1 .. count_in
    LOOP
-      l_strings (indx) := 'some string';
+      l_strings (indx) := string_in;
    END LOOP;
 
    RETURN l_strings;
@@ -1118,7 +1119,8 @@ END;
     def test_scalar_strings_control(self, scalar_strings, connection):
         result = (
             connection.exec_driver_sql(
-                "SELECT COLUMN_VALUE my_string FROM TABLE (scalar_strings (5))"
+                "SELECT COLUMN_VALUE my_string FROM TABLE "
+                "(scalar_strings (5, 'some string'))"
             )
             .scalars()
             .all()
@@ -1129,7 +1131,7 @@ END;
         result = (
             connection.exec_driver_sql(
                 "SELECT COLUMN_VALUE anon_1 "
-                "FROM TABLE (scalar_strings (5)) anon_1"
+                "FROM TABLE (scalar_strings (5, 'some string')) anon_1"
             )
             .scalars()
             .all()
@@ -1137,7 +1139,7 @@ END;
         eq_(result, ["some string"] * 5)
 
     def test_scalar_strings(self, scalar_strings, connection):
-        fn = func.scalar_strings(5)
+        fn = func.scalar_strings(5, "some string")
         result = connection.execute(select(fn.column_valued())).scalars().all()
         eq_(result, ["some string"] * 5)
 
@@ -1152,6 +1154,15 @@ END;
         result = connection.execute(select(fn.c.string1, fn.c.string2)).all()
         eq_(result, [("a", "b"), ("c", "d"), ("e", "f")])
 
+    def test_two_independent_tables(self, scalar_strings, connection):
+        fn1 = func.scalar_strings(5, "string one").column_valued()
+        fn2 = func.scalar_strings(3, "string two").column_valued()
+        result = connection.execute(select(fn1, fn2).where(fn1 != fn2)).all()
+        eq_(
+            result,
+            list(itertools.product(["string one"] * 5, ["string two"] * 3)),
+        )
+
 
 class OptimizedFetchLimitOffsetTest(test_select.FetchLimitOffsetTest):
     __only_on__ = "oracle"