Connector/NET commit: r1349 - in branches/5.1: . Driver/Source/Types TestSuite/Source

[rburnett]

Modified:
   branches/5.1/CHANGES
   branches/5.1/Driver/Source/Types/MySqlDouble.cs
   branches/5.1/Driver/Source/Types/MySqlSingle.cs
   branches/5.1/TestSuite/Source/DataTypeTests.cs
Log:
merged

Modified: branches/5.1/CHANGES
===================================================================
--- branches/5.1/CHANGES	2008-07-22 13:51:41 UTC (rev 1348)
+++ branches/5.1/CHANGES	2008-07-22 19:16:42 UTC (rev 1349)
@@ -154,7 +154,9 @@
     close the connection.  (bug #37991)
   - Fixed problem with byte and unsigned byte values writing more too many bytes when
     using prepared statements (bug #37968)      
-    
+  - Fixed writing of single and double values to write out the proper number of digits
+    (bug #33322)
+        
 Version 5.0.9 - 4/14/08
 
   - Fixed problem where fields that were blobs but did not include the BLOB flag were treated

Modified: branches/5.1/Driver/Source/Types/MySqlDouble.cs
===================================================================
--- branches/5.1/Driver/Source/Types/MySqlDouble.cs	2008-07-22 13:51:41 UTC (rev 1348)
+++ branches/5.1/Driver/Source/Types/MySqlDouble.cs	2008-07-22 19:16:42 UTC (rev 1349)
@@ -86,7 +86,7 @@
 			if (binary)
 				stream.Write(BitConverter.GetBytes(v));
 			else
-				stream.WriteStringNoNull(v.ToString(
+				stream.WriteStringNoNull(v.ToString("R",
 					 CultureInfo.InvariantCulture));
 		}
 

Modified: branches/5.1/Driver/Source/Types/MySqlSingle.cs
===================================================================
--- branches/5.1/Driver/Source/Types/MySqlSingle.cs	2008-07-22 13:51:41 UTC (rev 1348)
+++ branches/5.1/Driver/Source/Types/MySqlSingle.cs	2008-07-22 19:16:42 UTC (rev 1349)
@@ -85,7 +85,7 @@
 			if (binary)
 				stream.Write(BitConverter.GetBytes(v));
 			else
-				stream.WriteStringNoNull(v.ToString(
+				stream.WriteStringNoNull(v.ToString("R",
 					 CultureInfo.InvariantCulture));
 		}
 

Modified: branches/5.1/TestSuite/Source/DataTypeTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/DataTypeTests.cs	2008-07-22 13:51:41 UTC (rev 1348)
+++ branches/5.1/TestSuite/Source/DataTypeTests.cs	2008-07-22 19:16:42 UTC (rev 1349)
@@ -904,5 +904,28 @@
                 reader.Read();
             }
         }
-	}
+
+        /// <summary>
+        /// Bug #33322 Incorrect Double/Single value saved to MySQL database using MySQL Connector for  
+        /// </summary>
+        [Test]
+        public void StoringAndRetrievingDouble()
+        {
+            execSQL("DROP TABLE IF EXISTS Test");
+            execSQL("CREATE TABLE Test (v DOUBLE(25,20) NOT NULL)");
+
+            MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (?v)", conn);
+            cmd.Parameters.Add("?v", MySqlDbType.Double);
+            cmd.Parameters[0].Value = Math.PI;
+            cmd.ExecuteNonQuery();
+
+            cmd.CommandText = "SELECT * FROM Test";
+            using (MySqlDataReader reader = cmd.ExecuteReader())
+            {
+                reader.Read();
+                double d = reader.GetDouble(0);
+                Assert.AreEqual(Math.PI, d);
+            }
+        }
+    }
 }