Connector/NET commit: r1044 - in branches/5.1: . Driver/Source MySql.Web/Providers/Source

[rburnett]

Modified:
   branches/5.1/CHANGES
   branches/5.1/Driver/Source/Installer.cs
   branches/5.1/MySql.Web/Providers/Source/Install.cs
Log:
Fixed problem with installer where attempting to install over a failed uninstall could leave multiple clients registered in machine.config.  (Bug #31731) 

Modified: branches/5.1/CHANGES
===================================================================
--- branches/5.1/CHANGES	2007-10-25 18:46:04 UTC (rev 1043)
+++ branches/5.1/CHANGES	2007-10-25 18:47:07 UTC (rev 1044)
@@ -11,6 +11,8 @@
   - Fixed problem where attempting to enlist in a distributed transaction would succeed
     even though Connector/Net doesn't currently support that. (Bug #31703)
   - Fixed problem with web providers not being usable on medium trust systems      
+  - Fixed problem with installer where attempting to install over a failed uninstall could 
+    leave multiple clients registered in machine.config.  (Bug #31731)      
       
 Version 5.1.3 - 9/19/2007
   - Fixed problem with using a stored procedure that takes a parameter as a select routine

Modified: branches/5.1/Driver/Source/Installer.cs
===================================================================
--- branches/5.1/Driver/Source/Installer.cs	2007-10-25 18:46:04 UTC (rev 1043)
+++ branches/5.1/Driver/Source/Installer.cs	2007-10-25 18:47:07 UTC (rev 1044)
@@ -128,16 +128,15 @@
                 if (node.Attributes == null) continue;
                 foreach (XmlAttribute attr in node.Attributes)
                 {
-                    if (attr.Name == "type" && attr.Value == type)
+                    if (attr.Name == "invariant" && attr.Value == "MySql.Data.MySqlClient")
                     {
-                        alreadyThere = true;
+                        nodes[0].RemoveChild(node);
                         break;
                     }
                 }
             }
 
-			if (! alreadyThere)
-				nodes[0].AppendChild(newNode);
+    		nodes[0].AppendChild(newNode);
 
 			// Save the document to a file and auto-indent the output.
 			XmlTextWriter writer = new XmlTextWriter(configPath, null);

Modified: branches/5.1/MySql.Web/Providers/Source/Install.cs
===================================================================
--- branches/5.1/MySql.Web/Providers/Source/Install.cs	2007-10-25 18:46:04 UTC (rev 1043)
+++ branches/5.1/MySql.Web/Providers/Source/Install.cs	2007-10-25 18:47:07 UTC (rev 1044)
@@ -83,7 +83,6 @@
             AddDefaultConnectionString(doc);
             AddMembershipProvider(doc);
             AddRoleProvider(doc);
-            AddProfileProvider(doc);
 
             // Save the document to a file and auto-indent the output.
             XmlTextWriter writer = new XmlTextWriter(configPath, null);
@@ -153,15 +152,14 @@
             foreach (XmlNode node in providerList.ChildNodes)
             {
                 string typeValue = node.Attributes["type"].Value;
-                if (typeValue == type)
+                if (typeValue.StartsWith("MySql.Web.Security.MySQLMembershipProvider"))
                 {
-                    alreadyThere = true;
+                    providerList.RemoveChild(node);
                     break;
                 }
             }
 
-            if (!alreadyThere)
-                providerList.AppendChild(newNode);
+            providerList.AppendChild(newNode);
         }
 
         private void AddRoleProvider(XmlDocument doc)
@@ -187,15 +185,14 @@
             foreach (XmlNode node in providerList.ChildNodes)
             {
                 string typeValue = node.Attributes["type"].Value;
-                if (typeValue == type)
+                if (typeValue.StartsWith("MySql.Web.Security.MySQLRoleProvider"))
                 {
-                    alreadyThere = true;
+                    providerList.RemoveChild(node);
                     break;
                 }
             }
 
-            if (!alreadyThere)
-                providerList.AppendChild(newNode);
+            providerList.AppendChild(newNode);
         }
 
         private void AddProfileProvider(XmlDocument doc)
@@ -267,7 +264,6 @@
             RemoveDefaultConnectionString(doc);
             RemoveMembershipProvider(doc);
             RemoveRoleProvider(doc);
-            RemoveProfileProvider(doc);
 
             // Save the document to a file and auto-indent the output.
             XmlTextWriter writer = new XmlTextWriter(configPath, null);