Connector/NET commit: r394 - in branches/1.0: TestSuite mysqlclient

[rburnett]

Modified:
   branches/1.0/TestSuite/DataAdapterTests.cs
   branches/1.0/TestSuite/DateTimeTests.cs
   branches/1.0/TestSuite/PoolingTests.cs
   branches/1.0/TestSuite/PreparedStatements.cs
   branches/1.0/mysqlclient/parameter_collection.cs
Log:
Another set of cleanups from release testing.

Modified: branches/1.0/TestSuite/DataAdapterTests.cs
===================================================================
--- branches/1.0/TestSuite/DataAdapterTests.cs	2006-10-06 19:18:28 UTC (rev 393)
+++ branches/1.0/TestSuite/DataAdapterTests.cs	2006-10-06 20:27:46 UTC (rev 394)
@@ -422,7 +422,8 @@
 		public void DefaultValues() 
 		{
 			execSQL("DROP TABLE IF EXISTS test");
-			execSQL("CREATE TABLE test (id int, name VARCHAR(20) NOT NULL DEFAULT 'abc', dt
TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
+			execSQL("CREATE TABLE test (id int, name VARCHAR(20) NOT NULL DEFAULT 'abc', " +
+				    "dt TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
 			
 			MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn);
 			MySqlCommand insCmd = new MySqlCommand("INSERT INTO test VALUES (?id, ?name, ?dt)",
conn);

Modified: branches/1.0/TestSuite/DateTimeTests.cs
===================================================================
--- branches/1.0/TestSuite/DateTimeTests.cs	2006-10-06 19:18:28 UTC (rev 393)
+++ branches/1.0/TestSuite/DateTimeTests.cs	2006-10-06 20:27:46 UTC (rev 394)
@@ -436,44 +436,45 @@
                     reader.Close();
             }
         }
-        
-        [Test]
-        public void DateTimeInDataTable()
-        {
-            execSQL("INSERT INTO test VALUES(1, Now(), '0000-00-00', NULL, NULL)");
 
-            MySqlConnection c = new MySqlConnection(
-                conn.ConnectionString + ";pooling=false;AllowZeroDatetime=true");
-            c.Open();
+		[Test]
+		public void DateTimeInDataTable()
+		{
+			execSQL("INSERT INTO test VALUES(1, Now(), '0000-00-00', NULL, NULL)");
 
-            MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c);
-            DataTable dt = new DataTable();
-            try
-            {
-                da.Fill(dt);
-                DataRow row = dt.NewRow();
-                row["id"] = 2;
-                row["dt"] = DateTime.Now;
-                row["d"] = DateTime.Now;
-                row["t"] = DateTime.Now;
-                row["ts"] = DBNull.Value;
-                dt.Rows.Add(row);
-                da.Update(dt);
+			MySqlConnection c = new MySqlConnection(
+				conn.ConnectionString + ";pooling=false;AllowZeroDatetime=true");
+			c.Open();
 
-                dt.Rows.Clear();
-                da.Fill(dt);
-                Assert.AreEqual(2, dt.Rows.Count);
-            }
-            catch (Exception ex)
-            {
-                Assert.Fail(ex.Message);
-            }
-            finally
-            {
-                if (c != null)
-                    c.Close();
-            }
-        }        
+			MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c);
+			MySqlCommandBuilder cb = new MySqlCommandBuilder(da);
+			DataTable dt = new DataTable();
+			try
+			{
+				da.Fill(dt);
+				DataRow row = dt.NewRow();
+				row["id"] = 2;
+				row["dt"] = new MySqlDateTime(DateTime.Now);
+				row["d"] = new MySqlDateTime(DateTime.Now);
+				row["t"] = new TimeSpan(1, 1, 1);
+				row["ts"] = DBNull.Value;
+				dt.Rows.Add(row);
+				da.Update(dt);
+
+				dt.Rows.Clear();
+				da.Fill(dt);
+				Assert.AreEqual(2, dt.Rows.Count);
+			}
+			catch (Exception ex)
+			{
+				Assert.Fail(ex.Message);
+			}
+			finally
+			{
+				if (c != null)
+					c.Close();
+			}
+		}          
 	}
 
 }

Modified: branches/1.0/TestSuite/PoolingTests.cs
===================================================================
--- branches/1.0/TestSuite/PoolingTests.cs	2006-10-06 19:18:28 UTC (rev 393)
+++ branches/1.0/TestSuite/PoolingTests.cs	2006-10-06 20:27:46 UTC (rev 394)
@@ -181,33 +181,5 @@
 			object var2 = cmd.ExecuteScalar();
 			Assert.AreEqual(DBNull.Value, var2);
 		}
-
-        [Test]
-        public void ExceedMaxAllowedPacket()
-        {
-            execSQL("DROP TABLE IF EXISTS test");
-			execSQL("CREATE TABLE test (b1 LONGBLOB)");
-
-            try
-            {
-                MySqlCommand cmd = new MySqlCommand("select @@global.max_allowed_packet",
conn);
-                object maxPacketSize = cmd.ExecuteScalar();
-
-                byte[] buffer = new byte[(UInt64)maxPacketSize + 100];
-                cmd.CommandText = "INSERT INTO test vALUES (?b1)";
-                cmd.Parameters.Add("b1", buffer);
-                cmd.ExecuteNonQuery();
-            }
-            catch (MySqlException mex)
-            {
-                Assert.IsTrue(conn.State == ConnectionState.Open);
-                Assert.AreEqual((int)MySqlErrorCode.PacketTooLarge, mex.Number);
-            }
-            catch (Exception ex)
-            {
-                Assert.Fail(ex.Message);
-            }
-        }
-        
 	}
 }

Modified: branches/1.0/TestSuite/PreparedStatements.cs
===================================================================
--- branches/1.0/TestSuite/PreparedStatements.cs	2006-10-06 19:18:28 UTC (rev 393)
+++ branches/1.0/TestSuite/PreparedStatements.cs	2006-10-06 20:27:46 UTC (rev 394)
@@ -402,7 +402,7 @@
 			cmd.CommandText = "SELECT * FROM test where one = ?p1";
 			// create the parameter
 			IDbDataParameter p1 = cmd.CreateParameter();
-			p1.ParameterName = "p1";
+			p1.ParameterName = "?p1";
 			p1.DbType = DbType.Int32;
 			p1.Precision = (byte)10;
 			p1.Scale = (byte)0;
@@ -484,14 +484,14 @@
 			MySqlCommand cmd = new MySqlCommand("Insert into test (input, " +
 				"state, score) VALUES (?input, ?st, ?sc) ON DUPLICATE KEY " +
 				"UPDATE state=state|?st;", conn);
-			cmd.Parameters.Add (new MySqlParameter("?input", ""));
-			cmd.Parameters.Add (new MySqlParameter("?st", Convert.ToInt32(0)));
-			cmd.Parameters.Add (new MySqlParameter("?sc", Convert.ToInt32 (0)));
+			cmd.Parameters.Add(new MySqlParameter("?input", ""));
+			cmd.Parameters.Add(new MySqlParameter("?st", Convert.ToInt32(0)));
+			cmd.Parameters.Add(new MySqlParameter("?sc", Convert.ToInt32 (0)));
 			cmd.Prepare();
 
-			cmd.Parameters["input"].Value = "test";
-			cmd.Parameters["st"].Value = 1;
-			cmd.Parameters["sc"].Value = 42;
+			cmd.Parameters["?input"].Value = "test";
+			cmd.Parameters["?st"].Value = 1;
+			cmd.Parameters["?sc"].Value = 42;
 			int result = cmd.ExecuteNonQuery();
 			Assert.AreEqual(1, result);
 

Modified: branches/1.0/mysqlclient/parameter_collection.cs
===================================================================
--- branches/1.0/mysqlclient/parameter_collection.cs	2006-10-06 19:18:28 UTC (rev 393)
+++ branches/1.0/mysqlclient/parameter_collection.cs	2006-10-06 20:27:46 UTC (rev 394)
@@ -39,19 +39,19 @@
 	{
 		private ArrayList	_parms = new ArrayList();
 		private char		paramMarker = '?';
-    private Hashtable ciHash;
-    private Hashtable hash;
+		private Hashtable ciHash;
+		private Hashtable hash;
 
-    public MySqlParameterCollection()
-    {
-      hash = new Hashtable();
-#if NET20
-      ciHash = new Hashtable(StringComparer.CurrentCultureIgnoreCase);
-#else
-      ciHash = new Hashtable(new CaseInsensitiveHashCodeProvider(),
-        new CaseInsensitiveComparer());
-#endif
-    }
+		public MySqlParameterCollection()
+		{
+			hash = new Hashtable();
+	#if NET20
+			ciHash = new Hashtable(StringComparer.CurrentCultureIgnoreCase);
+	#else
+			ciHash = new Hashtable(new CaseInsensitiveHashCodeProvider(),
+				new CaseInsensitiveComparer());
+	#endif
+		}
 
 		internal char ParameterMarker 
 		{
@@ -106,8 +106,8 @@
 		public void Clear()
 		{
 			_parms.Clear();
-      hash.Clear();
-      ciHash.Clear();
+			hash.Clear();
+			ciHash.Clear();
 		}
 
 		/// <summary>
@@ -196,7 +196,8 @@
 			if (p.ParameterName == null || p.ParameterName == String.Empty)
 				throw new MySqlException("Parameters must be named");
 
-			return _parms.Add(value);
+			p = Add(p);
+			return IndexOf(p);
 		}
 
 		#endregion
@@ -220,12 +221,12 @@
 		/// <returns>The zero-based location of the <see cref="MySqlParameter"/> in
the collection.</returns>
 		public int IndexOf(string parameterName)
 		{
-      object o = hash[parameterName];
-      if (o == null)
-        o = ciHash[parameterName];
-      if (o == null)
-        return -1;
-      return (int)o;
+			object o = hash[parameterName];
+			if (o == null)
+				o = ciHash[parameterName];
+			if (o == null)
+				return -1;
+			return (int)o;
 		}
 
 		/// <summary>
@@ -309,8 +310,8 @@
 			}
 
 			int index = _parms.Add(value);
-      hash.Add(value.ParameterName, index);
-      ciHash.Add(value.ParameterName, index);
+			hash.Add(value.ParameterName, index);
+			ciHash.Add(value.ParameterName, index);
 			return value;
 		}
 
@@ -335,7 +336,7 @@
         /// <returns>The newly added <see cref="MySqlParameter"/>
object.</returns>
         public MySqlParameter Add(string parameterName, object value)
 		{
-			return Add( new MySqlParameter( parameterName, value ) );
+			return Add(new MySqlParameter(parameterName, value));
 		}
 
 		/// <summary>
@@ -358,7 +359,7 @@
 		/// <returns>The newly added <see cref="MySqlParameter"/>
object.</returns>
 		public MySqlParameter Add(string parameterName, MySqlDbType dbType, int size)
 		{
-			return Add(new MySqlParameter(parameterName, dbType, size ));
+			return Add(new MySqlParameter(parameterName, dbType, size));
 		}
 
 		/// <summary>