diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-09-02 11:48:15 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-09-02 11:48:15 -0400 |
commit | 9a6947427af58eeb6ebf09ec6de2a1b7ec12d828 (patch) | |
tree | 963379c329e48e7dfb82ef49a3a24bc514ffb254 | |
parent | f6022839c29f7f96cb9d279aaf2e44e81cafb661 (diff) | |
download | sqlalchemy-9a6947427af58eeb6ebf09ec6de2a1b7ec12d828.tar.gz |
Allow stringify compiler to render unnamed column
Stringify of expression with unnamed :class:`.Column` objects, as
occurs in lots of situations including ORM error reporting,
will now render the name in string context as "<name unknown>"
rather than raising a compile error.
Change-Id: I76f637c5eb4cfdb1b526964cb001565b97e296da
Fixes: #3789
-rw-r--r-- | doc/build/changelog/changelog_11.rst | 9 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 11 | ||||
-rw-r--r-- | test/sql/test_compiler.py | 13 |
3 files changed, 28 insertions, 5 deletions
diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst index 88f1ebb24..c038966c5 100644 --- a/doc/build/changelog/changelog_11.rst +++ b/doc/build/changelog/changelog_11.rst @@ -23,6 +23,15 @@ .. change:: :tags: bug, sql + :tickets: 3789 + + Stringify of expression with unnamed :class:`.Column` objects, as + occurs in lots of situations including ORM error reporting, + will now render the name in string context as "<name unknown>" + rather than raising a compile error. + + .. change:: + :tags: bug, sql :tickets: 3786 Raise a more descriptive exception / message when ClauseElement diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 85d5ff6da..a7954f10a 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -660,12 +660,15 @@ class SQLCompiler(Compiled): return label.element._compiler_dispatch( self, within_columns_clause=False, **kw) + def _fallback_column_name(self, column): + raise exc.CompileError("Cannot compile Column object until " + "its 'name' is assigned.") + def visit_column(self, column, add_to_result_map=None, include_table=True, **kwargs): name = orig_name = column.name if name is None: - raise exc.CompileError("Cannot compile Column object until " - "its 'name' is assigned.") + name = self._fallback_column_name(column) is_literal = column.is_literal if not is_literal and isinstance(name, elements._truncated_label): @@ -2203,6 +2206,9 @@ class StrSQLCompiler(SQLCompiler): """ + def _fallback_column_name(self, column): + return "<name unknown>" + def visit_getitem_binary(self, binary, operator, **kw): return "%s[%s]" % ( self.process(binary.left, **kw), @@ -2210,7 +2216,6 @@ class StrSQLCompiler(SQLCompiler): ) def returning_clause(self, stmt, returning_cols): - columns = [ self._label_select_column(None, c, True, False, {}) for c in elements._select_iterables(returning_cols) diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py index a0db9864e..6896c9857 100644 --- a/test/sql/test_compiler.py +++ b/test/sql/test_compiler.py @@ -2432,14 +2432,16 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL): assert_raises_message( exc.CompileError, "Cannot compile Column object until its 'name' is assigned.", - str, sel2 + sel2.compile, + dialect=default.DefaultDialect() ) sel3 = select([my_str]).as_scalar() assert_raises_message( exc.CompileError, "Cannot compile Column object until its 'name' is assigned.", - str, sel3 + sel3.compile, + dialect=default.DefaultDialect() ) my_str.name = 'foo' @@ -2709,6 +2711,13 @@ class StringifySpecialTest(fixtures.TestBase): "FROM mytable WHERE mytable.myid = :myid_1" ) + def test_unnamed_column(self): + stmt = Column(Integer) == 5 + eq_ignore_whitespace( + str(stmt), + '"<name unknown>" = :param_1' + ) + def test_cte(self): # stringify of these was supported anyway by defaultdialect. stmt = select([table1.c.myid]).cte() |