diff --git a/socorro/external/postgresql/crashes.py b/socorro/external/postgresql/crashes.py index 7851ae6271..668d83dabe 100644 --- a/socorro/external/postgresql/crashes.py +++ b/socorro/external/postgresql/crashes.py @@ -235,18 +235,10 @@ def get_daily(self, **kwargs): if params.os and params.os[0]: sql_where.append("os_short_name IN %(os)s") params.os = tuple(x[0:3].lower() for x in params.os) - if params.separated_by != "os": - db_fields.append("os_name") - db_group.append("os_name") - out_fields.append("os") if params.report_type and params.report_type[0]: sql_where.append("crash_type_short IN %(report_type)s") params.report_type = tuple(params.report_type) - if params.separated_by != "report_type": - db_fields.append("crash_type") - db_group.append("crash_type") - out_fields.append("report_type") sql_where = " AND ".join(sql_where) diff --git a/socorro/unittest/external/postgresql/test_crashes.py b/socorro/unittest/external/postgresql/test_crashes.py index 5419cc0ce7..75e68d20f2 100644 --- a/socorro/unittest/external/postgresql/test_crashes.py +++ b/socorro/unittest/external/postgresql/test_crashes.py @@ -399,7 +399,6 @@ def test_get_daily(self): "date": today, "report_count": 5, "report_type": "Browser", - "os": "Windows", "adu": 200, "crash_hadu": 25.0, "throttle": 0.1 @@ -412,7 +411,6 @@ def test_get_daily(self): "date": today, "report_count": 5, "report_type": "Hang", - "os": "Windows", "adu": 200, "crash_hadu": 25.0, "throttle": 0.1 @@ -438,7 +436,6 @@ def test_get_daily(self): "version": "13.0", "date": today, "report_count": 3, - "report_type": "Hang", "adu": 30, "crash_hadu": 100.0, "throttle": 0.1 @@ -465,7 +462,6 @@ def test_get_daily(self): "version": "11.0", "date": today, "report_count": 1, - "report_type": "Browser", "adu": 10, "crash_hadu": 100.0, "throttle": 0.1 @@ -475,7 +471,6 @@ def test_get_daily(self): "version": "11.0", "date": yesterday, "report_count": 2, - "report_type": "Browser", "adu": 20, "crash_hadu": 100.0, "throttle": 0.1 @@ -487,7 +482,6 @@ def test_get_daily(self): "version": "12.0", "date": yesterday, "report_count": 1, - "report_type": "Browser", "adu": 10, "crash_hadu": 100.0, "throttle": 0.1