Unreviewed build fix for merging platforms.

* public/admin/platforms.php:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185523 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index d5983272ef710466692d914b6ebe7c8e9c1cfe3c..13d09a080dbce318fc621c99eb4ffa23eff66ef5 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed build fix for merging platforms.
+
+        * public/admin/platforms.php:
+
 2015-06-09  Ryosuke Niwa  <rniwa@webkit.org>
 
         Unreviewed build fix. Some builder names are really long.

diff --git a/Websites/perf.webkit.org/public/admin/platforms.php b/Websites/perf.webkit.org/public/admin/platforms.php
index 4cc87ac6a1a58b80b474e8401f2a588feef5022c..1bfc19dd528187828eafbbd1d6c9b92aef85f0ab 100644 (file)
--- a/Websites/perf.webkit.org/public/admin/platforms.php
+++ b/Websites/perf.webkit.org/public/admin/platforms.php
@@ -9,12 +9,12 @@ function merge_platforms($platform_to_merge, $destination_platform) {
 
     // First, move all test runs to the test configurations in the destination for all test configurations that
     // exist in both the original platform and the platform into which we're merging.
-    if (!$db->query_and_get_affected_rows('UPDATE test_runs SET run_config = destination.config_id
+    if ($db->query_and_get_affected_rows('UPDATE test_runs SET run_config = destination.config_id
         FROM test_configurations as merged, test_configurations as destination
         WHERE merged.config_platform = $1 AND destination.config_platform = $2
             AND run_config = merged.config_id
             AND destination.config_type = merged.config_type
-            AND destination.config_metric = merged.config_metric', array($platform_to_merge, $destination_platform))) {
+            AND destination.config_metric = merged.config_metric', array($platform_to_merge, $destination_platform)) === FALSE) {
         $db->rollback_transaction();
         return notice("Failed to migrate test runs for $platform_to_merge that have test configurations in $destination_platform.");
     }
@@ -35,6 +35,21 @@ function merge_platforms($platform_to_merge, $destination_platform) {
         return notice('Failed to migrate all test runs.');
     }
 
+    if ($db->query_and_get_affected_rows('UPDATE analysis_tasks SET task_platform = $1 WHERE task_platform = $2',
+        array($destination_platform, $platform_to_merge)) === FALSE) {
+        $db->rollback_transaction();
+        return notice('Failed to migrate analysis tasks.');
+    }
+
+    $db->query_and_get_affected_rows('DELETE FROM triggerable_configurations WHERE trigconfig_platform = $1',
+        array($platform_to_merge));
+
+    if ($db->query_and_get_affected_rows('UPDATE build_requests SET request_platform = $1 WHERE request_platform = $2',
+        array($destination_platform, $platform_to_merge)) === FALSE) {
+        $db->rollback_transaction();
+        return notice('Failed to migrate build requests.');
+    }
+
     $db->query_and_get_affected_rows('DELETE FROM platforms WHERE platform_id = $1', array($platform_to_merge));
     $db->commit_transaction();
 }