Connector/NET commit: r1468 - in branches/5.2: . MySql.Data/Provider/Source/Types MySql.Data/Tests/Source

[rburnett]

Modified:
   branches/5.2/CHANGES
   branches/5.2/MySql.Data/Provider/Source/Types/MySqlDateTime.cs
   branches/5.2/MySql.Data/Tests/Source/DateTimeTests.cs
Log:
  - fixed problem with datetime formatting that causes an extra space to be included
between the date and time when sent to the server (bug #41021)


Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES	2008-12-03 17:29:44 UTC (rev 1467)
+++ branches/5.2/CHANGES	2008-12-03 17:31:47 UTC (rev 1468)
@@ -1,7 +1,9 @@
 Version 5.2.6
 - cleaned up how stored procedure execution operated when the user does or does not have
execute privs
   on the routine (bug #40139)
-  
+- fixed problem with datetime formatting that causes an extra space to be included
between the
+  date and time when sent to the server (bug #41021)
+      
 Version 5.2.5 - 11/14/2008
 - fixed problem with package registration that kept the DDEX provider from working (bug
#40726)
 

Modified: branches/5.2/MySql.Data/Provider/Source/Types/MySqlDateTime.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/Types/MySqlDateTime.cs	2008-12-03 17:29:44 UTC
(rev 1467)
+++ branches/5.2/MySql.Data/Provider/Source/Types/MySqlDateTime.cs	2008-12-03 17:31:47 UTC
(rev 1468)
@@ -256,7 +256,7 @@
 				val = String.Format("{0:0000}-{1:00}-{2:00}",
                     value.Year, value.Month, value.Day);
                 if (type != MySqlDbType.Date)
-                    val = String.Format("{0}  {1:00}:{2:00}:{3:00}", val,
+                    val = String.Format("{0} {1:00}:{2:00}:{3:00}", val,
                         value.Hour, value.Minute, value.Second);
 			}
 			stream.WriteStringNoNull("'" + val + "'");

Modified: branches/5.2/MySql.Data/Tests/Source/DateTimeTests.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Source/DateTimeTests.cs	2008-12-03 17:29:44 UTC (rev
1467)
+++ branches/5.2/MySql.Data/Tests/Source/DateTimeTests.cs	2008-12-03 17:31:47 UTC (rev
1468)
@@ -405,6 +405,26 @@
             MySqlDateTime mdt = new MySqlDateTime(dt);
             Assert.AreEqual(dt.ToString(), mdt.ToString());
         }
+
+        /// <summary>
+        /// Bug #41021	DateTime format incorrect
+        /// </summary>
+        [Test]
+        public void DateFormat()
+        {
+            DateTime dt = DateTime.Now;
+            MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES(1, ?dt, NULL,
NULL, NULL)", conn);
+            cmd.Parameters.Add("?dt", dt);
+            cmd.ExecuteNonQuery();
+
+            cmd.CommandText = "SELECT dt FROM Test WHERE DATE_FORMAT(DATE(dt),
GET_FORMAT(DATETIME, 'ISO'))=?datefilter";
+            cmd.Parameters.Clear();
+            cmd.Parameters.Add("?datefilter", dt.Date);
+            using (MySqlDataReader reader = cmd.ExecuteReader())
+            {
+                Assert.IsTrue(reader.Read());
+            }
+        }
     }
 
 }