2004-04-22 Atsushi Enomoto <atsushi@ximian.com>

	* DataSet.cs : Data should be read when mode is IgnoreSchema (well,
	  the support is incomplete yet).
	* XmlDataLoader.cs :
	  Reverted ReadModeSchema() argument change. XmlReadMode would be
	  useful to handle IgnoreSchema.
	  Don't overwrite DataSetName when mode is not such kind.
	  Set Prefix and Namespace as well as DataSetName.
	  AllowDBNull looks set false by default for element column.
	  Set unique constraint as primary key when infering the table schema.

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

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 4ef60e745161738cd68f9938dbbdd4f395decd24..90bcd87a8225db06462fbc449fdc72406703e55c 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-22  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DataSet.cs : Data should be read when mode is IgnoreSchema (well,
+         the support is incomplete yet).
+       * XmlDataLoader.cs : 
+         Reverted ReadModeSchema() argument change. XmlReadMode would be 
+         useful to handle IgnoreSchema.
+         Don't overwrite DataSetName when mode is not such kind.
+         Set Prefix and Namespace as well as DataSetName.
+         AllowDBNull looks set false by default for element column.
+         Set unique constraint as primary key when infering the table schema.
+
 2004-04-21  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 4a7fb0056353771dc8624ee42dd8d8d1787cb82a..523ff53b9bf4be9faddfe7f15055f9c5dd9bbf39 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -878,6 +878,7 @@ namespace System.Data {
                        switch (mode) {
                        case XmlReadMode.Auto:
                        case XmlReadMode.InferSchema:
+                       case XmlReadMode.IgnoreSchema:
                        case XmlReadMode.Fragment:
                                break;
                        default:

diff --git a/mcs/class/System.Data/System.Data/XmlDataLoader.cs b/mcs/class/System.Data/System.Data/XmlDataLoader.cs
index a28129fa76cc72188aec00c67c96a788b87354c7..06051efe4d530b8bff43de0bb7be626c61d02312 100644 (file)
--- a/mcs/class/System.Data/System.Data/XmlDataLoader.cs
+++ b/mcs/class/System.Data/System.Data/XmlDataLoader.cs
@@ -20,7 +20,6 @@
 using System;
 using System.Data;
 using System.Xml;
-using System.Xml.XPath;
 using System.Collections;
 using System.Globalization;
 
@@ -31,7 +30,6 @@ namespace System.Data
        {
        
                private DataSet DSet;
-               Hashtable DiffGrRows = new Hashtable ();
 
                public XmlDataLoader (DataSet set) 
                {
@@ -45,11 +43,15 @@ namespace System.Data
                        switch (mode) {
                        case XmlReadMode.Auto:
                                Result = DSet.Tables.Count == 0 ? XmlReadMode.InferSchema : XmlReadMode.IgnoreSchema;
-                               ReadModeSchema (reader, true, true);
+                               ReadModeSchema (reader, mode);
                                break;
                        case XmlReadMode.InferSchema:
                                Result = XmlReadMode.InferSchema;
-                               ReadModeSchema (reader, true, false);
+                               ReadModeSchema (reader, mode);
+                               break;
+                       case XmlReadMode.IgnoreSchema:
+                               Result = XmlReadMode.IgnoreSchema;
+                               ReadModeSchema (reader, mode);
                                break;
                        default:
                                reader.Skip ();
@@ -62,13 +64,15 @@ namespace System.Data
                #region reading
 
                // Read information from the reader.
-               private void ReadModeSchema (XmlReader reader, bool inferSchema, bool fillRows)
+               private void ReadModeSchema (XmlReader reader, XmlReadMode mode)
                {
+                       bool inferSchema = mode == XmlReadMode.InferSchema || mode == XmlReadMode.Auto;
+                       bool fillRows = mode != XmlReadMode.InferSchema;
                        // FIXME: Do we really need this process here?
+                       // If embedded schema is allowed, then this check should not be done here.
                        //check if the current element is schema.
                        if (reader.LocalName == "schema") {
-                               
-                               if (inferSchema)
+                               if (mode != XmlReadMode.Auto)
                                        reader.Skip(); // skip the schema node.
                                else
                                        DSet.ReadXmlSchema(reader);
@@ -93,10 +97,13 @@ namespace System.Data
                        int rootNodeDepth = XmlNodeElementsDepth(doc.DocumentElement);
                        switch (rootNodeDepth) {
                        case 1:
-                               DSet.DataSetName = doc.DocumentElement.LocalName;
+                               if (inferSchema) {
+                                       DSet.DataSetName = doc.DocumentElement.LocalName;
+                                       DSet.Prefix = doc.DocumentElement.Prefix;
+                                       DSet.Namespace = doc.DocumentElement.NamespaceURI;
+                               }
                                return;
                        case 2:
-                               bool schemaExists = (DSet.Tables.Count == 0);
                                // create new document
                                XmlDocument newDoc = new XmlDocument();
                                // create element for dataset
@@ -107,12 +114,13 @@ namespace System.Data
                                XmlNode root = newDoc.ImportNode(doc.DocumentElement,true);
                                datasetElement.AppendChild(root);
                                doc = newDoc;
-                               // set dataset name only when no schema exists now.
-                               if (!schemaExists)
-                                       DSet.DataSetName = "NewDataSet";
                                break;
                        default:
-                               DSet.DataSetName = doc.DocumentElement.LocalName;
+                               if (inferSchema) {
+                                       DSet.DataSetName = doc.DocumentElement.LocalName;
+                                       DSet.Prefix = doc.DocumentElement.Prefix;
+                                       DSet.Namespace = doc.DocumentElement.NamespaceURI;
+                               }
                                break;
                        }
 
@@ -133,7 +141,6 @@ namespace System.Data
                                        AddRowToTable(node, null, inferSchema, fillRows);
                                }
                        }
-
                        // set the EnforceConstraints to original value;
                        DSet.EnforceConstraints = origEnforceConstraint;
                }
@@ -245,6 +252,7 @@ namespace System.Data
                                                string newRelationColumnName = table.TableName + "_Id";
                                                if (!table.Columns.Contains(newRelationColumnName)) {
                                                        DataColumn newRelationColumn = new DataColumn(newRelationColumnName, typeof(int));
+                                                       newRelationColumn.AllowDBNull = false;
                                                        newRelationColumn.AutoIncrement = true;
                                                        // we do not want to serialize this column so MappingType is Hidden.
                                                        newRelationColumn.ColumnMapping = MappingType.Hidden;
@@ -305,6 +313,7 @@ namespace System.Data
                                        DataRelation dr = new DataRelation(relationColumn.Table.TableName + "_" + dc.Table.TableName, relationColumn, dc);
                                        dr.Nested = true;
                                        DSet.Relations.Add(dr);
+                                       UniqueConstraint.SetAsPrimaryKey (dr.ParentTable.Constraints, dr.ParentKeyConstraint);
                                }
                                rowValue.Add (relationColumn.ColumnName, relationColumn.GetAutoIncrementValue());
                        }