From 03b9803e4e1ab7349e183fb68fc7245d673870a4 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 20 Sep 2014 14:54:37 -0400 Subject: [PATCH] - get tests passing for 0.8, 0.7 --- alembic/autogenerate/render.py | 2 +- alembic/testing/requirements.py | 7 +++++++ tests/test_autogen_render.py | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/alembic/autogenerate/render.py b/alembic/autogenerate/render.py index 9fe560a5..7d9817a4 100644 --- a/alembic/autogenerate/render.py +++ b/alembic/autogenerate/render.py @@ -92,7 +92,7 @@ def _drop_table(table, autogen_context): def _get_index_rendered_expressions(idx, autogen_context): if compat.sqla_08: return [repr(getattr(exp, "name", None)) - if isinstance(exp, sql.schema.Column) + if isinstance(exp, sa_schema.Column) else _render_potential_expr(exp, autogen_context) for exp in idx.expressions] else: diff --git a/alembic/testing/requirements.py b/alembic/testing/requirements.py index fbf54d77..a52a9b2e 100644 --- a/alembic/testing/requirements.py +++ b/alembic/testing/requirements.py @@ -52,6 +52,13 @@ class SuiteRequirements(Requirements): "SQLAlchemy 0.8.4 or greater required" ) + @property + def fail_before_sqla_09(self): + return exclusions.fails_if( + lambda config: not util.sqla_09, + "SQLAlchemy 0.9.0 or greater required" + ) + @property def sqlalchemy_08(self): diff --git a/tests/test_autogen_render.py b/tests/test_autogen_render.py index c53e9e20..fbb661f5 100644 --- a/tests/test_autogen_render.py +++ b/tests/test_autogen_render.py @@ -104,6 +104,7 @@ unique=False, """ """postgresql_where=sa.text('t.y = %(y_1)s'))""" ) + @config.requirements.fail_before_sqla_080 def test_render_add_index_func(self): m = MetaData() t = Table( @@ -118,6 +119,7 @@ unique=False, """ "[sa.text('lower(test.code)')], unique=False)" ) + @config.requirements.fail_before_sqla_080 def test_render_add_index_cast(self): m = MetaData() t = Table( @@ -132,6 +134,7 @@ unique=False, """ "[sa.text('CAST(test.code AS CHAR)')], unique=False)" ) + @config.requirements.fail_before_sqla_080 def test_render_add_index_desc(self): m = MetaData() t = Table( @@ -853,6 +856,7 @@ render:primary_key\n)""" 'nullable=False)' ) + @config.requirements.fail_before_sqla_09 def test_render_server_default_non_native_boolean(self): c = Column( 'updated_at', Boolean(), -- 2.47.3