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

	* DataSet.cs : Yesterday's fix was different and broke the build :(

svn path=/branches/mono-1-0/mcs/; revision=34802

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 86b3b7745be3a7bfbe9773ef76616e3a76f1f456..c1212daff3ff007401a2d7df704f327a74eba2d6 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-08  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DataSet.cs : Yesterday's fix was different and broke the build :(
+
 2004-10-07  Atsushi Enomoto  <atsushi@ximian.com>
 
        * DataSet.cs :

diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
index c69ac23a1b73076e4f9a04023aa088b82fdb77e4..60b1680e73b1472d51d636042a0d177d6be85a07 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -1777,17 +1777,10 @@ namespace System.Data {
                                // FIXME: what happens if extended properties are set on attribute columns??
                                if (!col.AllowDBNull)
                                        att.Use = XmlSchemaUse.Required;
-                               if (col.MaxLength != 0) {
-                                       XmlSchemaSimpleType st = new XmlSchemaSimpleType ();
-                                       XmlSchemaSimpleContentRestriction r = new XmlSchemaSimpleContentRestriction ();
-                                       r.BaseTypeName = typeName;
-                                       XmlSchemaMaxLengthFacet f = new XmlSchemaMaxLengthFacet ();
-                                       f.Value = col.MaxLength.ToString (table.Locale);
-                                       r.Facets.Add (f);
-                                       att.SchemaType = st;
-                               }
+                               if (col.MaxLength > -1)
+                                       att.SchemaType = GetTableSimpleType (doc, col);
                                else
-                                       att.SchemaTypeName = typeName;
+                                       att.SchemaTypeName = MapType (col.DataType);
                                schemaAttributes.Add (att);
                        }