summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/elements.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2019-10-23 10:53:04 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2019-10-24 10:13:27 -0400
commitf9000e2a38bc879a4964a4f396e87185d0d21cd2 (patch)
treeb6925ca5a92e5b9009288bdb048040af463dad8e /lib/sqlalchemy/sql/elements.py
parentd76cb7213557c24609a1a75d8c391aea0179562a (diff)
downloadsqlalchemy-f9000e2a38bc879a4964a4f396e87185d0d21cd2.tar.gz
Use default repr() for quoted_name under python 3
Changed the ``repr()`` of the :class:`.quoted_name` construct to use regular string repr() under Python 3, rather than running it through "backslashreplace" escaping, which can be misleading. Modified the approach of "name normalization" for the Oracle and Firebird dialects, which converts from the UPPERCASE-as-case-insensitive convention of these dialects into lowercase-as-case-insensitive for SQLAlchemy, to not automatically apply the :class:`.quoted_name` construct to a name that matches itself under upper or lower case conversion, as is the case for many non-european characters. All names used within metadata structures are converted to :class:`.quoted_name` objects in any case; the change here would only affect the output of some inspection functions. Moved name normalize to be under default dialect, added test coverage in test/sql/test_quote.py Fixes: #4931 Change-Id: Ic121b20e07249824710a54423e321d94a425362f
Diffstat (limited to 'lib/sqlalchemy/sql/elements.py')
-rw-r--r--lib/sqlalchemy/sql/elements.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index 78c434cff..e1ff44285 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -4479,10 +4479,13 @@ class quoted_name(util.MemoizedSlots, util.text_type):
return util.text_type(self).upper()
def __repr__(self):
- backslashed = self.encode("ascii", "backslashreplace")
- if not util.py2k:
- backslashed = backslashed.decode("ascii")
- return "'%s'" % backslashed
+ if util.py2k:
+ backslashed = self.encode("ascii", "backslashreplace")
+ if not util.py2k:
+ backslashed = backslashed.decode("ascii")
+ return "'%s'" % backslashed
+ else:
+ return str.__repr__(self)
def _select_iterables(elements):