diff options
-rw-r--r-- | alembic/autogenerate/render.py | 7 | ||||
-rw-r--r-- | tests/test_autogen_render.py | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/alembic/autogenerate/render.py b/alembic/autogenerate/render.py index ed9536c..7f58f96 100644 --- a/alembic/autogenerate/render.py +++ b/alembic/autogenerate/render.py @@ -383,12 +383,13 @@ def _fk_colspec(fk, metadata_schema): # need to render schema breaking up tokens by hand, since the # ForeignKeyConstraint here may not actually have a remote # Table present - tokens = fk._colspec.split(".") + colspec = fk._get_colspec() + tokens = colspec.split(".") # no schema in the colspec, render it if len(tokens) == 2: - return "%s.%s" % (metadata_schema, fk._colspec) + return "%s.%s" % (metadata_schema, colspec) else: - return fk._colspec + return colspec def _render_foreign_key(constraint, autogen_context): rendered = _user_defined_render("foreign_key", constraint, autogen_context) diff --git a/tests/test_autogen_render.py b/tests/test_autogen_render.py index a4f14bd..ba8ba2d 100644 --- a/tests/test_autogen_render.py +++ b/tests/test_autogen_render.py @@ -567,6 +567,20 @@ render:primary_key\n)""" "name='fk1', use_alter=True)" ) + def test_render_fk_constraint_w_metadata_schema(self): + m = MetaData(schema="foo") + t1 = Table('t', m, Column('c', Integer)) + t2 = Table('t2', m, Column('c_rem', Integer)) + + fk = ForeignKeyConstraint([t1.c.c], [t2.c.c_rem], onupdate="CASCADE") + if not util.sqla_08: + t1.append_constraint(fk) + + eq_ignore_whitespace( + re.sub(r"u'", "'", autogenerate.render._render_constraint(fk, self.autogen_context)), + "sa.ForeignKeyConstraint(['c'], ['foo.t2.c_rem'], onupdate='CASCADE')" + ) + def test_render_check_constraint_literal(self): eq_ignore_whitespace( autogenerate.render._render_check_constraint( |