Author: arina
Date: 2008-02-12 07:19:06 -0500 (Tue, 12 Feb 2008)
New Revision: 95495
Added:
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/ToDelete.TestFile3.xml
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/ToDelete.TestFile5.xml
Removed:
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile3.xml
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile5.xml
Log:
TestFile3.xml and TestFile5.xml are used only for output and should not be
committed. I renamed them for future deleting.
Deleted:
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile3.xml
===================================================================
---
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile3.xml
2008-02-12 11:55:47 UTC (rev 95494)
+++
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile3.xml
2008-02-12 12:19:06 UTC (rev 95495)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema id="XmlSchemaDataSet" xmlns=""
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xs:element name="XmlSchemaDataSet" msdata:IsDataSet="true"
msdata:MainDataTable="ParentTable" msdata:UseCurrentLocale="true">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="ParentTable">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="id" type="xs:int" />
- <xs:element name="ParentItem" type="xs:string" minOccurs="0" />
- <xs:element name="DepartmentID" type="xs:int" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- <xs:unique name="Constraint1">
- <xs:selector xpath=".//ParentTable" />
- <xs:field xpath="id" />
- </xs:unique>
- <xs:unique name="Constraint2" msdata:PrimaryKey="true">
- <xs:selector xpath=".//ParentTable" />
- <xs:field xpath="id" />
- <xs:field xpath="DepartmentID" />
- </xs:unique>
- </xs:element>
-</xs:schema>
\ No newline at end of file
Deleted:
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile5.xml
===================================================================
---
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile5.xml
2008-02-12 11:55:47 UTC (rev 95494)
+++
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile5.xml
2008-02-12 12:19:06 UTC (rev 95495)
@@ -1,111 +0,0 @@
-<NewDataSet>
- <xs:schema id="NewDataSet" xmlns=""
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xs:element name="NewDataSet" msdata:IsDataSet="true"
msdata:MainDataTable="Parent" msdata:UseCurrentLocale="true">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="Parent">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="col1" type="xs:int" minOccurs="0" />
- <xs:element name="col2" type="xs:string" minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Child1">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="col3" type="xs:int" minOccurs="0" />
- <xs:element name="col4" type="xs:string" minOccurs="0" />
- <xs:element name="col5" type="xs:int" minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Child2">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="col6" type="xs:int" minOccurs="0" />
- <xs:element name="col7" type="xs:string" minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- <xs:unique name="Constraint1">
- <xs:selector xpath=".//Parent" />
- <xs:field xpath="col1" />
- </xs:unique>
- <xs:unique name="Child1_Constraint1" msdata:ConstraintName="Constraint1">
- <xs:selector xpath=".//Child1" />
- <xs:field xpath="col5" />
- </xs:unique>
- <xs:keyref name="Relation1" refer="Constraint1">
- <xs:selector xpath=".//Child1" />
- <xs:field xpath="col3" />
- </xs:keyref>
- <xs:keyref name="Relation2" refer="Child1_Constraint1">
- <xs:selector xpath=".//Child2" />
- <xs:field xpath="col6" />
- </xs:keyref>
- </xs:element>
- </xs:schema>
- <Parent>
- <col1>1</col1>
- <col2>P_</col2>
- </Parent>
- <Parent>
- <col1>2</col1>
- <col2>P_</col2>
- </Parent>
- <Child1>
- <col3>1</col3>
- <col4>C1_</col4>
- <col5>3</col5>
- </Child1>
- <Child1>
- <col3>1</col3>
- <col4>C1_</col4>
- <col5>4</col5>
- </Child1>
- <Child1>
- <col3>2</col3>
- <col4>C1_</col4>
- <col5>5</col5>
- </Child1>
- <Child1>
- <col3>2</col3>
- <col4>C1_</col4>
- <col5>6</col5>
- </Child1>
- <Child2>
- <col6>3</col6>
- <col7>C2_</col7>
- </Child2>
- <Child2>
- <col6>3</col6>
- <col7>C2_</col7>
- </Child2>
- <Child2>
- <col6>4</col6>
- <col7>C2_</col7>
- </Child2>
- <Child2>
- <col6>4</col6>
- <col7>C2_</col7>
- </Child2>
- <Child2>
- <col6>5</col6>
- <col7>C2_</col7>
- </Child2>
- <Child2>
- <col6>5</col6>
- <col7>C2_</col7>
- </Child2>
- <Child2>
- <col6>6</col6>
- <col7>C2_</col7>
- </Child2>
- <Child2>
- <col6>6</col6>
- <col7>C2_</col7>
- </Child2>
-</NewDataSet>
\ No newline at end of file
Copied:
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/ToDelete.TestFile3.xml
(from rev 95483,
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile3.xml)
===================================================================
---
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile3.xml
2008-02-12 09:03:31 UTC (rev 95483)
+++
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/ToDelete.TestFile3.xml
2008-02-12 12:19:06 UTC (rev 95495)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema id="XmlSchemaDataSet" xmlns=""
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xs:element name="XmlSchemaDataSet" msdata:IsDataSet="true"
msdata:MainDataTable="ParentTable" msdata:UseCurrentLocale="true">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="ParentTable">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="id" type="xs:int" />
+ <xs:element name="ParentItem" type="xs:string" minOccurs="0" />
+ <xs:element name="DepartmentID" type="xs:int" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ <xs:unique name="Constraint1">
+ <xs:selector xpath=".//ParentTable" />
+ <xs:field xpath="id" />
+ </xs:unique>
+ <xs:unique name="Constraint2" msdata:PrimaryKey="true">
+ <xs:selector xpath=".//ParentTable" />
+ <xs:field xpath="id" />
+ <xs:field xpath="DepartmentID" />
+ </xs:unique>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
Copied:
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/ToDelete.TestFile5.xml
(from rev 95483,
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile5.xml)
===================================================================
---
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/TestFile5.xml
2008-02-12 09:03:31 UTC (rev 95483)
+++
branches/mainsoft/gh2.2/mcs/class/System.Data/Test/System.Data/ToDelete.TestFile5.xml
2008-02-12 12:19:06 UTC (rev 95495)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><start><xs:schema id="NewDataSet"
xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"><xs:element
name="NewDataSet" msdata:IsDataSet="true" msdata:MainDataTable="Parent"
msdata:UseCurrentLocale="true"><xs:complexType><xs:choice minOccurs="0"
maxOccurs="unbounded"><xs:element
name="Parent"><xs:complexType><xs:sequence><xs:element name="col1"
type="xs:int" minOccurs="0" /><xs:element name="col2" type="xs:string"
minOccurs="0"
/></xs:sequence></xs:complexType></xs:element></xs:choice></xs:complexType><xs:unique
name="Constraint1"><xs:selector xpath=".//Parent" /><xs:field xpath="col1"
/></xs:unique></xs:element></xs:schema><diffgr:diffgram
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
xmlns:diffgr="urn:schemas-microsoft-com:xml-diffgram-v1"><NewDataSet><Parent
diffgr:id="Parent1" msdata:rowOrder="0"
diffgr:hasChanges="inserted"><col1>1</col1><col2>P_</col2></Parent><Parent
diffgr
:id="Parent2" msdata:rowOrder="1"
diffgr:hasChanges="inserted"><col1>2</col1><col2>P_</col2></Parent></NewDataSet></diffgr:diffgram></start>
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
