.

[SVN r36854]

3 files changed, 113 insertions, 45 deletions

diff --git a/tools/regression/xsl_reports/db/load.py b/tools/regression/xsl_reports/db/load.py
index 07078c049e..d12953d8f7 100644
--- a/tools/regression/xsl_reports/db/load.py
+++ b/tools/regression/xsl_reports/db/load.py
@@ -1,8 +1,10 @@
 import os
+import sys
 import win32com.client
 
 objBL = win32com.client.Dispatch("SQLXMLBulkLoad.SQLXMLBulkload.3.0")
 objBL.ConnectionString = "provider=SQLOLEDB;data source=localhost;database=boost;integrated security=SSPI"
 objBL.ErrorLogFile = "c:\\error.log"
-objBL.Execute( os.path.join( os.path.dirname( __file__ ), "test-runs.xsd" ), "Huang-WinXP-x64.xml" )
-#objBL.Execute( os.path.join( os.path.dirname( __file__ ), "test-runs.xsd" ), "extended_test_results.xml" )
\ No newline at end of file
+#objBL.Execute( os.path.join( os.path.dirname( __file__ ), "test-runs.xsd" ), "Huang-WinXP-x64.xml" )
+#objBL.Execute( os.path.join( os.path.dirname( __file__ ), "test-runs.xsd" ), "extended_test_results.xml" )
+objBL.Execute( os.path.join( os.path.dirname( __file__ ), "test-runs.xsd" ), sys.argv[1] )
\ No newline at end of file
diff --git a/tools/regression/xsl_reports/db/sqlserver_schemas.sql b/tools/regression/xsl_reports/db/sqlserver_schemas.sql
index 8b355cc967..af307be983 100644
--- a/tools/regression/xsl_reports/db/sqlserver_schemas.sql
+++ b/tools/regression/xsl_reports/db/sqlserver_schemas.sql
@@ -8,7 +8,9 @@ CREATE TABLE [test-run] (
 	[source] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[tag] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[platform] [varchar] (32),
-	[run-type] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
+	[run-type]         [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+	[comment]          [text] NULL,
+	[toolset]          varchar (32) not null
     PRIMARY KEY ( runner, timestamp )
     ) 
 GO
@@ -35,14 +37,46 @@ drop table [compile]
 go
 create table [compile]
     (
-    [runner] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[target-directory] [varchar] (1024) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-    [output] [text],
-	[timestamp] [varchar] (32) NULL ,
-    result [varchar] (16)
+    [runner]           [varchar](32) NOT NULL ,
+	[target-directory] [varchar](512) NOT NULL ,
+    [output]           [text],
+	[timestamp]        [varchar](32) NULL ,
+    result             [varchar](16)
     )    
 
+drop table [link] 
+go
+create table [link]
+    (
+    [runner]           [varchar](32) NOT NULL ,
+	[target-directory] [varchar](512) NOT NULL ,
+    [output]           [text],
+	[timestamp]        [varchar](32) NULL ,
+    result             [varchar](16)
+    )    
+
+drop table [run] 
+go
+create table [run]
+    (
+    [runner]           [varchar](32) NOT NULL ,
+	[target-directory] [varchar](512) NOT NULL ,
+    [output]           [text],
+	[timestamp]        [varchar](32) NULL ,
+    result             [varchar](16)
+    )    
+
+drop table [note]
+go
+create table [note]
+    (
+    [runner]           [varchar](32) NOT NULL ,
+	[target-directory] [varchar](512) NOT NULL ,
+    [note]             [text]
+    )
+
 
 select * from [test-run]
 select * from [test-log]
-select * from compile
\ No newline at end of file
+select * from run
+select * from note
\ No newline at end of file
diff --git a/tools/regression/xsl_reports/db/test-runs.xsd b/tools/regression/xsl_reports/db/test-runs.xsd
index a3de251cf6..879a337e35 100644
--- a/tools/regression/xsl_reports/db/test-runs.xsd
+++ b/tools/regression/xsl_reports/db/test-runs.xsd
@@ -15,6 +15,25 @@
         parent-key="runner [target-directory]"
         child="[compile]"
         child-key="runner [target-directory]" />
+      
+      <sql:relationship name="test-log-link"
+        parent="[test-log]"
+        parent-key="runner [target-directory]"
+        child="[link]"
+        child-key="runner [target-directory]" />
+
+      <sql:relationship name="test-log-run"
+        parent="[test-log]"
+        parent-key="runner [target-directory]"
+        child="[run]"
+        child-key="runner [target-directory]" />
+
+      <sql:relationship name="test-log-note"
+        parent="[test-log]"
+        parent-key="runner [target-directory]"
+        child="[notes]"
+        child-key="runner [target-directory]" />
+      
     </xs:appinfo>
   </xs:annotation>
   
@@ -25,36 +44,31 @@
          </xs:sequence>
        </xs:complexType>
     </xs:element>
-  <xs:element name="run" sql:mapped="false">
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="xs:string">
-        <xs:attribute name="result"/>
-          <xs:attribute name="timestamp"/>
-        </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="link" sql:mapped="false">
-        <xs:complexType >
-          <xs:simpleContent>
-            <xs:extension base="xs:string">
-              <xs:attribute name="result"/>
-          <xs:attribute name="timestamp"/>
-            </xs:extension>
-          </xs:simpleContent>
-        </xs:complexType>
-  </xs:element>
   <xs:element name="comment" type="xs:string"/>
   <xs:element name="test-run" sql:relation="[test-run]">
     <xs:complexType >
       <xs:sequence>
-          <xs:element name="comment" sql:mapped="false" minOccurs="0" maxOccurs="1"/>
-          <xs:element name="test-log"  sql:relation="[test-log]" sql:relationship="test-run-test-log"  minOccurs="0" maxOccurs="unbounded">
-                <xs:complexType >
+          <xs:element name="comment" sql:field="[comment]" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="test-log"  minOccurs="0" maxOccurs="unbounded" sql:relation="[test-log]" sql:relationship="test-run-test-log"  >
+                <xs:complexType>
                 <xs:sequence>
-                  <xs:element name="notes"  minOccurs="0" sql:mapped="false"/>
-                  <xs:element name="compile" sql:relation="[compile]" sql:relationship ="test-log-compile"  sql:overflow-field="output" minOccurs="0"  maxOccurs="unbounded" sql:field="output">
+                  <xs:element name="notes"  minOccurs="0"  maxOccurs="1" sql:is-constant ="1">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="note" minOccurs="0" maxOccurs="unbounded" sql:relation="[notes]" sql:relationship="test-log-note" sql:overflow-field="note" >
+                              <xs:complexType>
+                                <xs:simpleContent>
+                                  <xs:extension base="xs:string">
+                                    <xs:attribute name="author"/>
+                                    <xs:attribute name="refid"/>
+                                  </xs:extension>
+                                </xs:simpleContent>
+                              </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  <xs:element name="compile" minOccurs="0"  maxOccurs="unbounded"  sql:relation="[compile]" sql:relationship ="test-log-compile"  sql:overflow-field="output" sql:field="output">
                         <xs:complexType >
                           <xs:simpleContent>
                             <xs:extension base="xs:string">
@@ -64,22 +78,40 @@
                           </xs:simpleContent>
                         </xs:complexType>
                     </xs:element>
-                    <xs:element ref="link" sql:mapped="false" />
-                    <xs:element ref="run" sql:mapped="false" />
+                  <xs:element name="link" sql:relation="[link]" sql:relationship ="test-log-link"  sql:overflow-field="output" sql:field="output">
+                    <xs:complexType >
+                      <xs:simpleContent>
+                        <xs:extension base="xs:string">
+                          <xs:attribute name="result"/>
+                          <xs:attribute name="timestamp"/>
+                        </xs:extension>
+                      </xs:simpleContent>
+                    </xs:complexType>
+                  </xs:element>
+                  <xs:element name="run"  sql:relation="[run]" sql:relationship ="test-log-run"  sql:overflow-field="output" sql:field="output">
+                     <xs:complexType>
+                       <xs:simpleContent>
+                         <xs:extension base="xs:string">
+                           <xs:attribute name="result"/>
+                           <xs:attribute name="timestamp"/>
+                         </xs:extension>
+                       </xs:simpleContent>
+                     </xs:complexType>
+                   </xs:element>
                 </xs:sequence>
-                <xs:attribute name="library" sql:field="library"/>
+                <xs:attribute name="library" sql:field="[library]"/>
                  <xs:attribute name="test-name" sql:field="[test-name]"/>
                   <xs:attribute name="test-type" sql:field="[test-type]"/>
                   <xs:attribute name="test-program" sql:field="[test-program]"/>
                  <xs:attribute name="target-directory" sql:field="[target-directory]"/>
-                <xs:attribute name="toolset" sql:mapped="false"/>
-                <xs:attribute name="show-run-output" sql:mapped="false"/>
-                <xs:attribute name="result" sql:mapped="false"/>
-                <xs:attribute name="expected-result" sql:mapped="false"/>
-                <xs:attribute name="expected-reason" sql:mapped="false"/>
-                <xs:attribute name="status" sql:mapped="false"/>
-                <xs:attribute name="is-new" sql:mapped="false"/>
-                <xs:attribute name="category" sql:mapped="false"/>
+                <xs:attribute name="toolset" sql:field="[toolset]"/>
+                  <xs:attribute name="show-run-output" sql:field="[show-run-output]"/>
+                  <xs:attribute name="result" sql:field="[result]"/>
+                  <xs:attribute name="expected-result" sql:field="[expected-result]"/>
+                  <xs:attribute name="expected-reason" sql:field="[expected-reason]"/>
+                  <xs:attribute name="status" sql:field="[status]"/>
+                  <xs:attribute name="is-new" sql:field="[is-new]"/>
+                  <xs:attribute name="category" sql:field="[category]"/>
               </xs:complexType>
           </xs:element>
         </xs:sequence>