aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2012-04-02 15:09:53 +0200
committerJoar Wandborg <git@wandborg.com>2012-04-02 15:09:53 +0200
commit0e434913747b3f26d3bc0a6660b53505d4a218c8 (patch)
treeeb46ef83501f950391c07954e2265b35379ee085
parentc8bee965ad2b7ffe4711fafda7b16b8618944d54 (diff)
parent797f4437eb08c463c3d9f49e526d1750ea6a1c8b (diff)
downloadmediagoblin-0e434913747b3f26d3bc0a6660b53505d4a218c8.tar.lz
mediagoblin-0e434913747b3f26d3bc0a6660b53505d4a218c8.tar.xz
mediagoblin-0e434913747b3f26d3bc0a6660b53505d4a218c8.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
-rw-r--r--mediagoblin/db/sql/convert.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index 2a8734f9..ac64cf8d 100644
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -220,14 +220,21 @@ def cleanup_sql_tables(sql_db):
count = session.query(MediaEntry.media_type). \
filter_by(media_type=unicode(mt)).count()
print " %s: %d entries" % (mt, count)
+
if count == 0:
+ print "\tAnalyzing tables"
+ for tab in table_list:
+ cnt2 = session.query(tab).count()
+ print "\t %s: %d entries" % (tab.__tablename__, cnt2)
+ assert cnt2 == 0
+
print "\tRemoving migration info"
mi = session.query(MigrationData).filter_by(name=unicode(mt)).one()
session.delete(mi)
session.commit()
session.close()
- print "\tDropping tables %r" % (table_list,)
+ print "\tDropping tables"
tables = [model.__table__ for model in table_list]
Base_v0.metadata.drop_all(sql_db.engine, tables=tables)