From: Date: January 30 2007 11:38pm
Subject: Connector/NET commit: r573 - in branches/5.0: . Driver/Source
List-Archive: http://lists.mysql.com/commits/19051
X-Bug: 25950
Message-Id: <200701302238.l0UMcgAU004603@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   branches/5.0/CHANGES
   branches/5.0/Driver/Source/SchemaProvider.cs
Log:
Bug #25950 DataSourceInformation collection contains incorrect values 

Fixed ParameterMarkerPattern to conditionally include a leading @ or ? depending on the setting of UseOldSyntax.

Modified: branches/5.0/CHANGES
===================================================================
--- branches/5.0/CHANGES	2007-01-30 22:31:55 UTC (rev 572)
+++ branches/5.0/CHANGES	2007-01-30 22:38:42 UTC (rev 573)
@@ -12,7 +12,9 @@
   Bug #25609 MySqlDataAdapter.FillSchema 
   Bug #25928 Invalid Registry Entries 
   Bug #25912 selecting negative time values gets wrong results 
+  Bug #25906 Typo makes GetSchema with DataTypes collection throw an exception   
   Bug #25907 DataType Column of DataTypes collection does'nt contain the correct CLR Datatype   
+  Bug #25950 DataSourceInformation collection contains incorrect values 
   
   Other changes
   -------------

Modified: branches/5.0/Driver/Source/SchemaProvider.cs
===================================================================
--- branches/5.0/Driver/Source/SchemaProvider.cs	2007-01-30 22:31:55 UTC (rev 572)
+++ branches/5.0/Driver/Source/SchemaProvider.cs	2007-01-30 22:38:42 UTC (rev 573)
@@ -575,7 +575,8 @@
             row["IdentifierCase"] = IdentifierCase.Insensitive;
             row["OrderByColumnsInSelect"] = false;
             row["ParameterMarkerFormat"] = "{0}";
-            row["ParameterMarkerPattern"] = "@([A-Za-z0-9_$#]*)";
+            row["ParameterMarkerPattern"] = String.Format("{0}([A-Za-z0-9_$#]*)",
+                connection.Settings.UseOldSyntax ? "@" : "?");
             row["ParameterNameMaxLength"] = 128;
             row["ParameterNamePattern"] = @"^[\p{Lo}\p{Lu}\p{Ll}\p{Lm}_@#][\p{Lo}\p{Lu}\p{Ll}\p{Lm}\p{Nd}\uff3f_@#\$]*(?=\s+|$)";
             row["QuotedIdentifierPattern"] = @"(([^\[]|\]\])*)";