Index: /trunk/src/VBox/ValidationKit/testmanager/core/testresults.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testmanager/core/testresults.py	(revision 61267)
+++ /trunk/src/VBox/ValidationKit/testmanager/core/testresults.py	(revision 61268)
@@ -825,6 +825,6 @@
             sTsNow = '\'%s\'::TIMESTAMP' % (tsNow,); # It's actually a string already. duh.
             sRet =        'TestSets.tsCreated <= %s\n' \
-                   '%   AND TestSets.tsCreated >= (%s  - \'%s\'::interval - \'%u months\'::interval)\n' \
-                   '%   AND (TestSets.tsDone IS NULL OR TestSets.tsDone >= (%s - \'%s\'::interval))\n' \
+                   '%s   AND TestSets.tsCreated >= (%s  - \'%s\'::interval - \'%u months\'::interval)\n' \
+                   '%s   AND (TestSets.tsDone IS NULL OR TestSets.tsDone >= (%s - \'%s\'::interval))\n' \
                  % ( sTsNow,
                      sExtraIndent, sTsNow, sInterval, cMonthsMourningPeriod,
@@ -1047,11 +1047,8 @@
                           '   AND TestGroups.tsEffective <= TestSets.tsCreated'
                           '   AND ' + self._getTimePeriodQueryPart(tsNow, sPeriod))
-
         aaoRows = self._oDb.fetchAll()
         aoRet = []
         for aoRow in aaoRows:
-            ## @todo Need to take time into consideration. Will go belly up if we delete a testgroup.
             aoRet.append(TestGroupData().initFromDbRow(aoRow))
-
         return aoRet
 
@@ -1069,10 +1066,8 @@
                           '     AND Builds.tsEffective     <= TestSets.tsCreated'
                           '     AND ' + self._getTimePeriodQueryPart(tsNow, sPeriod))
-
         aaoRows = self._oDb.fetchAll()
         aoRet = []
         for aoRow in aaoRows:
             aoRet.append(BuildDataEx().initFromDbRow(aoRow))
-
         return aoRet
 
@@ -1085,11 +1080,9 @@
         self._oDb.execute('SELECT TestBoxes.*\n'
                           'FROM   TestBoxes,\n'
-                          '       ( SELECT TestBoxes.idTestBox  AS idTestBox,\n'
-                          '         MAX(TestBoxes.idGenTestBox) AS idGenTestBox\n'
-                          '         FROM   TestBoxes, TestSets\n'
-                          '         WHERE  TestSets.idGenTestBox = TestBoxes.idGenTestBox\n'
-                          '           AND ' + self._getTimePeriodQueryPart(tsNow, sPeriod, '        ') +
-                          '         GROUP BY TestBoxes.idTestBox\n'
-                          '         ORDER BY TestBoxes.idTestBox\n'
+                          '       ( SELECT idTestBox         AS idTestBox,\n'
+                          '                MAX(idGenTestBox) AS idGenTestBox\n'
+                          '         FROM   TestSets\n'
+                          '         WHERE  ' + self._getTimePeriodQueryPart(tsNow, sPeriod, '        ') +
+                          '         GROUP BY idTestBox\n'
                           '       ) AS TestBoxIDs\n'
                           'WHERE  TestBoxes.idGenTestBox = TestBoxIDs.idGenTestBox\n'
@@ -1106,21 +1099,17 @@
         """
 
-        self._oDb.execute('SELECT DISTINCT TestCases.idTestCase, TestCases.idGenTestCase, TestSets.tsConfig\n'
-                          'FROM TestCases, TestSets\n'
-                          'WHERE TestSets.idTestCase   =  TestCases.idTestCase\n'
-                          '  AND TestCases.tsExpire    >  TestSets.tsCreated\n'
-                          '  AND TestCases.tsEffective <= TestSets.tsCreated\n'
-                          '  AND ' + self._getTimePeriodQueryPart(tsNow, sPeriod) +
-                          'ORDER BY TestCases.idTestCase, TestCases.idGenTestCase DESC\n');
-
-        aaoRows        = self._oDb.fetchAll()
-        aoRet          = []
-        idPrevTestCase = -1;
-        for aoRow in aaoRows:
-            ## @todo reduce subqueries
-            if aoRow[0] != idPrevTestCase:
-                idPrevTestCase = aoRow[0];
-                aoRet.append(TestCaseData().initFromDbWithGenId(self._oDb, aoRow[1], aoRow[2]))
-
+        self._oDb.execute('SELECT TestCases.*\n'
+                          'FROM   TestCases,\n'
+                          '       ( SELECT idTestCase         AS idTestCase,\n'
+                          '                MAX(idGenTestCase) AS idGenTestCase\n'
+                          '         FROM   TestSets\n'
+                          '         WHERE  ' + self._getTimePeriodQueryPart(tsNow, sPeriod, '        ') +
+                          '         GROUP BY idTestCase\n'
+                          '       ) AS TestCasesIDs\n'
+                          'WHERE  TestCases.idGenTestCase = TestCasesIDs.idGenTestCase\n'
+                          'ORDER BY TestCases.sName\n' );
+        aoRet = [];
+        for aoRow in self._oDb.fetchAll():
+            aoRet.append(TestCaseData().initFromDbRow(aoRow));
         return aoRet
 
@@ -1131,17 +1120,21 @@
         """
 
-        self._oDb.execute('SELECT DISTINCT TestBoxes.idSchedGroup\n'
-                          'FROM TestBoxes, TestSets\n'
-                          'WHERE TestSets.idGenTestBox =  TestBoxes.idGenTestBox\n'
-                          '  AND TestBoxes.tsExpire    >  TestSets.tsCreated\n'
-                          '  AND TestBoxes.tsEffective <= TestSets.tsCreated'
-                          '  AND ' + self._getTimePeriodQueryPart(tsNow, sPeriod))
-
-        aiRows = self._oDb.fetchAll()
+        self._oDb.execute('SELECT SchedGroups.*\n'
+                          'FROM   SchedGroups,\n'
+                          '       ( SELECT TestBoxes.idSchedGroup  AS idSchedGroup,\n'
+                          '                MAX(TestSets.tsCreated) AS tsNow\n'
+                          '         FROM   TestSets,\n'
+                          '                TestBoxes\n'
+                          '         WHERE  TestSets.idGenTestBox = TestBoxes.idGenTestBox\n'
+                          '            AND ' + self._getTimePeriodQueryPart(tsNow, sPeriod, '         ') +
+                          '         GROUP BY idSchedGroup\n'
+                          '       ) AS SchedGroupIDs\n'
+                          'WHERE  SchedGroups.idSchedGroup = SchedGroupIDs.idSchedGroup\n'
+                          '   AND SchedGroups.tsExpire     > SchedGroupIDs.tsNow\n'
+                          '   AND SchedGroups.tsEffective <= SchedGroupIDs.tsNow\n'
+                          'ORDER BY SchedGroups.sName\n' );
         aoRet = []
-        for iRow in aiRows:
-            ## @todo reduce subqueries
-            aoRet.append(SchedGroupData().initFromDbWithId(self._oDb, iRow))
-
+        for aoRow in self._oDb.fetchAll():
+            aoRet.append(SchedGroupData().initFromDbRow(aoRow));
         return aoRet