diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-04-21 10:36:19 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-04-21 10:36:19 -0400 |
| commit | 1f3e5d9826fe989f2212745f6b3592b2ef9b5e32 (patch) | |
| tree | e9c2cbdfd73de773ce72ad69266505315ec6188e | |
| parent | 8ab08cf805fb40c57d8b7eb5d4b99726fee4f2b3 (diff) | |
| download | sqlalchemy-1f3e5d9826fe989f2212745f6b3592b2ef9b5e32.tar.gz | |
Fix result set handling for case insensitive dupe cols
Fixed bug where when using ``case_sensitive=False`` with an
:class:`.Engine`, the result set would fail to correctly accomodate
for duplicate column names in the result set, causing an error
when the statement is executed in 1.0, and preventing the
"ambiguous column" exception from functioning in 1.1.
Change-Id: If582bb9fdd057e4da3ae42f7180b17d1a1a2d98e
Fixes: #3690
| -rw-r--r-- | doc/build/changelog/changelog_10.rst | 10 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/result.py | 1 | ||||
| -rw-r--r-- | test/sql/test_resultset.py | 15 |
3 files changed, 26 insertions, 0 deletions
diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst index 07188b771..f5de4f763 100644 --- a/doc/build/changelog/changelog_10.rst +++ b/doc/build/changelog/changelog_10.rst @@ -20,6 +20,16 @@ .. change:: :tags: bug, sql + :tickets: 3690 + + Fixed bug where when using ``case_sensitive=False`` with an + :class:`.Engine`, the result set would fail to correctly accomodate + for duplicate column names in the result set, causing an error + when the statement is executed in 1.0, and preventing the + "ambiguous column" exception from functioning in 1.1. + + .. change:: + :tags: bug, sql :tickets: 3682 Fixed bug where the negation of an EXISTS expression would not diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index 0333d9ec2..773022ed2 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -257,6 +257,7 @@ class ResultMetaData(object): if key in seen: # this is an "ambiguous" element, replacing # the full record in the map + key = key.lower() if not self.case_sensitive else key by_key[key] = (None, key, None) seen.add(key) diff --git a/test/sql/test_resultset.py b/test/sql/test_resultset.py index ba85fb82e..f74e51f62 100644 --- a/test/sql/test_resultset.py +++ b/test/sql/test_resultset.py @@ -689,6 +689,21 @@ class ResultProxyTest(fixtures.TablesTest): ) @testing.requires.duplicate_names_in_cursor_description + def test_ambiguous_column_case_sensitive(self): + eng = engines.testing_engine(options=dict(case_sensitive=False)) + + row = eng.execute(select([ + literal_column('1').label('SOMECOL'), + literal_column('1').label('SOMECOL'), + ])).first() + + assert_raises_message( + exc.InvalidRequestError, + "Ambiguous column name", + lambda: row['somecol'] + ) + + @testing.requires.duplicate_names_in_cursor_description def test_ambiguous_column_contains(self): users = self.tables.users addresses = self.tables.addresses |