diff options
Diffstat (limited to 'lib/sqlalchemy/sql/elements.py')
| -rw-r--r-- | lib/sqlalchemy/sql/elements.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index ea2132e67..73a8a0b82 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -2018,6 +2018,7 @@ class ColumnClause(Immutable, ColumnElement): def _gen_label(self, name): t = self.table + if self.is_literal: return None @@ -2030,8 +2031,14 @@ class ColumnClause(Immutable, ColumnElement): # propagate name quoting rules for labels. if getattr(name, "quote", None) is not None: - label = quoted_name(label, name.quote) + if isinstance(label, quoted_name): + label.quote = name.quote + else: + label = quoted_name(label, name.quote) elif getattr(t.name, "quote", None) is not None: + # can't get this situation to occur, so let's + # assert false on it for now + assert not isinstance(label, quoted_name) label = quoted_name(label, t.name.quote) # ensure the label name doesn't conflict with that |