bzr commit into connector-net-6.0 branch (reggie.burnett:733) Bug#46100

[Reggie Burnett]

#At file:///C:/bzr-connector-net/6.0/ based on revid:vvaintroub@stripped

  733 Reggie Burnett	2009-07-31
      - fixed bug where editing a table and giving a size based type that is different than
        the default (i.e. varchar(20)) would cause other columns that have the default
        to fail (bug #46100)

    modified:
      CHANGES
      MySql.VisualStudio/Editors/TableEditor.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2009-07-30 13:09:29 +0000
+++ b/CHANGES	2009-07-31 20:10:46 +0000
@@ -4,6 +4,9 @@
 - we are now throwing an exception when DeriveParameters is unable to successfully populate
   the parameters array.  This exception explains what is wrong (bug #45952)  
 - fixed potential infinite loop in LoadPacket(), when read from a stream returns 0. (bug#46308)
+- fixed bug where editing a table and giving a size based type that is different than
+  the default (i.e. varchar(20)) would cause other columns that have the default
+  to fail (bug #46100)
   
 Version 6.0.4
 - fixed regression where using stored procs with datasets (bug #44460)

=== modified file 'MySql.VisualStudio/Editors/TableEditor.cs'
--- a/MySql.VisualStudio/Editors/TableEditor.cs	2009-04-21 18:02:13 +0000
+++ b/MySql.VisualStudio/Editors/TableEditor.cs	2009-07-31 20:10:46 +0000
@@ -446,32 +446,12 @@
             }
         }
 
-        private bool InsertType(string type)
-        {
-            int index = type.IndexOf("(");
-            if (index == -1) return false;
-
-            string baseType = type.Substring(0, index);
-            for (int i = 0; i < TypeColumn.Items.Count; i++)
-            {
-                string s = TypeColumn.Items[i] as string;
-                if (s.StartsWith(baseType))
-                {
-                    TypeColumn.Items[i] = type;
-                    break;
-                }
-            }
-            return true;
-        }
-
         private void columnGrid_CellValidating(object sender, DataGridViewCellValidatingEventArgs e)
         {
             if (e.ColumnIndex != 1) return;
             string type = e.FormattedValue as string;
             if (String.IsNullOrEmpty(type)) return;
-            if (TypeColumn.Items.Contains(type)) return;
-
-            if (!InsertType(type))
+            if (!TypeColumn.Items.Contains(type))
                 TypeColumn.Items.Add(type);
             columnGrid.CurrentCell.Value = e.FormattedValue;
         }


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