diff options
| -rw-r--r-- | lib/sqlalchemy/sql/elements.py | 9 | ||||
| -rw-r--r-- | test/sql/test_quote.py | 13 |
2 files changed, 21 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 diff --git a/test/sql/test_quote.py b/test/sql/test_quote.py index db1e0b8a5..3cab3dc79 100644 --- a/test/sql/test_quote.py +++ b/test/sql/test_quote.py @@ -612,7 +612,20 @@ class QuoteTest(fixtures.TestBase, AssertsCompiledSQL): 'CREATE INDEX foo ON t ("x")' ) + def test_quote_flag_propagate_anon_label(self): + m = MetaData() + t = Table('t', m, Column('x', Integer, quote=True)) + self.assert_compile( + select([t.alias()]).apply_labels(), + 'SELECT t_1."x" AS "t_1_x" FROM t AS t_1' + ) + + t2 = Table('t2', m, Column('x', Integer), quote=True) + self.assert_compile( + select([t2.c.x]).apply_labels(), + 'SELECT "t2".x AS "t2_x" FROM "t2"' + ) class PreparerTest(fixtures.TestBase): """Test the db-agnostic quoting services of IdentifierPreparer.""" |