Changeset 83390 in vbox for trunk

Timestamp:

Mar 24, 2020 4:58:43 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/schedgroup.py: Better hack for dummy removal entries (purpose is getting the author).

File:

• trunk/src/VBox/ValidationKit/testmanager/core/schedgroup.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/schedgroup.py

@@ -530 +530 @@
 ORDER BY    tsEffective DESC
 ) UNION (
-SELECT      tsEffective,
+SELECT      CASE WHEN tsEffective + %s::INTERVAL = tsExpire THEN tsExpire ELSE tsEffective END,
             uidAuthor
 FROM        SchedGroupMembers
@@ -537 +537 @@
 ORDER BY    tsEffective DESC
 ) UNION (
-SELECT      tsEffective,
+SELECT      CASE WHEN tsEffective + %s::INTERVAL = tsExpire THEN tsExpire ELSE tsEffective END,
             uidAuthor
 FROM        TestBoxesInSchedGroups
@@ -546 +546 @@
 ORDER BY    tsEffective DESC
 LIMIT %s OFFSET %s
-''', (idSchedGroup, tsNow, idSchedGroup, tsNow, idSchedGroup, tsNow, cMaxRows + 1, iStart, ));
+''', (idSchedGroup, tsNow,
+      db.dbOneTickIntervalString(), idSchedGroup, tsNow,
+      db.dbOneTickIntervalString(), idSchedGroup, tsNow,
+      cMaxRows + 1, iStart, ));
 
         aoEntries = [] # type: list[ChangeLogEntry]
@@ -563 +566 @@
             #
             for iEntry, oEntry in enumerate(aoEntries):
-                oEntry.oNewRaw = SchedGroupDataEx().initFromDbWithId(self._oDb, idSchedGroup,
-                                                                     db.dbTimestampPlusOneTick(oEntry.tsEffective));
+                oEntry.oNewRaw = SchedGroupDataEx().initFromDbWithId(self._oDb, idSchedGroup, oEntry.tsEffective);
                 if iEntry > 0:
                     aoEntries[iEntry - 1].oOldRaw = oEntry.oNewRaw;