Fixes

detector/tables.py

@@ -700,9 +700,9 @@ class Breakdown(RegressionTools):
 
   def get(self, field):
     if field == "build_id":
-      return self.get("score").get("build_id")
+      return Score(self.get("score_id")).get("build_id")
     if field == "build":
-      return self.get("score").get("build")
+      return Score(self.get("score_id")).get("build")
 
     return super(Breakdown, self).get(field)
 

server/update.py

@@ -55,7 +55,8 @@ def fetch_test_scores(machine_id, suite_id, name,
     query = "SELECT STRAIGHT_JOIN r.id, r.stamp, b.cset, s.score, b.mode_id, v.id, s.id   \
              FROM awfy_run r                                                        \
              JOIN awfy_build b ON r.id = b.run_id                                   \
-             JOIN awfy_breakdown s ON s.build_id = b.id                             \
+             JOIN awfy_score s1 ON s1.build_id = b.id                               \
+             JOIN awfy_breakdown s ON s.score_id = s1.id                            \
              JOIN awfy_suite_test t ON s.suite_test_id = t.id                       \
              JOIN awfy_suite_version v ON v.id = t.suite_version_id                 \
              WHERE v.suite_id = %s                                                  \

website/overview/data-suite.php

@@ -81,7 +81,7 @@ while($row = mysql_fetch_array($tests)) {
 	$suiteTest = $row[1];
     $scores = Array();
     for ($j = 0; $j < count($buildIds); $j++) {
-        $query = "SELECT score FROM `awfy_breakdown`
+        $query = "SELECT awfy_breakdown.score FROM `awfy_breakdown`
                   LEFT JOIN awfy_score ON awfy_score.id = score_id
                   WHERE suite_test_id = ".$suiteTestId." AND
                         awfy_score.build_id = ".$buildIds[$j]."

website/regressions/data-func.php

@@ -59,7 +59,7 @@ function prev_($stamp, $machine, $mode, $suite, $limit = 1) {
 
 function prev_suite_test($stamp, $machine, $mode, $suite_test, $limit = 1) {
 	$limit = (int) $limit;
-    $query = "SELECT awfy_breakdown.id, score, cset
+    $query = "SELECT awfy_breakdown.id, awfy_breakdown.score, cset
               FROM awfy_breakdown
               INNER JOIN awfy_score ON awfy_score.id = score_id
               INNER JOIN awfy_build ON awfy_build.id = awfy_score.build_id
@@ -132,7 +132,7 @@ function next_($stamp, $machine, $mode, $suite, $limit = 1) {
 }
 
 function next_suite_test($stamp, $machine, $mode, $suite_test, $limit = 1) {
-    $query = mysql_query("SELECT awfy_breakdown.id, score, cset
+    $query = mysql_query("SELECT awfy_breakdown.id, awfy_breakdown.score, cset
 					      FROM awfy_breakdown
 					      INNER JOIN awfy_score ON awfy_score.id = score_id
 					      INNER JOIN awfy_build ON awfy_build.id = awfy_score.build_id

website/regressions/data-score.php

@@ -15,7 +15,7 @@ if (!isset($request->subtest))
 	$request->subtest = false;
 
 if ($request->subtest == 1 || $request->subtest == 'true') {
-	$query = mysql_query("SELECT mode_id, machine, stamp, score, suite_test_id
+	$query = mysql_query("SELECT mode_id, machine, stamp, awfy_breakdown.score, suite_test_id
                           FROM `awfy_breakdown`
                           LEFT JOIN awfy_score ON awfy_score.id = score_id
                           LEFT JOIN awfy_build ON awfy_build.id = awfy_score.build_id