Fixes bug 718111 - Compare release_channel in lower case.

mozilla-services · Feb 8, 2012 · 07276af · 07276af
1 parent 3e26879
commit 07276af
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/socorro/external/postgresql/base.py b/socorro/external/postgresql/base.py
@@ -243,14 +243,14 @@ def build_reports_sql_version_where(key, versions, versions_info, x,
             version_param = "version%s" % (x + 1)
 
         if version_info and version_info["release_channel"]:
-            if version_info["release_channel"] in ("Beta", "Aurora",
-                                                   "Nightly"):
+            channel = version_info["release_channel"].lower()
+            if channel in ("beta", "aurora", "nightly"):
                 # Use major_version instead of full version
                 sql_params[version_param] = version_info["major_version"]
                 # Restrict by release_channel
-                version_where.append("r.release_channel ILIKE '%s'" % (
-                                            version_info["release_channel"]))
-                if version_info["release_channel"] == "Beta":
+                version_where.append("r.release_channel ILIKE '%s'" % channel)
+
+                if channel == "beta":
                     # Restrict to a list of build_id
                     version_where.append("r.build IN ('%s')" % (
                         "', '".join([
@@ -259,6 +259,7 @@ def build_reports_sql_version_where(key, versions, versions_info, x,
             else:
                 # it's a release
                 version_where.append(("r.release_channel NOT IN ('nightly', "
-                                      "'aurora', 'beta')"))
+                                      "'Nightly', 'aurora', 'Aurora', 'beta', "
+                                      "'Beta')"))
 
         return version_where
diff --git a/socorro/unittest/external/postgresql/test_base.py b/socorro/unittest/external/postgresql/test_base.py
@@ -356,10 +356,10 @@ def test_build_reports_sql_where(self):
 
         sql_exp = "WHERE r.date_processed BETWEEN %(from_date)s AND " \
                   "%(to_date)s AND ((r.product=%(version0)s AND " \
-                  "r.release_channel ILIKE 'Nightly' AND " \
+                  "r.release_channel ILIKE 'nightly' AND " \
                   "r.version=%(version1)s) OR (r.product=%(version2)s AND " \
                   "r.version=%(version3)s) OR (r.product=%(version4)s AND " \
-                  "r.release_channel ILIKE 'Beta' AND r.build IN " \
+                  "r.release_channel ILIKE 'beta' AND r.build IN " \
                   "('20120101123456', '20120101098765') AND " \
                   "r.version=%(version5)s))"
         sql_params_exp = {
@@ -484,7 +484,7 @@ def test_build_reports_sql_version_where(self):
             "version1": "13.0"
         }
         version_where = []
-        version_where_exp = ["r.release_channel ILIKE 'Beta'",
+        version_where_exp = ["r.release_channel ILIKE 'beta'",
                              "r.build IN ('20120101123456', '20120101098765')"]
 
         version_where = pgbase.build_reports_sql_version_where(