watch out for stupid outer joins (bug 676440)

apps/addons/utils.py

@@ -117,9 +117,11 @@ def get_objects(cls):
         fields = ['addon', 'type', 'locale', 'application']
         if settings.NEW_FEATURES:
             from bandwagon.models import FeaturedCollection
-            vals = FeaturedCollection.objects.values_list(
-                'collection__addons', 'collection__addons__type',
-                'locale', 'application')
+            vals = (FeaturedCollection.objects
+                    .filter(collection__addons__isnull=False)
+                    .values_list('collection__addons',
+                                 'collection__addons__type', 'locale',
+                                 'application'))
         else:
             from addons.models import Addon
             vals = (Addon.objects.valid().filter(feature__isnull=False)
@@ -151,7 +153,8 @@ def build(cls):
                 name = prefixer(key)
                 pipe.delete(name)
                 for row in rows:
-                    pipe.sadd(name, row['addon'])
+                    if row['addon']:
+                        pipe.sadd(name, row['addon'])
         pipe.execute()
 
     @classmethod
@@ -194,9 +197,11 @@ def get_objects(cls):
         fields = ['category', 'addon', 'feature_locales', 'app']
         if settings.NEW_FEATURES:
             from bandwagon.models import FeaturedCollection
-            vals = FeaturedCollection.objects.values_list(
-                'collection__addons__category', 'collection__addons', 'locale',
-                'application')
+            vals = (FeaturedCollection.objects
+                    .filter(collection__addons__isnull=False)
+                    .values_list('collection__addons__category',
+                                 'collection__addons', 'locale',
+                                 'application'))
         else:
             from addons.models import AddonCategory
             vals = (AddonCategory.objects.filter(feature=True)
@@ -230,7 +235,8 @@ def build(cls):
                     name = cls.by_cat(category, app)
                 pipe.delete(name)
                 for row in rs:
-                    pipe.sadd(name, row['addon'])
+                    if row['addon']:
+                        pipe.sadd(name, row['addon'])
         pipe.execute()
 
     @classmethod