Remove build_id column in awfy_breakdown

detector/tables.py

@@ -356,8 +356,9 @@ class Build(DBTable):
   def getScoresAndBreakdowns(self):
     scores = self.getScores()
     c = awfy.db.cursor()
-    c.execute("SELECT id                                                              \
+    c.execute("SELECT awfy_breakdown.id                                               \
                FROM awfy_breakdown                                                    \
+               LEFT JOIN awfy_score ON awfy_score.id = score_id                       \
                WHERE build_id = %s", (self.id,))
     for row in c.fetchall():
       scores.append(Breakdown(row[0]))
@@ -731,7 +732,8 @@ class Breakdown(RegressionTools):
     c = awfy.db.cursor()
     c.execute("SELECT awfy_breakdown.id                                               \
                FROM awfy_breakdown                                                    \
-               INNER JOIN awfy_build ON awfy_build.id = awfy_breakdown.build_id       \
+               INNER JOIN awfy_score ON awfy_score.id = awfy_breakdown.score_id       \
+               INNER JOIN awfy_build ON awfy_build.id = awfy_score.build_id           \
                INNER JOIN awfy_run ON awfy_run.id = awfy_build.run_id                 \
                WHERE stamp > %s AND                                                   \
                      machine = %s AND                                                 \
@@ -752,7 +754,8 @@ class Breakdown(RegressionTools):
     c = awfy.db.cursor()
     c.execute("SELECT awfy_breakdown.id                                               \
                FROM awfy_breakdown                                                    \
-               INNER JOIN awfy_build ON awfy_build.id = awfy_breakdown.build_id       \
+               INNER JOIN awfy_score ON awfy_score.id = awfy_breakdown.score_id       \
+               INNER JOIN awfy_build ON awfy_build.id = awfy_score.build_id           \
                INNER JOIN awfy_run ON awfy_run.id = awfy_build.run_id                 \
                WHERE stamp < %s AND                                                   \
                      machine = %s AND                                                 \
@@ -774,7 +777,8 @@ class Breakdown(RegressionTools):
     c.execute("SELECT id                                                                    \
                FROM (SELECT awfy_breakdown.id, stamp                                        \
                      FROM awfy_breakdown                                                    \
-                     INNER JOIN awfy_build ON awfy_build.id = awfy_breakdown.build_id       \
+                     INNER JOIN awfy_score ON awfy_score.id = awfy_breakdown.score_id       \
+                     INNER JOIN awfy_build ON awfy_build.id = awfy_score.build_id           \
                      INNER JOIN awfy_run ON awfy_run.id = awfy_build.run_id                 \
                      WHERE machine = %s AND                                                 \
                            mode_id = %s AND                                                 \

website/overview/data-suite.php

@@ -86,7 +86,7 @@ while($row = mysql_fetch_array($tests)) {
                   WHERE suite_test_id = ".$suiteTestId." AND
                         awfy_score.build_id = ".$buildIds[$j]."
                   LIMIT 1";
-        $results = mysql_query($query);
+        $results = mysql_query($query) or die(mysql_error());
         if (!$results || mysql_num_rows($results) != 1)
             continue;
         $row = mysql_fetch_array($results);

website/regressions/data-regression.php

@@ -56,7 +56,7 @@ for ($i=0; $i < count($ids); $i++) {
 		);
 
 		//if (!$minimal) { // minimal outdated. Used to be slow. Not anymore.
-        if ($output["prev_build_id"]) {
+        if ($output["prev_build_id"] && !$minimal) {
             $qPrevScore = mysql_query("SELECT score
                                        FROM awfy_score
                                        WHERE build_id = ".$output["prev_build_id"]." AND
@@ -85,7 +85,7 @@ for ($i=0; $i < count($ids); $i++) {
 		);
 
 		//if (!$minimal) { // minimal outdated. Used to be slow. Not anymore.
-        if ($output["prev_build_id"]) {
+        if ($output["prev_build_id"] && !$minimal) {
             $qPrevScore = mysql_query("SELECT awfy_breakdown.score
                                        FROM awfy_breakdown
                                        LEFT JOIN awfy_score ON score_id = awfy_score.id