diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-02-28 14:03:47 -0500 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-02-28 14:52:28 -0500 |
commit | b4e880534e1e02815e95f105a4363bef8ee86130 (patch) | |
tree | 751f036c9e757887c7b092f36839dc5963ece1e3 /lib/sqlalchemy/sql/schema.py | |
parent | ff2090336f7c160e58774e7504bd4f7aca919dff (diff) | |
download | sqlalchemy-b4e880534e1e02815e95f105a4363bef8ee86130.tar.gz |
Only use schema_translate_map on SchemaItem subclasses
Fixed bug in new "schema translate" feature where the translated schema
name would be invoked in terms of an alias name when rendered along
with a column expression; occurred only when the source translate
name was "None". The "schema translate" feature now only takes
effect for :class:`.SchemaItem` and :class:`.SchemaType` subclasses,
that is, objects that correspond to a DDL-creatable structure in
a database.
Change-Id: Ie8cb35aeaba2c67efec8c8c57c219e4dd346e44a
Fixes: #3924
Diffstat (limited to 'lib/sqlalchemy/sql/schema.py')
-rw-r--r-- | lib/sqlalchemy/sql/schema.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index 9bb0eee43..08f23c4af 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -114,6 +114,9 @@ class SchemaItem(SchemaEventTarget, visitors.Visitable): schema_item.dispatch._update(self.dispatch) return schema_item + def _translate_schema(self, effective_schema, map_): + return map_.get(effective_schema, effective_schema) + class Table(DialectKWArgs, SchemaItem, TableClause): r"""Represent a table in a database. @@ -3974,7 +3977,8 @@ class _SchemaTranslateMap(object): if map_ is not None: def schema_for_object(obj): effective_schema = self._default_schema_getter(obj) - effective_schema = map_.get(effective_schema, effective_schema) + effective_schema = obj._translate_schema( + effective_schema, map_) return effective_schema self.__call__ = schema_for_object self.hash_key = ";".join( |