From 1c2b1bc91d802f84e1947dc1748c6eed2932a3d6 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Fri, 12 Oct 2012 09:59:14 -0500 Subject: migration: fetch metadata in the main query --- tools/upgrade/1.3/migrate_dbstats.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/upgrade/1.3/migrate_dbstats.py b/tools/upgrade/1.3/migrate_dbstats.py index 3ebe764c5..3944eb1d3 100755 --- a/tools/upgrade/1.3/migrate_dbstats.py +++ b/tools/upgrade/1.3/migrate_dbstats.py @@ -54,11 +54,11 @@ def _migrate_transaction(inter, entries): modified_count=inter.modified_entries, extra_count=inter.extra_entries) - try: + if inter.metadata: newint.profile_id = inter.metadata.profile.id groups = [grp.pk for grp in inter.metadata.groups.all()] bundles = [bun.pk for bun in inter.metadata.bundles.all()] - except legacy_models.InteractionMetadata.DoesNotExist: + else: groups = [] bundles = [] unkown_profile = cache.get("PROFILE_UNKNOWN") @@ -224,7 +224,7 @@ def _restructure(): int_count = legacy_models.Interaction.objects.count() int_ctr = 0 for inter in BatchFetch(legacy_models.Interaction.objects.\ - select_related().all()): + select_related('metadata', 'client').all()): if int_ctr % 1000 == 0: logger.info("Migrated %s of %s interactions" % (int_ctr, int_count)) try: -- cgit v1.2.3-1-g7c22