From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 26 Feb 2014 18:28:14 +0000 (-0500)
Subject: - Fixed issue in new :meth:`.TextClause.columns` method where the ordering
X-Git-Tag: rel_0_9_4~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf67069d264cba3feed8a48614289d605ed61a55;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Fixed issue in new :meth:`.TextClause.columns` method where the ordering
of columns given positionally would not be preserved.   This could
have potential impact in positional situations such as applying the
resulting :class:`.TextAsFrom` object to a union.
---

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index c29db6f926..a6245bdb77 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,14 @@
 .. changelog::
     :version: 0.9.4
 
+    .. change::
+        :tags: bug, sql
+
+        Fixed issue in new :meth:`.TextClause.columns` method where the ordering
+        of columns given positionally would not be preserved.   This could
+        have potential impact in positional situations such as applying the
+        resulting :class:`.TextAsFrom` object to a union.
+
     .. change::
         :tags: feature, sql
         :tickets: 2962, 2866
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index 2846b3b51f..1b49a7cd1c 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -1446,13 +1446,13 @@ class TextClause(Executable, ClauseElement):
 
         """
 
-        col_by_name = dict(
-            (col.key, col) for col in cols
-        )
-        for key, type_ in types.items():
-            col_by_name[key] = ColumnClause(key, type_)
-
-        return selectable.TextAsFrom(self, list(col_by_name.values()))
+        input_cols = [
+            ColumnClause(col.key, types.pop(col.key))
+                if col.key in types
+                else col
+            for col in cols
+        ] + [ColumnClause(key, type_) for key, type_ in types.items()]
+        return selectable.TextAsFrom(self, input_cols)
 
     @property
     def type(self):
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py
index dbd73a8367..9617cfdf7b 100644
--- a/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@ -388,6 +388,31 @@ class SelectableTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiled
         assert u.corresponding_column(s2.c.table2_coly) is u.c.coly
         assert s2.corresponding_column(u.c.coly) is s2.c.table2_coly
 
+    def test_union_of_alias(self):
+        s1 = select([table1.c.col1, table1.c.col2])
+        s2 = select([table1.c.col1, table1.c.col2]).alias()
+
+        u1 = union(s1, s2)
+        assert u1.corresponding_column(s1.c.col1) is u1.c.col1
+        assert u1.corresponding_column(s2.c.col1) is u1.c.col1
+
+        u2 = union(s2, s1)
+        assert u2.corresponding_column(s1.c.col1) is u2.c.col1
+        assert u2.corresponding_column(s2.c.col1) is u2.c.col1
+
+    def test_union_of_text(self):
+        s1 = select([table1.c.col1, table1.c.col2])
+        s2 = text("select col1, col2 from foo").columns(
+                            column('col1'), column('col2'))
+
+        u1 = union(s1, s2)
+        assert u1.corresponding_column(s1.c.col1) is u1.c.col1
+        assert u1.corresponding_column(s2.c.col1) is u1.c.col1
+
+        u2 = union(s2, s1)
+        assert u2.corresponding_column(s1.c.col1) is u2.c.col1
+        assert u2.corresponding_column(s2.c.col1) is u2.c.col1
+
     def test_select_union(self):
 
         # like testaliasunion, but off a Select off the union.
diff --git a/test/sql/test_text.py b/test/sql/test_text.py
index 57dadfb160..ef63f9daad 100644
--- a/test/sql/test_text.py
+++ b/test/sql/test_text.py
@@ -322,6 +322,20 @@ class AsFromTest(fixtures.TestBase, AssertsCompiledSQL):
             }
         )
 
+    def test_column_collection_ordered(self):
+        t = text("select a, b, c from foo").columns(column('a'),
+                            column('b'), column('c'))
+        eq_(t.c.keys(), ['a', 'b', 'c'])
+
+    def test_column_collection_pos_plus_bykey(self):
+        # overlapping positional names + type names
+        t = text("select a, b, c from foo").columns(column('a'),
+                            column('b'), b=Integer, c=String)
+        eq_(t.c.keys(), ['a', 'b', 'c'])
+        eq_(t.c.b.type._type_affinity, Integer)
+        eq_(t.c.c.type._type_affinity, String)
+
+
     def _xy_table_fixture(self):
         m = MetaData()
         t = Table('t', m, Column('x', Integer), Column('y', Integer))