List:Commits« Previous MessageNext Message »
From:rburnett Date:August 18 2008 9:46pm
Subject:Connector/NET commit: r1384 - in trunk: . MySql.Data/Provider/Source MySql.Data/Provider/Source/Types MySql.Data/Tests/Source
View as plain text  
Modified:
   trunk/MySql.Data/Provider/Source/NativeDriver.cs
   trunk/MySql.Data/Provider/Source/Types/MySqlDouble.cs
   trunk/MySql.Data/Provider/Source/Types/MySqlSingle.cs
   trunk/MySql.Data/Tests/Source/DataTypeTests.cs
   trunk/MySql.Data/Tests/Source/EventTests.cs
   trunk/MySql.Data/Tests/Source/GetSchemaTests.cs
   trunk/MySql.Data/Tests/Source/MySqlHelperTests.cs
   trunk/README
Log:
NativeDriver.cs - fixed logging problem where the last character of the query was not being logged
MySqlDouble.cs & MySqlSingle.cs - merged "R" format fix from 5.2
DataTypeTests.cs - simple fixes for problems seen from running in strict mode
EventTests.cs - strict mode again
GetSchemaTests.cs - Just removed the namespace named from TestFixture
MySqlHelperTests.cs - removed the test case as it was old and not relevant any longer
README - updated version

Modified: trunk/MySql.Data/Provider/Source/NativeDriver.cs
===================================================================
--- trunk/MySql.Data/Provider/Source/NativeDriver.cs	2008-08-18 21:41:06 UTC (rev 1383)
+++ trunk/MySql.Data/Provider/Source/NativeDriver.cs	2008-08-18 21:46:28 UTC (rev 1384)
@@ -466,7 +466,7 @@
         {
             if (Settings.Logging)
                 Logger.LogCommand(DBCmd.QUERY, encoding.GetString(
-                    queryPacket.Buffer, 5, queryPacket.Length-4));
+                    queryPacket.Buffer, 5, queryPacket.Length-5));
 
             queryPacket.Buffer[4] = (byte)DBCmd.QUERY;
             ExecutePacket(queryPacket);

Modified: trunk/MySql.Data/Provider/Source/Types/MySqlDouble.cs
===================================================================
--- trunk/MySql.Data/Provider/Source/Types/MySqlDouble.cs	2008-08-18 21:41:06 UTC (rev 1383)
+++ trunk/MySql.Data/Provider/Source/Types/MySqlDouble.cs	2008-08-18 21:46:28 UTC (rev 1384)
@@ -86,7 +86,7 @@
 			if (binary)
                 packet.Write(BitConverter.GetBytes(v));
 			else
-                packet.WriteStringNoNull(v.ToString(CultureInfo.InvariantCulture));
+                packet.WriteStringNoNull(v.ToString("R", CultureInfo.InvariantCulture));
 		}
 
         IMySqlValue IMySqlValue.ReadValue(MySqlPacket packet, long length,

Modified: trunk/MySql.Data/Provider/Source/Types/MySqlSingle.cs
===================================================================
--- trunk/MySql.Data/Provider/Source/Types/MySqlSingle.cs	2008-08-18 21:41:06 UTC (rev 1383)
+++ trunk/MySql.Data/Provider/Source/Types/MySqlSingle.cs	2008-08-18 21:46:28 UTC (rev 1384)
@@ -85,7 +85,7 @@
 			if (binary)
                 packet.Write(BitConverter.GetBytes(v));
 			else
-                packet.WriteStringNoNull(v.ToString(
+                packet.WriteStringNoNull(v.ToString("R", 
 					 CultureInfo.InvariantCulture));
 		}
 

Modified: trunk/MySql.Data/Tests/Source/DataTypeTests.cs
===================================================================
--- trunk/MySql.Data/Tests/Source/DataTypeTests.cs	2008-08-18 21:41:06 UTC (rev 1383)
+++ trunk/MySql.Data/Tests/Source/DataTypeTests.cs	2008-08-18 21:46:28 UTC (rev 1384)
@@ -32,14 +32,6 @@
 	[TestFixture] 
 	public class DataTypeTests : BaseTest
 	{
-//		[SetUp]
-//		public override void Setup() 
-//		{
-//			base.Setup();
-        //
-		//	execSQL("CREATE TABLE Test (id INT NOT NULL, name VARCHAR(100), d DATE, dt DATETIME, tm TIME,  PRIMARY KEY(id))");
-		//}
-
 		[Test]
 		public void BytesAndBooleans() 
 		{
@@ -700,7 +692,7 @@
         {
             if (Version < new Version(5, 0)) return;
 
-            execSQL("CREATE TABLE Test (id INT, g BINARY(16), c VARBINARY(16), c1 BINARY(17))");
+            execSQL("CREATE TABLE Test (id INT, g BINARY(16), c VARBINARY(16), c1 BINARY(40))");
 
             Guid g = Guid.NewGuid();
             byte[] bytes = g.ToByteArray();
@@ -788,8 +780,7 @@
         {
             if (Version < new Version(5, 0)) return;
 
-            execSQL(@"CREATE TABLE Test (ID int(11) NOT NULL,
-                ogc_geom geometry NOT NULL default '',
+            execSQL(@"CREATE TABLE Test (ID int(11) NOT NULL, ogc_geom geometry NOT NULL,
                 PRIMARY KEY  (`ID`))");
             execSQL(@"INSERT INTO Test VALUES (1, 
                 GeomFromText('GeometryCollection(Point(1 1), LineString(2 2, 3 3))'))");

Modified: trunk/MySql.Data/Tests/Source/EventTests.cs
===================================================================
--- trunk/MySql.Data/Tests/Source/EventTests.cs	2008-08-18 21:41:06 UTC (rev 1383)
+++ trunk/MySql.Data/Tests/Source/EventTests.cs	2008-08-18 21:46:28 UTC (rev 1384)
@@ -35,13 +35,22 @@
 		{
             if (Version < new Version(4, 1)) return;
 
-			conn.InfoMessage += new MySqlInfoMessageEventHandler(WarningsInfoMessage);
-
             execSQL("CREATE TABLE Test (name VARCHAR(10))");
 
-			MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES ('12345678901')", conn);
-            using (MySqlDataReader reader = cmd.ExecuteReader())
+            string connStr = GetConnectionString(true);
+            using (MySqlConnection c = new MySqlConnection(connStr))
             {
+                c.Open();
+
+                MySqlCommand cmd = new MySqlCommand("SET SQL_MODE=''", c);
+                cmd.ExecuteNonQuery();
+
+			    c.InfoMessage += new MySqlInfoMessageEventHandler(WarningsInfoMessage);
+
+			    cmd.CommandText = "INSERT INTO Test VALUES ('12345678901')";
+                using (MySqlDataReader reader = cmd.ExecuteReader())
+                {
+                }
             }
 		}
 

Modified: trunk/MySql.Data/Tests/Source/GetSchemaTests.cs
===================================================================
--- trunk/MySql.Data/Tests/Source/GetSchemaTests.cs	2008-08-18 21:41:06 UTC (rev 1383)
+++ trunk/MySql.Data/Tests/Source/GetSchemaTests.cs	2008-08-18 21:46:28 UTC (rev 1384)
@@ -25,7 +25,7 @@
 
 namespace MySql.Data.MySqlClient.Tests
 {
-	[NUnit.Framework.TestFixture]
+	[TestFixture]
 	public class GetSchemaTests : BaseTest
 	{
 		[Test]

Modified: trunk/MySql.Data/Tests/Source/MySqlHelperTests.cs
===================================================================
--- trunk/MySql.Data/Tests/Source/MySqlHelperTests.cs	2008-08-18 21:41:06 UTC (rev 1383)
+++ trunk/MySql.Data/Tests/Source/MySqlHelperTests.cs	2008-08-18 21:46:28 UTC (rev 1384)
@@ -31,28 +31,5 @@
 	[TestFixture]
 	public class MySqlHelperTests : BaseTest
 	{
-        public override void Setup()
-        {
-            base.Setup();
-            execSQL("CREATE TABLE Test (id INT NOT NULL, name VARCHAR(250), PRIMARY KEY(id))");
-        }
-
-		/// <summary>
-		/// Bug #11490  	certain incorrect queries trigger connection must be valid and open message
-		/// </summary>
-		[Test]
-		public void Bug11490()
-		{
-            if (Version < new Version(4, 1)) return;
-
-            StringBuilder sb = new StringBuilder();
-            for (int i=0; i < 254; i++)
-                sb.Append('a');
-            string sql = "INSERT INTO Test (name) VALUES ('" + sb.ToString() + "')";
-            using (MySqlDataReader reader = MySqlHelper.ExecuteReader(this.GetConnectionString(true), sql))
-            {
-            }
-		}
-
 	}
 }

Modified: trunk/README
===================================================================
--- trunk/README	2008-08-18 21:41:06 UTC (rev 1383)
+++ trunk/README	2008-08-18 21:46:28 UTC (rev 1384)
@@ -1,4 +1,4 @@
-MySQL Connector/Net 5.2
+MySQL Connector/Net 5.3
 MySQL AB's ADO.Net Driver for MySQL
 Copyright (c) 2004-2007 MySQL AB
 

Thread
Connector/NET commit: r1384 - in trunk: . MySql.Data/Provider/Source MySql.Data/Provider/Source/Types MySql.Data/Tests/Sourcerburnett18 Aug