Changeset 86987 in vbox for trunk/src/VBox/ValidationKit/testmanager

Timestamp:

Nov 26, 2020 2:25:20 PM (4 years ago)

Author:

vboxsync

Message:

testmanager/partial-db-dump.py: Only dump what we need from TestBoxStrTab. bugref:9788

File:

• trunk/src/VBox/ValidationKit/testmanager/db/partial-db-dump.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/testmanager/db/partial-db-dump.py

@@ -118 +118 @@
         'TestResultFailures',
         'Builds',
+        'TestBoxStrTab',
         'SystemLog',
     ];
@@ -183 +184 @@
             idLastTestResult = oDb.fetchOne()[0];
         print('Last test result ID: %s' % (idLastTestResult,));
-
-        # Get the build ID range.
-        oDb.execute('SELECT MIN(idBuild), MIN(idBuildTestSuite) FROM TestSets WHERE idTestSet >= %s', (idFirstTestSet,));
-        idFirstBuild = 0;
-        if oDb.getRowCount() > 0:
-            idFirstBuild = min(oDb.fetchOne());
-        print('First build ID: %s' % (idFirstBuild,));
 
         # Tables with idTestSet member.
@@ -222 +216 @@
 
         # The builds table.
+        oDb.execute('SELECT MIN(idBuild), MIN(idBuildTestSuite) FROM TestSets WHERE idTestSet >= %s', (idFirstTestSet,));
+        idFirstBuild = 0;
+        if oDb.getRowCount() > 0:
+            idFirstBuild = min(oDb.fetchOne());
+        print('First build ID: %s' % (idFirstBuild,));
         for sTable in [ 'Builds', ]:
             self._doCopyTo(sTable, oZipFile, oDb,
                            'COPY (SELECT * FROM ' + sTable + ' WHERE idBuild >= %s) TO STDOUT WITH (FORMAT TEXT)',
                            (idFirstBuild,));
+
+        # The test box string table.
+        self._doCopyTo('TestBoxStrTab', oZipFile, oDb, '''
+COPY (SELECT * FROM TestBoxStrTab WHERE idStr IN (
+                ( SELECT 0
+        ) UNION ( SELECT idStrComment     FROM TestBoxes WHERE tsExpire >= %s
+        ) UNION ( SELECT idStrCpuArch     FROM TestBoxes WHERE tsExpire >= %s
+        ) UNION ( SELECT idStrCpuName     FROM TestBoxes WHERE tsExpire >= %s
+        ) UNION ( SELECT idStrCpuVendor   FROM TestBoxes WHERE tsExpire >= %s
+        ) UNION ( SELECT idStrDescription FROM TestBoxes WHERE tsExpire >= %s
+        ) UNION ( SELECT idStrOS          FROM TestBoxes WHERE tsExpire >= %s
+        ) UNION ( SELECT idStrOsVersion   FROM TestBoxes WHERE tsExpire >= %s
+        ) UNION ( SELECT idStrReport      FROM TestBoxes WHERE tsExpire >= %s
+        ) ) ) TO STDOUT WITH (FORMAT TEXT)
+''', (tsEffectiveSafe, tsEffectiveSafe, tsEffectiveSafe, tsEffectiveSafe,
+      tsEffectiveSafe, tsEffectiveSafe, tsEffectiveSafe, tsEffectiveSafe,));
 
         oZipFile.close();
@@ -251 +266 @@
             'TestGroupMembers',
             'SchedGroups',
-            'TestBoxStrTab',
             'TestBoxes',
             'SchedGroupMembers',