Connector/NET commit: r753 - in trunk: . Driver/Source VisualStudio

[rburnett]

Modified:
   trunk/CHANGES
   trunk/Driver/Source/CommandBuilder.cs
   trunk/VisualStudio/MySqlDataSourceInformation.cs
Log:
Bug #26347	Update commands not being generated with TableAdapter wizard

The problem was caused by the confusion between schema and catalog.  We use schema to mean database and indicate that we do not support catalog.  However, in our MySqlDataSourceInformation class we were not returning null for the DefaultCatalog property. This was causing the QPA inside Visual studio to return a table name of the form <schema>.<schema>.<table_name> which obviously is not going to work.  We also needed to fix a problem in parameter name generation in our commandbuilder class.

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2007-06-08 15:39:23 UTC (rev 752)
+++ trunk/CHANGES	2007-06-11 20:29:02 UTC (rev 753)
@@ -3,6 +3,8 @@
     was visible but did not work and  user management did not work.
   - Reintroduced code to properly return field values as byte[] when the binary flag is present.
     (See release notes)    
+  - Fixed problem preventing the DataSet Designer or TableAdapter wizard from being
+    able to generate insert, update, and delete statements. (Bug #26347)    
     
 Version 5.1.1
   - Fixed password property on MySqlConnectionStringBuilder to use PasswordPropertyText 

Modified: trunk/Driver/Source/CommandBuilder.cs
===================================================================
--- trunk/Driver/Source/CommandBuilder.cs	2007-06-08 15:39:23 UTC (rev 752)
+++ trunk/Driver/Source/CommandBuilder.cs	2007-06-11 20:29:02 UTC (rev 753)
@@ -202,7 +202,8 @@
             sb.Replace("<", "_lt_");
             sb.Replace(">", "_gt_");
             sb.Replace(".", "_pt_");
-            return sb.ToString();
+            return String.Format("{0}{1}",
+                ParameterMarker, sb.ToString());
         }
 
         protected override DbCommand InitializeCommand(DbCommand command)

Modified: trunk/VisualStudio/MySqlDataSourceInformation.cs
===================================================================
--- trunk/VisualStudio/MySqlDataSourceInformation.cs	2007-06-08 15:39:23 UTC (rev 752)
+++ trunk/VisualStudio/MySqlDataSourceInformation.cs	2007-06-11 20:29:02 UTC (rev 753)
@@ -19,12 +19,8 @@
  */
 
 using System;
-using System.Data;
-using System.Diagnostics;
-using System.Data.SqlClient;
 using Microsoft.VisualStudio.Data;
 using Microsoft.VisualStudio.Data.AdoDotNet;
-using MySql.Data.VisualStudio.Properties;
 
 namespace MySql.Data.VisualStudio
 {
@@ -59,6 +55,7 @@
             AddProperty(SchemaSeparator, ".");
             AddProperty(ParameterPrefix, "?");
             AddProperty(ParameterPrefixInName, true);
+            AddProperty(DefaultCatalog, null);
         } 
         #endregion