[OSSTEST PATCH 79/82] flight other job reporting: Further improvements to ordering

[Ian Jackson <iwj@xxxxxxxxxxxxxx>]

From: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

We want to definitely put these NULLs last.

Signed-off-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>
---
 sg-report-flight | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sg-report-flight b/sg-report-flight
index d8829932..8f99bb69 100755
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -1389,7 +1389,9 @@ END
       r_main AS
       (SELECT tident, hostname,
               bool_or(olive)                     AS olive,
-              1                                  AS kind_sort,
+              CASE WHEN min(prep_started)
+                   IS NOT NULL
+                   THEN 1 ELSE 3 END             AS kind_sort,
               flight, job,
              (SELECT status
                 FROM jobs
@@ -1416,7 +1418,9 @@ END
 
       r_elided AS
       (SELECT tident, hostname, FALSE as olive,
-              2                                  AS kind_sort,
+              CASE WHEN count
+                   IS NOT NULL
+                   THEN 2 ELSE 4 END             AS kind_sort,
               $nullcols_main,
               $nullcols_tasks,
               count                              AS elided,
-- 
2.20.1