2004-06-27 Atsushi Enomoto <atsushi@ximian.com>

	* XmlDataInferenceLoader.cs : It was not always filling relation
	  child table information correctly. This fixes bug #60742.

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

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 454aaefdc37bcd91296b13cd2e19afe69e4611c2..5477819e4027cf04b34fd8d1faa5c98d7919a423 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-27  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XmlDataInferenceLoader.cs : It was not always filling relation
+         child table information correctly. This fixes bug #60742.
+
 2004-06-23 Umadevi S <sumadevi@novell.com>
        * UniqueConstraint.cs :changed a ifdef true to ifdef NET_1_1
 

diff --git a/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs b/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
index ac2a4ce544479b672051d0af2c26dda0af4c1d99..eee22a52e0a723bba4712df48ed7dd9d3fe84580 100755 (executable)
--- a/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
+++ b/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
@@ -410,7 +410,16 @@ namespace System.Data
                                map = new TableMapping (tableName, ns);\r
                                map.ParentTable = parent;\r
                                tables.Add (map);\r
-                               if (parent != null)\r
+                       }\r
+                       if (parent != null) {\r
+                               bool shouldAdd = true;\r
+                               foreach (TableMapping child in parent.ChildTables) {\r
+                                       if (child.Table.TableName == tableName) {\r
+                                               shouldAdd = false;\r
+                                               break;\r
+                                       }\r
+                               }\r
+                               if (shouldAdd)\r
                                        parent.ChildTables.Add (map);\r
                        }\r
                        return map;\r