bzr commit into connector-net-trunk branch (reggie.burnett:947)

[Reggie Burnett]

#At file:///C:/work/connector-net/6.3/ based on revid:reggie.burnett@stripped

  947 Reggie Burnett	2010-11-22 [merge]
      merged

    modified:
      CHANGES
      MySql.VisualStudio/DDEX/MySqlDataObjectIdentifierConverter.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-11-17 22:57:36 +0000
+++ b/CHANGES	2010-11-22 17:24:27 +0000
@@ -9,6 +9,8 @@
 - starting delivering 4.0 variants of MySql.Data and MySql.Web.  This apparently helps Mono 2.8 (bug #56509)
 - adding mapping for UTF8MB4 charset introduced with 5.5.3 (bug #58244)
 - return default values for text columns as quoted (bug #58167)
+- fixed our DDEX code so that dragging tables from server explorer onto a typed data set
+  preserves the table name (bug #57894)
 
 Version 6.3.5
 - Fix installer bug related to .NET FW 4.0 (bug #56580)

=== modified file 'MySql.VisualStudio/DDEX/MySqlDataObjectIdentifierConverter.cs'
--- a/MySql.VisualStudio/DDEX/MySqlDataObjectIdentifierConverter.cs	2010-08-30 21:23:16 +0000
+++ b/MySql.VisualStudio/DDEX/MySqlDataObjectIdentifierConverter.cs	2010-11-22 17:24:27 +0000
@@ -46,25 +46,18 @@
             if (typeName == "Table")
             {
                 DbConnection c = connection.ConnectionSupport.ProviderObject as DbConnection;
+                string dbName = FormatPart("Table", c.Database, true);
 
                 if (identifierParts.Length == 1) 
                     id = identifierParts[0];
-                if (identifierParts.Length == 2 && identifierParts[0] == c.Database)
+                if (identifierParts.Length == 2 && identifierParts[0] == dbName)
                     id = identifierParts[1];
-                if (identifierParts.Length == 3 && identifierParts[1] == c.Database)
+                if (identifierParts.Length == 3 && identifierParts[1] == dbName)
                     id = identifierParts[2];
             }
             if (id == String.Empty || forDisplay)
                 id = base.BuildString(typeName, identifierParts, forDisplay);
             return id;
         }
-
-        protected override string FormatPart(string typeName, object identifierPart, bool withQuotes)
-        {
-            DbConnection c = connection.ConnectionSupport.ProviderObject as DbConnection;
-            if (typeName == "Table" && identifierPart.Equals(c.Database))
-                return null;
-            return base.FormatPart(typeName, identifierPart, withQuotes);
-        }
     }
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]