Fix current unit test

Author: Jamesbarford

database/src/pool.rs

@@ -1098,54 +1098,54 @@ mod tests {
 
             assert!(status_page_data.in_progress.len() == 1);
             // we should have 2 jobs
-            assert!(status_page_data.in_progress[0].1.len() == 2);
+            assert!(status_page_data.in_progress[0].request.1.len() == 2);
             // the request should be in progress
             assert!(matches!(
-                status_page_data.in_progress[0].0.status(),
+                status_page_data.in_progress[0].request.0.status(),
                 BenchmarkRequestStatus::InProgress
             ));
 
             // Test the first job
             assert!(matches!(
-                status_page_data.in_progress[0].1[0].target(),
+                status_page_data.in_progress[0].request.1[0].target(),
                 Target::X86_64UnknownLinuxGnu
             ));
             assert!(matches!(
-                status_page_data.in_progress[0].1[0].status(),
+                status_page_data.in_progress[0].request.1[0].status(),
                 BenchmarkJobStatus::Queued
             ));
             assert!(matches!(
-                status_page_data.in_progress[0].1[0].backend(),
+                status_page_data.in_progress[0].request.1[0].backend(),
                 CodegenBackend::Llvm
             ));
             assert!(matches!(
-                status_page_data.in_progress[0].1[0].profile(),
+                status_page_data.in_progress[0].request.1[0].profile(),
                 Profile::Opt
             ));
             assert_eq!(
-                status_page_data.in_progress[0].1[0].benchmark_set(),
+                status_page_data.in_progress[0].request.1[0].benchmark_set(),
                 benchmark_set
             );
 
             // test the second job
             assert!(matches!(
-                status_page_data.in_progress[0].1[1].target(),
+                status_page_data.in_progress[0].request.1[1].target(),
                 Target::X86_64UnknownLinuxGnu
             ));
             assert!(matches!(
-                status_page_data.in_progress[0].1[1].status(),
+                status_page_data.in_progress[0].request.1[1].status(),
                 BenchmarkJobStatus::Queued
             ));
             assert!(matches!(
-                status_page_data.in_progress[0].1[1].backend(),
+                status_page_data.in_progress[0].request.1[1].backend(),
                 CodegenBackend::Llvm
             ));
             assert!(matches!(
-                status_page_data.in_progress[0].1[1].profile(),
+                status_page_data.in_progress[0].request.1[1].profile(),
                 Profile::Debug
             ));
             assert_eq!(
-                status_page_data.in_progress[0].1[1].benchmark_set(),
+                status_page_data.in_progress[0].request.1[1].benchmark_set(),
                 benchmark_set
             );
 

database/src/pool/postgres.rs

@@ -2156,17 +2156,18 @@ where
                     .map(|it| benchmark_job_str_to_type(it).unwrap())
                     .collect();
 
-                let parent_benchmark_request = row_to_benchmark_request(it, Some(12));
-
                 // This is ever-so-slightly grim however it allows us to not
                 // have to parse the text representation of the jobs. Which
                 // saves a reasonable amount of time to justify doing this.
-                let parent_active = it.get::<_, bool>("parent_active");
+                let parent_active = it.get::<_, Option<bool>>("parent_active");
 
                 InProgressRequestWithJobs {
                     request: (benchmark_request, jobs),
-                    parent: if parent_active {
-                        // only parse the jobs if we need to include the parent
+                    parent: if parent_active.unwrap_or(false) {
+                        // The rows values will only be non-null if the `parent_active`
+                        // has been set
+                        let parent_benchmark_request = row_to_benchmark_request(it, Some(12));
+                        // Only parse the jobs if we need to include the parent
                         let parent_jobs: Vec<BenchmarkJob> = it
                             .get::<_, Vec<String>>("parent_jobs")
                             .iter()