From 8e5eb8f634eb67abe77c38154f48c37160ea0d62 Mon Sep 17 00:00:00 2001 From: chrisw Date: Fri, 10 Sep 2010 15:21:05 +0100 Subject: [PATCH] restore missing table header for column diffs --- migrate/tests/versioning/test_schemadiff.py | 8 ++++++-- migrate/versioning/schemadiff.py | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/migrate/tests/versioning/test_schemadiff.py b/migrate/tests/versioning/test_schemadiff.py index b01a1e0..0cf60d3 100644 --- a/migrate/tests/versioning/test_schemadiff.py +++ b/migrate/tests/versioning/test_schemadiff.py @@ -58,7 +58,9 @@ class Test_getDiffOfModelAgainstDatabase(fixture.DB): # run diff diff = self._run_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)) @fixture.usedb() @@ -75,7 +77,9 @@ class Test_getDiffOfModelAgainstDatabase(fixture.DB): # run diff diff = self._run_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)) @fixture.usedb() diff --git a/migrate/versioning/schemadiff.py b/migrate/versioning/schemadiff.py index c8c1421..fa08e7b 100644 --- a/migrate/versioning/schemadiff.py +++ b/migrate/versioning/schemadiff.py @@ -166,14 +166,17 @@ class SchemaDiff(object): ) for name,td in sorted(self.tables_different.items()): + out.append( + ' table with differences: %s' % name + ) for names,label in ( (td.columns_missing_from_A,self.labelA), (td.columns_missing_from_B,self.labelB), ): if names: out.append( - ' %s missing columns from %s: %s' % ( - name, label,', '.join(sorted(names)) + ' %s missing these columns: %s' % ( + label,', '.join(sorted(names)) ) )