x/sqlalchemy-migrate
Code Issues Proposed changes

restore missing table header for column diffs

Browse Source
This commit is contained in:
chrisw 2010-09-10 15:21:05 +01:00
parent 91e887b081
commit 8e5eb8f634
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migrate/tests/versioning/test_schemadiff.py
View File

@ -58,7 +58,9 @@ class Test_getDiffOfModelAgainstDatabase(fixture.DB):
# run diff # run diff
diff = self._run_diff() diff = self._run_diff()
self.assertTrue(diff) self.assertTrue(diff)
eq_('Schema diffs:\n xtable missing columns from database: xcol', eq_('Schema diffs:\n'
' table with differences: xtable\n'
' database missing these columns: xcol',
str(diff)) str(diff))
@fixture.usedb() @fixture.usedb()
@ -75,7 +77,9 @@ class Test_getDiffOfModelAgainstDatabase(fixture.DB):
# run diff # run diff
diff = self._run_diff() diff = self._run_diff()
self.assertTrue(diff) self.assertTrue(diff)
eq_('Schema diffs:\n xtable missing columns from model: xcol', eq_('Schema diffs:\n'
' table with differences: xtable\n'
' model missing these columns: xcol',
str(diff)) str(diff))
@fixture.usedb() @fixture.usedb()

7
migrate/versioning/schemadiff.py
View File

@ -166,14 +166,17 @@ class SchemaDiff(object):
) )
for name,td in sorted(self.tables_different.items()): for name,td in sorted(self.tables_different.items()):
out.append(
' table with differences: %s' % name
)
for names,label in ( for names,label in (
(td.columns_missing_from_A,self.labelA), (td.columns_missing_from_A,self.labelA),
(td.columns_missing_from_B,self.labelB), (td.columns_missing_from_B,self.labelB),
): ):
if names: if names:
out.append( out.append(
' %s missing columns from %s: %s' % ( ' %s missing these columns: %s' % (
name, label,', '.join(sorted(names)) label,', '.join(sorted(names))
) )
) )