openstack/deb-alembic
Code Issues Proposed changes

- do an autopep8 pass for just about everything other

Browse Source 
than line length
This commit is contained in:
Mike Bayer
2014-09-09 12:24:43 -04:00
parent effe3d8923
commit 10d3556a55
44 changed files with 1661 additions and 1357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

243
tests/test_autogenerate.py
View File

@@ -14,11 +14,13 @@ from sqlalchemy.engine.reflection import Inspector
from alembic import autogenerate
from alembic.migration import MigrationContext
from . import staging_env, sqlite_db, clear_staging_env, eq_, \
db_for_dialect
db_for_dialect
py3k = sys.version_info >= (3, )
names_in_this_test = set()
def _default_include_object(obj, name, type_, reflected, compare_to):
if type_ == "table":
return name in names_in_this_test
@@ -29,11 +31,15 @@ _default_object_filters = [
_default_include_object
]
from sqlalchemy import event
@event.listens_for(Table, "after_parent_attach")
def new_table(table, parent):
names_in_this_test.add(table.name)
class AutogenTest(object):
@classmethod
def _get_bind(cls):
return sqlite_db()
@@ -66,14 +72,16 @@ class AutogenTest(object):
'connection': connection,
'dialect': connection.dialect,
'context': context
}
}
@classmethod
def teardown_class(cls):
cls.m1.drop_all(cls.bind)
clear_staging_env()
class AutogenFixtureTest(object):
def _fixture(self, m1, m2, include_schemas=False):
self.metadata, model_metadata = m1, m2
self.metadata.create_all(self.bind)
@@ -98,13 +106,13 @@ class AutogenFixtureTest(object):
'connection': connection,
'dialect': connection.dialect,
'context': context
}
}
diffs = []
autogenerate._produce_net_changes(connection, model_metadata, diffs,
autogen_context,
object_filters=_default_object_filters,
include_schemas=include_schemas
)
)
return diffs
reports_unnamed_constraints = False
@@ -124,6 +132,7 @@ class AutogenFixtureTest(object):
class AutogenCrossSchemaTest(AutogenTest, TestCase):
@classmethod
def _get_bind(cls):
cls.test_schema_name = "test_schema"
@@ -133,19 +142,19 @@ class AutogenCrossSchemaTest(AutogenTest, TestCase):
def _get_db_schema(cls):
m = MetaData()
Table('t1', m,
Column('x', Integer)
)
Column('x', Integer)
)
Table('t2', m,
Column('y', Integer),
schema=cls.test_schema_name
)
Column('y', Integer),
schema=cls.test_schema_name
)
Table('t6', m,
Column('u', Integer)
)
Column('u', Integer)
)
Table('t7', m,
Column('v', Integer),
schema=cls.test_schema_name
)
Column('v', Integer),
schema=cls.test_schema_name
)
return m
@@ -153,25 +162,26 @@ class AutogenCrossSchemaTest(AutogenTest, TestCase):
def _get_model_schema(cls):
m = MetaData()
Table('t3', m,
Column('q', Integer)
)
Column('q', Integer)
)
Table('t4', m,
Column('z', Integer),
schema=cls.test_schema_name
)
Column('z', Integer),
schema=cls.test_schema_name
)
Table('t6', m,
Column('u', Integer)
)
Column('u', Integer)
)
Table('t7', m,
Column('v', Integer),
schema=cls.test_schema_name
)
Column('v', Integer),
schema=cls.test_schema_name
)
return m
def test_default_schema_omitted_upgrade(self):
metadata = self.m2
connection = self.context.bind
diffs = []
def include_object(obj, name, type_, reflected, compare_to):
if type_ == "table":
return name == "t3"
@@ -189,6 +199,7 @@ class AutogenCrossSchemaTest(AutogenTest, TestCase):
metadata = self.m2
connection = self.context.bind
diffs = []
def include_object(obj, name, type_, reflected, compare_to):
if type_ == "table":
return name == "t4"
@@ -206,6 +217,7 @@ class AutogenCrossSchemaTest(AutogenTest, TestCase):
metadata = self.m2
connection = self.context.bind
diffs = []
def include_object(obj, name, type_, reflected, compare_to):
if type_ == "table":
return name == "t1"
@@ -223,6 +235,7 @@ class AutogenCrossSchemaTest(AutogenTest, TestCase):
metadata = self.m2
connection = self.context.bind
diffs = []
def include_object(obj, name, type_, reflected, compare_to):
if type_ == "table":
return name == "t2"
@@ -238,6 +251,7 @@ class AutogenCrossSchemaTest(AutogenTest, TestCase):
class AutogenDefaultSchemaTest(AutogenFixtureTest, TestCase):
@classmethod
def _get_bind(cls):
cls.test_schema_name = "test_schema"
@@ -285,7 +299,6 @@ class AutogenDefaultSchemaTest(AutogenFixtureTest, TestCase):
Table('a', m2, Column('x', String(50)), schema=default_schema)
Table('a', m2, Column('y', String(50)), schema="test_schema")
diffs = self._fixture(m1, m2, include_schemas=True)
eq_(len(diffs), 1)
eq_(diffs[0][0], "add_table")
@@ -303,28 +316,28 @@ class ModelOne(object):
m = MetaData(schema=schema)
Table('user', m,
Column('id', Integer, primary_key=True),
Column('name', String(50)),
Column('a1', Text),
Column("pw", String(50))
)
Column('id', Integer, primary_key=True),
Column('name', String(50)),
Column('a1', Text),
Column("pw", String(50))
)
Table('address', m,
Column('id', Integer, primary_key=True),
Column('email_address', String(100), nullable=False),
)
Column('id', Integer, primary_key=True),
Column('email_address', String(100), nullable=False),
)
Table('order', m,
Column('order_id', Integer, primary_key=True),
Column("amount", Numeric(8, 2), nullable=False,
server_default="0"),
CheckConstraint('amount >= 0', name='ck_order_amount')
)
Column('order_id', Integer, primary_key=True),
Column("amount", Numeric(8, 2), nullable=False,
server_default="0"),
CheckConstraint('amount >= 0', name='ck_order_amount')
)
Table('extra', m,
Column("x", CHAR),
Column('uid', Integer, ForeignKey('user.id'))
)
Column("x", CHAR),
Column('uid', Integer, ForeignKey('user.id'))
)
return m
@@ -335,35 +348,34 @@ class ModelOne(object):
m = MetaData(schema=schema)
Table('user', m,
Column('id', Integer, primary_key=True),
Column('name', String(50), nullable=False),
Column('a1', Text, server_default="x")
)
Column('id', Integer, primary_key=True),
Column('name', String(50), nullable=False),
Column('a1', Text, server_default="x")
)
Table('address', m,
Column('id', Integer, primary_key=True),
Column('email_address', String(100), nullable=False),
Column('street', String(50)),
)
Column('id', Integer, primary_key=True),
Column('email_address', String(100), nullable=False),
Column('street', String(50)),
)
Table('order', m,
Column('order_id', Integer, primary_key=True),
Column('amount', Numeric(10, 2), nullable=True,
server_default="0"),
Column('user_id', Integer, ForeignKey('user.id')),
CheckConstraint('amount > -1', name='ck_order_amount'),
)
Column('order_id', Integer, primary_key=True),
Column('amount', Numeric(10, 2), nullable=True,
server_default="0"),
Column('user_id', Integer, ForeignKey('user.id')),
CheckConstraint('amount > -1', name='ck_order_amount'),
)
Table('item', m,
Column('id', Integer, primary_key=True),
Column('description', String(100)),
Column('order_id', Integer, ForeignKey('order.order_id')),
CheckConstraint('len(description) > 5')
)
Column('id', Integer, primary_key=True),
Column('description', String(100)),
Column('order_id', Integer, ForeignKey('order.order_id')),
CheckConstraint('len(description) > 5')
)
return m
class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
def test_diffs(self):
@@ -375,7 +387,7 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
autogenerate._produce_net_changes(connection, metadata, diffs,
self.autogen_context,
object_filters=_default_object_filters,
)
)
eq_(
diffs[0],
@@ -415,7 +427,6 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
eq_(diffs[7][0][5], True)
eq_(diffs[7][0][6], False)
def test_render_nothing(self):
context = MigrationContext.configure(
connection=self.bind.connect(),
@@ -431,11 +442,11 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
autogenerate._produce_migration_diffs(context, template_args, set())
eq_(re.sub(r"u'", "'", template_args['upgrades']),
"""### commands auto generated by Alembic - please adjust! ###
"""### commands auto generated by Alembic - please adjust! ###
pass
### end Alembic commands ###""")
eq_(re.sub(r"u'", "'", template_args['downgrades']),
"""### commands auto generated by Alembic - please adjust! ###
"""### commands auto generated by Alembic - please adjust! ###
pass
### end Alembic commands ###""")
@@ -446,7 +457,7 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
autogenerate._produce_migration_diffs(self.context, template_args, set())
eq_(re.sub(r"u'", "'", template_args['upgrades']),
"""### commands auto generated by Alembic - please adjust! ###
"""### commands auto generated by Alembic - please adjust! ###
op.create_table('item',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('description', sa.String(length=100), nullable=True),
@@ -474,7 +485,7 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
### end Alembic commands ###""")
eq_(re.sub(r"u'", "'", template_args['downgrades']),
"""### commands auto generated by Alembic - please adjust! ###
"""### commands auto generated by Alembic - please adjust! ###
op.alter_column('user', 'name',
existing_type=sa.VARCHAR(length=50),
nullable=True)
@@ -506,7 +517,7 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
'compare_server_default': True,
'target_metadata': self.m2,
'include_symbol': lambda name, schema=None:
name in ('address', 'order'),
name in ('address', 'order'),
'upgrade_token': "upgrades",
'downgrade_token': "downgrades",
'alembic_module_prefix': 'op.',
@@ -517,7 +528,7 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
autogenerate._produce_migration_diffs(context, template_args, set())
template_args['upgrades'] = template_args['upgrades'].replace("u'", "'")
template_args['downgrades'] = template_args['downgrades'].\
replace("u'", "'")
replace("u'", "'")
assert "alter_column('user'" not in template_args['upgrades']
assert "alter_column('user'" not in template_args['downgrades']
assert "alter_column('order'" in template_args['upgrades']
@@ -559,7 +570,7 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
template_args['upgrades'] = template_args['upgrades'].replace("u'", "'")
template_args['downgrades'] = template_args['downgrades'].\
replace("u'", "'")
replace("u'", "'")
assert "op.create_table('item'" not in template_args['upgrades']
assert "op.create_table('item'" not in template_args['downgrades']
@@ -573,19 +584,19 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
def test_skip_null_type_comparison_reflected(self):
diff = []
autogenerate.compare._compare_type(None, "sometable", "somecol",
Column("somecol", NULLTYPE),
Column("somecol", Integer()),
diff, self.autogen_context
)
Column("somecol", NULLTYPE),
Column("somecol", Integer()),
diff, self.autogen_context
)
assert not diff
def test_skip_null_type_comparison_local(self):
diff = []
autogenerate.compare._compare_type(None, "sometable", "somecol",
Column("somecol", Integer()),
Column("somecol", NULLTYPE),
diff, self.autogen_context
)
Column("somecol", Integer()),
Column("somecol", NULLTYPE),
diff, self.autogen_context
)
assert not diff
def test_affinity_typedec(self):
@@ -600,10 +611,10 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
diff = []
autogenerate.compare._compare_type(None, "sometable", "somecol",
Column("somecol", Integer, nullable=True),
Column("somecol", MyType()),
diff, self.autogen_context
)
Column("somecol", Integer, nullable=True),
Column("somecol", MyType()),
diff, self.autogen_context
)
assert not diff
def test_dont_barf_on_already_reflected(self):
@@ -613,17 +624,17 @@ class AutogenerateDiffTest(ModelOne, AutogenTest, TestCase):
autogenerate.compare._compare_tables(
OrderedSet([(None, 'extra'), (None, 'user')]),
OrderedSet(), [], inspector,
MetaData(), diffs, self.autogen_context
MetaData(), diffs, self.autogen_context
)
eq_(
[(rec[0], rec[1].name) for rec in diffs],
[('remove_table', 'extra'), ('remove_table', 'user')]
)
class AutogenerateDiffTestWSchema(ModelOne, AutogenTest, TestCase):
schema = "test_schema"
@classmethod
def _get_bind(cls):
return db_for_dialect('postgresql')
@@ -693,14 +704,14 @@ class AutogenerateDiffTestWSchema(ModelOne, AutogenTest, TestCase):
)
template_args = {}
autogenerate._produce_migration_diffs(context, template_args, set(),
include_symbol=lambda name, schema: False
)
include_symbol=lambda name, schema: False
)
eq_(re.sub(r"u'", "'", template_args['upgrades']),
"""### commands auto generated by Alembic - please adjust! ###
"""### commands auto generated by Alembic - please adjust! ###
pass
### end Alembic commands ###""")
eq_(re.sub(r"u'", "'", template_args['downgrades']),
"""### commands auto generated by Alembic - please adjust! ###
"""### commands auto generated by Alembic - please adjust! ###
pass
### end Alembic commands ###""")
@@ -709,13 +720,13 @@ class AutogenerateDiffTestWSchema(ModelOne, AutogenTest, TestCase):
template_args = {}
autogenerate._produce_migration_diffs(
self.context, template_args, set(),
include_object=_default_include_object,
include_schemas=True
)
self.context, template_args, set(),
include_object=_default_include_object,
include_schemas=True
)
eq_(re.sub(r"u'", "'", template_args['upgrades']),
"""### commands auto generated by Alembic - please adjust! ###
"""### commands auto generated by Alembic - please adjust! ###
op.create_table('item',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('description', sa.String(length=100), nullable=True),
@@ -747,7 +758,7 @@ class AutogenerateDiffTestWSchema(ModelOne, AutogenTest, TestCase):
### end Alembic commands ###""" % {"schema": self.schema})
eq_(re.sub(r"u'", "'", template_args['downgrades']),
"""### commands auto generated by Alembic - please adjust! ###
"""### commands auto generated by Alembic - please adjust! ###
op.alter_column('user', 'name',
existing_type=sa.VARCHAR(length=50),
nullable=True,
@@ -776,10 +787,8 @@ class AutogenerateDiffTestWSchema(ModelOne, AutogenTest, TestCase):
### end Alembic commands ###""" % {"schema": self.schema})
class AutogenerateCustomCompareTypeTest(AutogenTest, TestCase):
@classmethod
def _get_db_schema(cls):
m = MetaData()
@@ -804,7 +813,7 @@ class AutogenerateCustomCompareTypeTest(AutogenTest, TestCase):
diffs = []
autogenerate._produce_net_changes(self.context.bind, self.m2,
diffs, self.autogen_context)
diffs, self.autogen_context)
first_table = self.m2.tables['sometable']
first_column = first_table.columns['id']
@@ -827,7 +836,7 @@ class AutogenerateCustomCompareTypeTest(AutogenTest, TestCase):
diffs = []
autogenerate._produce_net_changes(self.context.bind, self.m2,
diffs, self.autogen_context)
diffs, self.autogen_context)
eq_(diffs, [])
@@ -838,21 +847,22 @@ class AutogenerateCustomCompareTypeTest(AutogenTest, TestCase):
diffs = []
autogenerate._produce_net_changes(self.context.bind, self.m2,
diffs, self.autogen_context)
diffs, self.autogen_context)
eq_(diffs[0][0][0], 'modify_type')
eq_(diffs[1][0][0], 'modify_type')
class AutogenKeyTest(AutogenTest, TestCase):
@classmethod
def _get_db_schema(cls):
m = MetaData()
Table('someothertable', m,
Column('id', Integer, primary_key=True),
Column('value', Integer, key="somekey"),
)
Column('id', Integer, primary_key=True),
Column('value', Integer, key="somekey"),
)
return m
@classmethod
@@ -860,17 +870,18 @@ class AutogenKeyTest(AutogenTest, TestCase):
m = MetaData()
Table('sometable', m,
Column('id', Integer, primary_key=True),
Column('value', Integer, key="someotherkey"),
)
Column('id', Integer, primary_key=True),
Column('value', Integer, key="someotherkey"),
)
Table('someothertable', m,
Column('id', Integer, primary_key=True),
Column('value', Integer, key="somekey"),
Column("othervalue", Integer, key="otherkey")
)
Column('id', Integer, primary_key=True),
Column('value', Integer, key="somekey"),
Column("othervalue", Integer, key="otherkey")
)
return m
symbols = ['someothertable', 'sometable']
def test_autogen(self):
metadata = self.m2
connection = self.context.bind
@@ -886,7 +897,9 @@ class AutogenKeyTest(AutogenTest, TestCase):
eq_(diffs[1][0], "add_column")
eq_(diffs[1][3].key, "otherkey")
class AutogenerateDiffOrderTest(AutogenTest, TestCase):
@classmethod
def _get_db_schema(cls):
return MetaData()
@@ -895,12 +908,12 @@ class AutogenerateDiffOrderTest(AutogenTest, TestCase):
def _get_model_schema(cls):
m = MetaData()
Table('parent', m,
Column('id', Integer, primary_key=True)
)
Column('id', Integer, primary_key=True)
)
Table('child', m,
Column('parent_id', Integer, ForeignKey('parent.id')),
)
Column('parent_id', Integer, ForeignKey('parent.id')),
)
return m
@@ -925,6 +938,7 @@ class AutogenerateDiffOrderTest(AutogenTest, TestCase):
class CompareMetadataTest(ModelOne, AutogenTest, TestCase):
def test_compare_metadata(self):
metadata = self.m2
@@ -1035,6 +1049,7 @@ class CompareMetadataTest(ModelOne, AutogenTest, TestCase):
eq_(diffs[2][1][5], False)
eq_(diffs[2][1][6], True)
class PGCompareMetaData(ModelOne, AutogenTest, TestCase):
schema = "test_schema"