Merge 3.6.1 into master (#2559)

Kitware · Nov 12, 2024 · c653bb0 · c653bb0
2 parents edc0698 + 4c66d89
commit c653bb0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/config/cdash.php b/config/cdash.php
@@ -22,7 +22,7 @@
         'expires' => env('PASSWORD_EXPIRATION', 0),
         'unique' => env('UNIQUE_PASSWORD_COUNT', 0),
     ],
-    'version' => '3.6.0',
+    'version' => '3.6.1',
     'registration' => [
         'email' => [
             'verify' => env('REGISTRATION_EMAIL_VERIFY', true),

diff --git a/database/migrations/2024_04_17_183212_remove_test_table.php b/database/migrations/2024_04_17_183212_remove_test_table.php
@@ -81,9 +81,10 @@ public function up(): void
             // Take care of any invalid rows which do not have an output ID before we add a foreign key
             $num_b2t_rows_deleted = DB::delete('
                 DELETE FROM build2test
-                WHERE outputid NOT IN (
-                    SELECT id
+                WHERE NOT EXISTS (
+                    SELECT 1
                     FROM testoutput
+                    WHERE testoutput.id = build2test.outputid
                 )
             ');
             if ($num_b2t_rows_deleted > 0) {

diff --git a/database/migrations/2024_07_09_025240_find_test_measurements_by_testid.php b/database/migrations/2024_07_09_025240_find_test_measurements_by_testid.php
@@ -39,8 +39,10 @@ public function up(): void
             DELETE FROM testmeasurement
             WHERE
                 testid IS NULL OR
-                testid NOT IN (
-                    SELECT id from build2test
+                NOT EXISTS (
+                    SELECT 1
+                    FROM build2test
+                    WHERE build2test.id = testmeasurement.testid
                 )
         ');
 

diff --git a/database/migrations/2024_08_24_160326_label2test_relationship_refactor.php b/database/migrations/2024_08_24_160326_label2test_relationship_refactor.php
@@ -22,7 +22,7 @@ public function up(): void
 
         // Execute at most 10k batches of buildwise updates
         if (config('database.default') === 'pgsql') {
-            for ($i = 0; $i < ceil($count / 10000); $i++) {
+            for ($i = 1; $i <= ceil($count / 10000); $i++) {
                 DB::update('
                     UPDATE label2test
                     SET testid = build2test.id
@@ -35,7 +35,7 @@ public function up(): void
                 ', [$i]);
             }
         } else {
-            for ($i = 0; $i < ceil($count / 10000); $i++) {
+            for ($i = 1; $i <= ceil($count / 10000); $i++) {
                 DB::update('
                     UPDATE label2test, build2test
                     SET label2test.testid = build2test.id

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cdash",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Continuous integration dashboard.",
   "repository": "https://github.com/Kitware/CDash",
   "license": "BSD-3-Clause",