From 9abd664bf2b1de34fc6de0f3b323727e47470e52 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 24 Nov 2012 22:57:46 +0100 Subject: Stop unicode conversion warning during dbupdate. Just force the passed in name to MigrationManager() to unicode. --- mediagoblin/db/sql/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/db/sql/util.py') diff --git a/mediagoblin/db/sql/util.py b/mediagoblin/db/sql/util.py index 74b5d73e..bd92393c 100644 --- a/mediagoblin/db/sql/util.py +++ b/mediagoblin/db/sql/util.py @@ -39,7 +39,7 @@ class MigrationManager(object): - migration_registry: where we should find all migrations to run """ - self.name = name + self.name = unicode(name) self.models = models self.session = session self.migration_registry = migration_registry -- cgit v1.2.3 From 9437ea4742eecb6854810fe020fe721b413da276 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 28 Nov 2012 14:36:58 +0100 Subject: Add commit argument to clean_orphan_tags So we can prevent the session from being committed if we don't want it. --- mediagoblin/db/sql/util.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mediagoblin/db/sql/util.py') diff --git a/mediagoblin/db/sql/util.py b/mediagoblin/db/sql/util.py index bd92393c..c6d8562e 100644 --- a/mediagoblin/db/sql/util.py +++ b/mediagoblin/db/sql/util.py @@ -297,17 +297,17 @@ def media_entries_for_tag_slug(dummy_db, tag_slug): & (Tag.slug == tag_slug)) -def clean_orphan_tags(): +def clean_orphan_tags(commit=True): + """Search for unused MediaTags and delete them""" q1 = Session.query(Tag).outerjoin(MediaTag).filter(MediaTag.id==None) for t in q1: Session.delete(t) - # The "let the db do all the work" version: # q1 = Session.query(Tag.id).outerjoin(MediaTag).filter(MediaTag.id==None) # q2 = Session.query(Tag).filter(Tag.id.in_(q1)) # q2.delete(synchronize_session = False) - - Session.commit() + if commit: + Session.commit() def check_collection_slug_used(dummy_db, creator_id, slug, ignore_c_id): -- cgit v1.2.3 From a4eef7fe91918cb35c73f6df319308176e8e3129 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 9 Dec 2012 12:12:07 -0600 Subject: Elrond's suggestion: have set_current_migration execute after each migration run. --- mediagoblin/db/sql/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/db/sql/util.py') diff --git a/mediagoblin/db/sql/util.py b/mediagoblin/db/sql/util.py index c6d8562e..92866149 100644 --- a/mediagoblin/db/sql/util.py +++ b/mediagoblin/db/sql/util.py @@ -217,9 +217,9 @@ class MigrationManager(object): u' + Running migration %s, "%s"... ' % ( migration_number, migration_func.func_name)) migration_func(self.session) + self.set_current_migration() self.printer('done.\n') - self.set_current_migration() return u'migrated' # Otherwise return None. Well it would do this anyway, but -- cgit v1.2.3 From 41fc4698c5e6f41438c270bf088495bd2e7db3e2 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 9 Dec 2012 12:20:06 -0600 Subject: Eeek! Set the migration number to the current migration number being run! --- mediagoblin/db/sql/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/db/sql/util.py') diff --git a/mediagoblin/db/sql/util.py b/mediagoblin/db/sql/util.py index 92866149..f6a3dc17 100644 --- a/mediagoblin/db/sql/util.py +++ b/mediagoblin/db/sql/util.py @@ -217,7 +217,7 @@ class MigrationManager(object): u' + Running migration %s, "%s"... ' % ( migration_number, migration_func.func_name)) migration_func(self.session) - self.set_current_migration() + self.set_current_migration(migration_number) self.printer('done.\n') return u'migrated' -- cgit v1.2.3