- Oracle assembles the correct columns in the result set

  column mapping when generating a LIMIT/OFFSET subquery,
  allows columns to map properly to result sets even
  if long-name truncation kicks in [ticket:941]

2 files changed, 33 insertions, 1 deletions

diff --git a/test/dialect/oracle.py b/test/dialect/oracle.py
index cc171af5f..9436d1915 100644
--- a/test/dialect/oracle.py
+++ b/test/dialect/oracle.py
@@ -41,12 +41,21 @@ class CompileTest(SQLCompileTest):
     def test_limit(self):
         t = table('sometable', column('col1'), column('col2'))
 
+        s = select([t])
+        c = s.compile(dialect=oracle.OracleDialect())
+        assert t.c.col1 in set(c.result_map['col1'][1])
+        
         s = select([t]).limit(10).offset(20)
 
         self.assert_compile(s, "SELECT col1, col2 FROM (SELECT sometable.col1 AS col1, sometable.col2 AS col2, "
             "ROW_NUMBER() OVER (ORDER BY sometable.rowid) AS ora_rn FROM sometable) WHERE ora_rn>20 AND ora_rn<=30"
         )
 
+        # assert that despite the subquery, the columns from the table,
+        # not the select, get put into the "result_map"
+        c = s.compile(dialect=oracle.OracleDialect())
+        assert t.c.col1 in set(c.result_map['col1'][1])
+        
         s = select([s.c.col1, s.c.col2])
 
         self.assert_compile(s, "SELECT col1, col2 FROM (SELECT col1, col2 FROM (SELECT sometable.col1 AS col1, "
diff --git a/test/sql/labels.py b/test/sql/labels.py
index 3d4f0adde..8164d7f77 100644
--- a/test/sql/labels.py
+++ b/test/sql/labels.py
@@ -44,7 +44,8 @@ class LongLabelsTest(SQLCompileTest):
         table1.insert().execute(**{"this_is_the_primarykey_column":3, "this_is_the_data_column":"data3"})
         table1.insert().execute(**{"this_is_the_primarykey_column":4, "this_is_the_data_column":"data4"})
 
-        r = table1.select(use_labels=True, order_by=[table1.c.this_is_the_primarykey_column]).execute()
+        s = table1.select(use_labels=True, order_by=[table1.c.this_is_the_primarykey_column])
+        r = s.execute()
         result = []
         for row in r:
             result.append((row[table1.c.this_is_the_primarykey_column], row[table1.c.this_is_the_data_column]))
@@ -55,6 +56,28 @@ class LongLabelsTest(SQLCompileTest):
             (4, "data4"),
         ], repr(result)
 
+        # some dialects such as oracle (and possibly ms-sql in a future version)
+        # generate a subquery for limits/offsets.
+        # ensure that the generated result map corresponds to the selected table, not
+        # the select query
+        r = s.limit(2).execute()
+        result = []
+        for row in r:
+            result.append((row[table1.c.this_is_the_primarykey_column], row[table1.c.this_is_the_data_column]))
+        assert result == [
+            (1, "data1"),
+            (2, "data2"),
+        ], repr(result)
+  
+        r = s.limit(2).offset(1).execute()
+        result = []
+        for row in r:
+            result.append((row[table1.c.this_is_the_primarykey_column], row[table1.c.this_is_the_data_column]))
+        assert result == [
+            (2, "data2"),
+            (3, "data3"),
+        ], repr(result)
+
     def test_colbinds(self):
         table1.insert().execute(**{"this_is_the_primarykey_column":1, "this_is_the_data_column":"data1"})
         table1.insert().execute(**{"this_is_the_primarykey_column":2, "this_is_the_data_column":"data2"})