Author: atsushi
Date: 2006-01-20 12:12:45 -0500 (Fri, 20 Jan 2006)
New Revision: 55845

Added:
   
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/schemas/bug77248.xsd
Modified:
   branches/mono-1-1-13/mcs/class/System.Data/System.Data/ChangeLog
   
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
   branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/schemas/ChangeLog
Log:
merged r55619 from trunk.



Modified: branches/mono-1-1-13/mcs/class/System.Data/System.Data/ChangeLog
===================================================================
--- branches/mono-1-1-13/mcs/class/System.Data/System.Data/ChangeLog    
2006-01-20 16:58:34 UTC (rev 55844)
+++ branches/mono-1-1-13/mcs/class/System.Data/System.Data/ChangeLog    
2006-01-20 17:12:45 UTC (rev 55845)
@@ -1,14 +1,25 @@
+2006-01-18 Boris Kirzner <[EMAIL PROTECTED]>
+       * DataColumn.cs: added PropertyCchangedEvent handling.
+
 2006-01-17  Senganal T  <[EMAIL PROTECTED]>
+       
        * DataRow.cs:
-               ItemArray : Modified to raise RowNotInTableException only if
-               the concerned row has been removed from the table.Fixes
+               ItemArray : Modified to raise RowInTableException only if
+               the concerned row has been removed from the table.Fixes 
                bug #77267
 
+2006-01-16 Boris Kirzner <[EMAIL PROTECTED]>
+       * DataTable.cs: Drop dependend indexes on column removal.
+
+2006-01-16  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * CustomDataClassGenerator.cs :
+         When a DataRelation connects the same table as parent and child,
+         generate parent row property as BlahRowParent. Fixed bug #77248.
+
 2006-01-10  Senganal T <[EMAIL PROTECTED]>
        * DataRowCollection.cs
-               - Added ListChangedEvent to signal reset of the collection.
-               Ideally, all the row collection changes should be notified 
-               thru this event. 
+               - Added ListChangedEvent to notify reset of the collection.
        * DataView.cs
                - Subscribes to the ListChangedEvent of DataRowCollection
                Fixes bug #77188

Modified: 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
===================================================================
--- 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
    2006-01-20 16:58:34 UTC (rev 55844)
+++ 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
    2006-01-20 17:12:45 UTC (rev 55845)
@@ -30,6 +30,7 @@
 
 
 using System;
+using System.CodeDom;
 using System.CodeDom.Compiler;
 using System.Data;
 using NUnit.Framework;
@@ -41,10 +42,13 @@
        public class TypedDataSetGeneratorTest : Assertion
        {
                private ICodeGenerator gen;
+               private ICodeCompiler compiler;
 
                public TypedDataSetGeneratorTest ()
                {
-                       gen = new CSharpCodeProvider ().CreateGenerator ();
+                       CodeDomProvider p = new CSharpCodeProvider ();
+                       gen = p.CreateGenerator ();
+                       compiler = p.CreateCompiler ();
                }
 
                [Test]
@@ -81,5 +85,19 @@
                        AssertEquals ("#12", "\u3042", 
TypedDataSetGenerator.GenerateIdName ("\u3042", gen));
                }
 
+               [Test]
+               [Ignore ("We cannot depend on CodeCompiler since it expects mcs 
to exist.")]
+               public void RelationConnectsSameTable ()
+               {
+                       DataSet ds = new DataSet ();
+                       ds.ReadXmlSchema 
("Test/System.Data/schemas/bug77248.xsd");
+                       CodeNamespace cns = new CodeNamespace ();
+                       TypedDataSetGenerator.Generate (ds, cns, gen);
+                       CodeCompileUnit ccu = new CodeCompileUnit ();
+                       ccu.Namespaces.Add (cns);
+                       CompilerResults r = compiler.CompileAssemblyFromDom (
+                               new CompilerParameters (), ccu);
+                       AssertEquals (0, r.Errors.Count);
+               }
        }
 }

Modified: 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/schemas/ChangeLog
===================================================================
--- 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/schemas/ChangeLog   
    2006-01-20 16:58:34 UTC (rev 55844)
+++ 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/schemas/ChangeLog   
    2006-01-20 17:12:45 UTC (rev 55845)
@@ -1,3 +1,7 @@
+2006-01-16  Atsushi Enomoto <[EMAIL PROTECTED]>
+
+       * bug77248.xsd : added.
+
 2005-01-12  Atsushi Enomoto <[EMAIL PROTECTED]>
 
        * test103.xsd : added.

Added: 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/schemas/bug77248.xsd
===================================================================
--- 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/schemas/bug77248.xsd
    2006-01-20 16:58:34 UTC (rev 55844)
+++ 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/schemas/bug77248.xsd
    2006-01-20 17:12:45 UTC (rev 55845)
@@ -0,0 +1,30 @@
+<xs:schema id="Testdataset" 
targetNamespace="http://tempuri.org/Testdataset.xsd";
+   xmlns:mstns="http://tempuri.org/Testdataset.xsd";
+   xmlns="http://tempuri.org/Testdataset.xsd";
+   xmlns:xs="http://www.w3.org/2001/XMLSchema";
+   xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
+   attributeFormDefault="qualified" elementFormDefault="qualified">
+  <xs:element name="Testdataset" msdata:IsDataSet="true">
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="TEST_TREE">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="NODEID" msdata:ReadOnly="true"
+                  msdata:AutoIncrement="true" type="xs:int" />
+              <xs:element name="PARENT_NODEID" type="xs:int" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:choice>
+    </xs:complexType>
+    <xs:unique name="TestdatasetKey6" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:TEST_TREE" />
+      <xs:field xpath="mstns:NODEID" />
+    </xs:unique>
+    <xs:keyref name="TEST_TREETEST_TREE" refer="TestdatasetKey6">
+      <xs:selector xpath=".//mstns:TEST_TREE" />
+      <xs:field xpath="mstns:PARENT_NODEID" />
+    </xs:keyref>
+  </xs:element>
+</xs:schema>


Property changes on: 
branches/mono-1-1-13/mcs/class/System.Data/Test/System.Data/schemas/bug77248.xsd
___________________________________________________________________
Name: svn:eol-style
   + native

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to