Index: /trunk/src/VBox/ValidationKit/testmanager/db/tmdb-r18-testresultfiles-1-testresultmsgs-1.pgsql
===================================================================
--- /trunk/src/VBox/ValidationKit/testmanager/db/tmdb-r18-testresultfiles-1-testresultmsgs-1.pgsql	(revision 61463)
+++ /trunk/src/VBox/ValidationKit/testmanager/db/tmdb-r18-testresultfiles-1-testresultmsgs-1.pgsql	(revision 61463)
@@ -0,0 +1,149 @@
+-- $Id$
+--- @file
+-- VBox Test Manager Database - Adds an idTestSet to TestResultFiles and TestResultMsgs.
+--
+
+--
+-- Copyright (C) 2013-2016 Oracle Corporation
+--
+-- This file is part of VirtualBox Open Source Edition (OSE), as
+-- available from http://www.virtualbox.org. This file is free software;
+-- you can redistribute it and/or modify it under the terms of the GNU
+-- General Public License (GPL) as published by the Free Software
+-- Foundation, in version 2 as it comes in the "COPYING" file of the
+-- VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+-- hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+--
+-- The contents of this file may alternatively be used under the terms
+-- of the Common Development and Distribution License Version 1.0
+-- (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+-- VirtualBox OSE distribution, in which case the provisions of the
+-- CDDL are applicable instead of those of the GPL.
+--
+-- You may elect to license modified versions of this file under the
+-- terms and conditions of either the GPL or the CDDL or both.
+--
+
+--
+-- Cleanup after failed runs.
+--
+DROP TABLE IF EXISTS NewTestResultFiles;
+DROP TABLE IF EXISTS OldTestResultFiles;
+DROP TABLE IF EXISTS NewTestResultMsgs;
+DROP TABLE IF EXISTS OldTestResultMsgs;
+
+-- Die on error from now on.
+\set ON_ERROR_STOP 1
+\set AUTOCOMMIT 0
+
+                                                                                  
+--                                                                                
+-- Rename the original table, drop constrains and foreign key references so we    
+-- get the right name automatic when creating the new one.                        
+--                                                                                
+\d+ TestResultFiles;
+ALTER TABLE TestResultFiles RENAME TO OldTestResultFiles;
+
+DROP INDEX IF EXISTS TestResultFilesIdx;
+DROP INDEX IF EXISTS TestResultFilesIdx2;
+
+--
+-- Create the new version of the table and filling with the content of the old.
+--
+CREATE TABLE TestResultFiles (
+    --- The ID of this file.
+    idTestResultFile    INTEGER     PRIMARY KEY DEFAULT NEXTVAL('TestResultFileId'),
+    --- The test result it was reported within.
+    idTestResult        INTEGER     REFERENCES TestResults(idTestResult)  NOT NULL,
+    --- The test set this file is a part of (for avoiding joining thru TestResults).
+    idTestSet           INTEGER     REFERENCES TestSets(idTestSet) NOT NULL,
+    --- Creation time stamp.
+    tsCreated           TIMESTAMP WITH TIME ZONE  DEFAULT current_timestamp  NOT NULL,
+    --- The filename relative to TestSets(sBaseFilename) + '-'.
+    -- The set of valid filename characters should be very limited so that no
+    -- file system issues can occure either on the TM side or the user when
+    -- loading the files.  Tests trying to use other characters will fail.
+    -- Valid character regular expession: '^[a-zA-Z0-9_-(){}#@+,.=]*$'
+    idStrFile           INTEGER     REFERENCES TestResultStrTab(idStr)  NOT NULL,
+    --- The description.
+    idStrDescription    INTEGER     REFERENCES TestResultStrTab(idStr)  NOT NULL,
+    --- The kind of file.
+    -- For instance: 'log/release/vm',
+    --               'screenshot/failure',
+    --               'screencapture/failure',
+    --               'xmllog/somestuff'
+    idStrKind           INTEGER     REFERENCES TestResultStrTab(idStr)  NOT NULL,
+    --- The mime type for the file.
+    -- For instance: 'text/plain',
+    --               'image/png',
+    --               'video/webm',
+    --               'text/xml'
+    idStrMime           INTEGER     REFERENCES TestResultStrTab(idStr)  NOT NULL
+);
+
+INSERT INTO TestResultFiles ( idTestResultFile, idTestResult, idTestSet, tsCreated, idStrFile, idStrDescription, 
+                              idStrKind, idStrMime)
+    SELECT o.idTestResultFile, o.idTestResult, tr.idTestSet, o.tsCreated, o.idStrFile, o.idStrDescription, 
+           o.idStrKind, o.idStrMime
+    FROM   OldTestResultFiles o,
+           TestResults tr
+    WHERE  o.idTestResult = tr.idTestResult;
+   
+-- Add new indexes.
+CREATE INDEX TestResultFilesIdx ON TestResultFiles(idTestResult);
+CREATE INDEX TestResultFilesIdx2 ON TestResultFiles(idTestSet, tsCreated DESC);
+
+\d TestResultFiles;
+
+
+--                                                                                
+-- Rename the original table, drop constrains and foreign key references so we    
+-- get the right name automatic when creating the new one.                        
+--                                                                                
+\d+ TestResultMsgs;
+ALTER TABLE TestResultMsgs RENAME TO OldTestResultMsgs;
+
+DROP INDEX IF EXISTS TestResultMsgsIdx;
+DROP INDEX IF EXISTS TestResultMsgsIdx2;
+
+--
+-- Create the new version of the table and filling with the content of the old.
+--
+CREATE TABLE TestResultMsgs (
+    --- The ID of this file.
+    idTestResultMsg     INTEGER     PRIMARY KEY DEFAULT NEXTVAL('TestResultMsgIdSeq'),
+    --- The test result it was reported within.
+    idTestResult        INTEGER     REFERENCES TestResults(idTestResult)  NOT NULL,
+    --- The test set this file is a part of (for avoiding joining thru TestResults).
+    idTestSet           INTEGER     REFERENCES TestSets(idTestSet) NOT NULL,
+    --- Creation time stamp.
+    tsCreated           TIMESTAMP WITH TIME ZONE  DEFAULT current_timestamp  NOT NULL,
+    --- The message string.
+    idStrMsg            INTEGER     REFERENCES TestResultStrTab(idStr)  NOT NULL,
+    --- The message level.
+    enmLevel            TestResultMsgLevel_T  NOT NULL
+);
+
+INSERT INTO TestResultMsgs ( idTestResultMsg, idTestResult, idTestSet, tsCreated, idStrMsg, enmLevel)
+    SELECT o.idTestResultMsg, o.idTestResult, tr.idTestSet, o.tsCreated, o.idStrMsg, o.enmLevel 
+    FROM   OldTestResultMsgs o,
+           TestResults tr
+    WHERE  o.idTestResult = tr.idTestResult;
+   
+-- Add new indexes.
+CREATE INDEX TestResultMsgsIdx  ON TestResultMsgs(idTestResult);
+CREATE INDEX TestResultMsgsIdx2 ON TestResultMsgs(idTestSet, tsCreated DESC);
+
+\d TestResultMsgs;
+
+
+--
+-- Drop the old tables and commit.
+--
+DROP TABLE OldTestResultFiles;
+DROP TABLE OldTestResultMsgs;
+
+COMMIT;
+
+
+
