2004-10-03 Atsushi Enomoto <atsushi@ximian.com>

	* DataSet.cs : Attribute constraint field XPath must be written as
	  @blah. This fixes bug #66366.

svn path=/trunk/mcs/; revision=34646

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index cca7ae3aec1388b009a4292bef76f3d30ca16471..71242b8825e898bcd795c10f911972b2989e4379 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-03  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DataSet.cs : Attribute constraint field XPath must be written as
+         @blah. This fixes bug #66366.
+
 2004-09-28 Umadevi S <sumadevi@novell.com>
        * DataRow.cs - checked for Enforceconstraints, while using indices to search for related rows
 

diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
index aecde1d7b510a90429b0e371f4a24f37a0c45bd4..f6a66405b1f2f04bcc2eab57a6eb1aca195f506c 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -1545,7 +1545,8 @@ namespace System.Data {
                                                XmlSchemaXPath field;
                                                foreach (DataColumn column in uqConst.Columns) {
                                                        field = new XmlSchemaXPath();
-                                                       field.XPath = constraintPrefix+column.ColumnName;
+                                                       string typePrefix = column.ColumnMapping == MappingType.Attribute ? "@" : "";
+                                                       field.XPath = typePrefix + constraintPrefix+column.ColumnName;
                                                        uniq.Fields.Add(field);
                                                }
                                
@@ -1612,7 +1613,8 @@ namespace System.Data {
                                XmlSchemaXPath field;
                                foreach (DataColumn column in rel.ChildColumns) {
                                        field = new XmlSchemaXPath();
-                                       field.XPath = constraintPrefix+column.ColumnName;
+                                       string typePrefix = column.ColumnMapping == MappingType.Attribute ? "@" : "";
+                                       field.XPath = typePrefix + constraintPrefix + column.ColumnName;
                                        keyRef.Fields.Add(field);
                                }