Modified:
branches/5.0/TestSuite/BlobTests.cs
branches/5.0/TestSuite/CommandTests.cs
branches/5.0/TestSuite/DataReaderTests.cs
branches/5.0/TestSuite/DataTypeTests.cs
branches/5.0/TestSuite/DateTimeTests.cs
branches/5.0/TestSuite/ParameterTests.cs
branches/5.0/TestSuite/PerfMonTests.cs
branches/5.0/TestSuite/PreparedStatements.cs
branches/5.0/TestSuite/StoredProcedure.cs
branches/5.0/TestSuite/Syntax.cs
Log:
Converted calls to MySqlParameterCollection.Add that pass in a value to use the new
AddWithValue method to silence the compiler warnings about a deprecated method.
Modified: branches/5.0/TestSuite/BlobTests.cs
===================================================================
--- branches/5.0/TestSuite/BlobTests.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/BlobTests.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -153,7 +153,7 @@
data[x] = (char)(65 + (x % 20));
MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (1, NULL, ?text1)",
conn);
- cmd.Parameters.Add("?text1", data);
+ cmd.Parameters.AddWithValue("?text1", data);
if (prepare)
cmd.Prepare();
cmd.ExecuteNonQuery();
@@ -225,7 +225,7 @@
cmd.CommandText = "INSERT INTO Test VALUES(2, ?b1, ?t1)";
cmd.Parameters.Clear();
- cmd.Parameters.Add("?t1", DBNull.Value);
+ cmd.Parameters.AddWithValue("?t1", DBNull.Value);
string str = "This is my text value";
cmd.Parameters.Add(new MySqlParameter("?b1", MySqlDbType.LongBlob, str.Length,
ParameterDirection.Input, true, 0, 0, "b1", DataRowVersion.Current, str));
@@ -341,12 +341,12 @@
for (int x = 0; x < image.Length; x++)
image[x] = (byte)(x % 47);
MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES(NULL, ?image, ?size)",
conn);
- cmd.Parameters.Add("?image", image);
- cmd.Parameters.Add("?size", image.Length);
+ cmd.Parameters.AddWithValue("?image", image);
+ cmd.Parameters.AddWithValue("?size", image.Length);
cmd.ExecuteNonQuery();
cmd.CommandText = "SELECT imageSize, length(image), image FROM test WHERE id=?id";
- cmd.Parameters.Add("?id", 1);
+ cmd.Parameters.AddWithValue("?id", 1);
cmd.Prepare();
MySqlDataReader reader = null;
@@ -390,7 +390,7 @@
byte[] image = Utils.CreateBlob(1000000);
cmd.CommandText = "INSERT INTO test VALUES(NULL, ?image)";
- cmd.Parameters.Add("?image", image);
+ cmd.Parameters.AddWithValue("?image", image);
cmd.ExecuteNonQuery();
Assert.Fail("This should have thrown an exception");
}
Modified: branches/5.0/TestSuite/CommandTests.cs
===================================================================
--- branches/5.0/TestSuite/CommandTests.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/CommandTests.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -158,7 +158,7 @@
MySqlCommand clone = new MySqlCommand(cmd.CommandText,
(MySqlConnection)cmd.Connection,
(MySqlTransaction)cmd.Transaction);
- clone.Parameters.Add("?test", 1);
+ clone.Parameters.AddWithValue("?test", 1);
txn.Rollback();
}
Modified: branches/5.0/TestSuite/DataReaderTests.cs
===================================================================
--- branches/5.0/TestSuite/DataReaderTests.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/DataReaderTests.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -130,7 +130,7 @@
byte[] bytes = Utils.CreateBlob(len);
MySqlCommand cmd = new MySqlCommand(
"INSERT INTO Test (id, name, b1) VALUES(1, 'Test', ?b1)", conn);
- cmd.Parameters.Add("?b1", bytes);
+ cmd.Parameters.AddWithValue("?b1", bytes);
cmd.ExecuteNonQuery();
cmd.CommandText = "SELECT * FROM Test";
@@ -599,7 +599,7 @@
"SELECT id, dt, b1 FROM Test WHERE id < ?param1; "+
"SELECT b1 FROM Test WHERE id >= ?param1;", conn);
- cmd.Parameters.Add("?param1",50);
+ cmd.Parameters.AddWithValue("?param1",50);
reader = cmd.ExecuteReader();
Modified: branches/5.0/TestSuite/DataTypeTests.cs
===================================================================
--- branches/5.0/TestSuite/DataTypeTests.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/DataTypeTests.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -553,7 +553,7 @@
execSQL("CREATE TABLE test (val decimal(10,1))");
MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES(?dec)", conn);
- cmd.Parameters.Add("?dec", (decimal)2.4);
+ cmd.Parameters.AddWithValue("?dec", (decimal)2.4);
Assert.AreEqual(1, cmd.ExecuteNonQuery());
cmd.Prepare();
@@ -592,7 +592,7 @@
execSQL("CREATE TABLE test (val decimal(10,1))");
MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES(?dec)", conn);
- cmd.Parameters.Add("?dec", (decimal)2.4);
+ cmd.Parameters.AddWithValue("?dec", (decimal)2.4);
Assert.AreEqual(1, cmd.ExecuteNonQuery());
cmd.Prepare();
Modified: branches/5.0/TestSuite/DateTimeTests.cs
===================================================================
--- branches/5.0/TestSuite/DateTimeTests.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/DateTimeTests.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -135,7 +135,7 @@
DateTime now = DateTime.Now;
DateTime later = now.AddHours(1);
later = later.AddMilliseconds(later.Millisecond * -1);
- cmd.Parameters.Add("?someday", now );
+ cmd.Parameters.AddWithValue("?someday", now );
MySqlDataReader reader = null;
try
{
@@ -418,7 +418,7 @@
{
execSQL("INSERT INTO test VALUES(1, Now(), '0000-00-00', NULL, NULL)");
MySqlCommand cmd = new MySqlCommand("SELECT d FROM test WHERE id=?id", conn);
- cmd.Parameters.Add("?id", 1);
+ cmd.Parameters.AddWithValue("?id", 1);
cmd.Prepare();
MySqlDataReader reader = null;
try
Modified: branches/5.0/TestSuite/ParameterTests.cs
===================================================================
--- branches/5.0/TestSuite/ParameterTests.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/ParameterTests.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -220,8 +220,8 @@
conn2.Open();
MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id, name) VALUES (@id, @name)",
conn2);
- cmd.Parameters.Add( "@id", 33 );
- cmd.Parameters.Add( "@name", "Test" );
+ cmd.Parameters.AddWithValue( "@id", 33 );
+ cmd.Parameters.AddWithValue( "@name", "Test" );
cmd.ExecuteNonQuery();
MySqlDataReader reader = null;
@@ -371,7 +371,7 @@
public void UnTypedParameterBeingReused()
{
MySqlCommand cmd = new MySqlCommand("INSERT INTO test (id, dt) VALUES (?id,
?dt)", conn);
- cmd.Parameters.Add("?id", 1);
+ cmd.Parameters.AddWithValue("?id", 1);
MySqlParameter p = cmd.CreateParameter();
p.ParameterName = "?dt";
p.Value = DBNull.Value;
@@ -400,15 +400,15 @@
try
{
MySqlCommand cmd = new MySqlCommand("INSERT INTO test (id, name) VALUES
(?id, ?name)", conn);
- cmd.Parameters.Add("?id", 1);
- cmd.Parameters.Add("?name", "test");
+ cmd.Parameters.AddWithValue("?id", 1);
+ cmd.Parameters.AddWithValue("?name", "test");
cmd.ExecuteNonQuery();
cmd.CommandText = "INSERT INTO test (id, name, dt) VALUES (?id1, ?name1,
?id)";
cmd.Parameters[0].ParameterName = "?id1";
cmd.Parameters[0].Value = 2;
cmd.Parameters[1].ParameterName = "?name1";
- cmd.Parameters.Add("?id", DateTime.Now);
+ cmd.Parameters.AddWithValue("?id", DateTime.Now);
cmd.ExecuteNonQuery();
}
catch (Exception ex)
Modified: branches/5.0/TestSuite/PerfMonTests.cs
===================================================================
--- branches/5.0/TestSuite/PerfMonTests.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/PerfMonTests.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -69,7 +69,7 @@
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?id", 1);
+ cmd.Parameters.AddWithValue("?id", 1);
cmd.ExecuteScalar();
Assert.AreEqual(hardCount + 1, hardQuery.RawValue);
@@ -78,7 +78,7 @@
MySqlCommand cmd2 = new MySqlCommand("spTest", conn);
cmd2.CommandType = CommandType.StoredProcedure;
- cmd2.Parameters.Add("?id", 1);
+ cmd2.Parameters.AddWithValue("?id", 1);
cmd2.ExecuteScalar();
Assert.AreEqual(hardCount, hardQuery.RawValue);
Modified: branches/5.0/TestSuite/PreparedStatements.cs
===================================================================
--- branches/5.0/TestSuite/PreparedStatements.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/PreparedStatements.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -127,10 +127,10 @@
dt = dt.AddMilliseconds( dt.Millisecond * -1 );
TimeSpan ts = new TimeSpan( 8, 11, 44, 56, 501 );
- cmd.Parameters.Add( "?id", 1 );
- cmd.Parameters.Add( "?d", dt );
- cmd.Parameters.Add( "?dt", dt );
- cmd.Parameters.Add( "?tm", ts );
+ cmd.Parameters.AddWithValue("?id", 1);
+ cmd.Parameters.AddWithValue("?d", dt);
+ cmd.Parameters.AddWithValue("?dt", dt);
+ cmd.Parameters.AddWithValue("?tm", ts);
int count = cmd.ExecuteNonQuery();
Assert.AreEqual( 1, count, "Records affected by insert" );
@@ -264,9 +264,9 @@
byte[] bytes = Utils.CreateBlob( 400000 );
string inStr = "This is my text";
- cmd.Parameters.Add( "?id", 1 );
- cmd.Parameters.Add( "?blob1", bytes );
- cmd.Parameters.Add( "?text1", inStr );
+ cmd.Parameters.AddWithValue("?id", 1);
+ cmd.Parameters.AddWithValue("?blob1", bytes);
+ cmd.Parameters.AddWithValue("?text1", inStr);
int count = cmd.ExecuteNonQuery();
Assert.AreEqual( 1, count );
@@ -354,11 +354,11 @@
dt = dt.AddMilliseconds( dt.Millisecond * -1 );
byte[] xpDOSG_Avatar = Utils.CreateBlob( 13000 );
- cmd.Parameters.Add( "?name", "Ceci est un nom");
+ cmd.Parameters.AddWithValue("?name", "Ceci est un nom");
- cmd.Parameters.Add( "?desc", "Ceci est une description facile - cmd.Parameters.Add( "?avatar",xpDOSG_Avatar);
- cmd.Parameters.Add( "?dt", dt);
+ cmd.Parameters.AddWithValue("?desc", "Ceci est une description facile + cmd.Parameters.AddWithValue("?avatar",xpDOSG_Avatar);
+ cmd.Parameters.AddWithValue("?dt", dt);
int count = cmd.ExecuteNonQuery();
Assert.AreEqual( 1, count );
@@ -603,19 +603,19 @@
command.Connection = (MySqlConnection)conn;
command.Prepare();
- command.Parameters.Add("?id", (byte)127);
+ command.Parameters.AddWithValue("?id", (byte)127);
object count = command.ExecuteScalar();
Assert.AreEqual(1, count);
- command.Parameters.Add("?id", (byte)128);
+ command.Parameters.AddWithValue("?id", (byte)128);
count = command.ExecuteScalar();
Assert.AreEqual(1, count);
- command.Parameters.Add("?id", (byte)255);
+ command.Parameters.AddWithValue("?id", (byte)255);
count = command.ExecuteScalar();
Assert.AreEqual(1, count);
- command.Parameters.Add("?id", "255");
+ command.Parameters.AddWithValue("?id", "255");
count = command.ExecuteScalar();
Assert.AreEqual(1, count);
}
Modified: branches/5.0/TestSuite/StoredProcedure.cs
===================================================================
--- branches/5.0/TestSuite/StoredProcedure.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/StoredProcedure.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -88,7 +88,7 @@
//setup testing data
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?value", 2);
+ cmd.Parameters.AddWithValue("?value", 2);
int rowsAffected = cmd.ExecuteNonQuery();
Assert.AreEqual(1, rowsAffected);
@@ -185,7 +185,7 @@
{
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?p2", 1);
+ cmd.Parameters.AddWithValue("?p2", 1);
cmd.ExecuteNonQuery();
Assert.Fail("Should have thrown an exception");
}
@@ -202,7 +202,7 @@
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?valin", "myvalue");
+ cmd.Parameters.AddWithValue("?valin", "myvalue");
object val = cmd.ExecuteScalar();
Assert.AreEqual("myvalue", val);
}
@@ -216,9 +216,9 @@
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?strVal", "beginning");
- cmd.Parameters.Add("?numVal", 33);
- cmd.Parameters.Add("?outVal", MySqlDbType.Int32);
+ cmd.Parameters.AddWithValue("?strVal", "beginning");
+ cmd.Parameters.AddWithValue("?numVal", 33);
+ cmd.Parameters.AddWithValue("?outVal", MySqlDbType.Int32);
cmd.Parameters[0].Direction = ParameterDirection.InputOutput;
cmd.Parameters[1].Direction = ParameterDirection.InputOutput;
cmd.Parameters[2].Direction = ParameterDirection.Output;
@@ -253,7 +253,7 @@
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?valin", "valuein");
+ cmd.Parameters.AddWithValue("?valin", "valuein");
cmd.Parameters.Add(new MySqlParameter("?valout", MySqlDbType.VarChar));
cmd.Parameters[1].Direction = ParameterDirection.Output;
object result = cmd.ExecuteScalar();
@@ -383,7 +383,7 @@
MySqlCommand cmd = new MySqlCommand("spTest", c2);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("@valin", "value");
+ cmd.Parameters.AddWithValue("@valin", "value");
cmd.Parameters.Add(new MySqlParameter("@valout", MySqlDbType.VarChar));
cmd.Parameters[1].Direction = ParameterDirection.Output;
object result = cmd.ExecuteScalar();
@@ -416,8 +416,8 @@
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?valin", 20.4);
- cmd.Parameters.Add("?val2", 4);
+ cmd.Parameters.AddWithValue("?valin", 20.4);
+ cmd.Parameters.AddWithValue("?val2", 4);
decimal val = (decimal)cmd.ExecuteScalar();
Decimal d = new Decimal(20.4);
Assert.AreEqual(d, val);
@@ -443,7 +443,7 @@
" LANGUAGE SQL DETERMINISTIC BEGIN return valin * 2; END");
MySqlCommand cmd = new MySqlCommand("fnTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?valin", 22);
+ cmd.Parameters.AddWithValue("?valin", 22);
MySqlParameter retVal = cmd.CreateParameter();
retVal.ParameterName = "?retval";
retVal.MySqlDbType = MySqlDbType.Int32;
@@ -621,7 +621,7 @@
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?d", 21);
+ cmd.Parameters.AddWithValue("?d", 21);
decimal d = (decimal)cmd.ExecuteScalar();
Assert.AreEqual(21, d);
}
@@ -637,7 +637,7 @@
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?P", "This is my value");
+ cmd.Parameters.AddWithValue("?P", "This is my value");
string p = (string)cmd.ExecuteScalar();
Assert.AreEqual("This is my value", p);
}
@@ -654,7 +654,7 @@
execSQL("CREATE PROCEDURE spTest(\"@Param1\" text) BEGIN SELECT \"@Param1\"; END");
MySqlCommand cmd = new MySqlCommand("spTest", conn);
- cmd.Parameters.Add("?@Param1", "This is my value");
+ cmd.Parameters.AddWithValue("?@Param1", "This is my value");
cmd.CommandType = CommandType.StoredProcedure;
string val = (string)cmd.ExecuteScalar();
@@ -678,7 +678,7 @@
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?P", 33);
+ cmd.Parameters.AddWithValue("?P", 33);
cmd.Prepare();
int p = (int)cmd.ExecuteScalar();
@@ -698,12 +698,12 @@
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?id", 1);
- cmd.Parameters.Add("?str", "First record");
+ cmd.Parameters.AddWithValue("?id", 1);
+ cmd.Parameters.AddWithValue("?str", "First record");
cmd.ExecuteNonQuery();
- cmd.Parameters.Add("?id", 2);
- cmd.Parameters.Add("?str", "Second record");
+ cmd.Parameters.AddWithValue("?id", 2);
+ cmd.Parameters.AddWithValue("?str", "Second record");
cmd.ExecuteNonQuery();
MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn);
@@ -769,7 +769,7 @@
MySqlCommand cmd = conn.CreateCommand();
cmd.CommandType = CommandType.StoredProcedure;
cmd.CommandText = "spTest";
- cmd.Parameters.Add("?Name", "Item3");
+ cmd.Parameters.AddWithValue("?Name", "Item3");
cmd.Parameters.Add("?Table1Id", MySqlDbType.Int32);
cmd.Parameters["?Table1Id"].Direction = ParameterDirection.Output;
@@ -939,7 +939,7 @@
try
{
MySqlCommand cmd = new MySqlCommand("spTest", conn);
- cmd.Parameters.Add("?p_paramname", 2);
+ cmd.Parameters.AddWithValue("?p_paramname", 2);
cmd.CommandType = CommandType.StoredProcedure;
cmd.ExecuteScalar();
}
@@ -969,7 +969,7 @@
{
MySqlCommand cmd = new MySqlCommand("spTest", conn);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?p_enum", "P");
+ cmd.Parameters.AddWithValue("?p_enum", "P");
cmd.Parameters["?p_enum"].Direction = ParameterDirection.Input;
using (MySqlDataReader reader = cmd.ExecuteReader())
{
@@ -1027,10 +1027,10 @@
MySqlCommand cmd = new MySqlCommand("spTest", c);
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add("?id", 2);
- cmd.Parameters.Add("?outid", MySqlDbType.Int32);
+ cmd.Parameters.AddWithValue("?id", 2);
+ cmd.Parameters.AddWithValue("?outid", MySqlDbType.Int32);
cmd.Parameters[1].Direction = ParameterDirection.Output;
- cmd.Parameters.Add("?inoutid", 4);
+ cmd.Parameters.AddWithValue("?inoutid", 4);
cmd.Parameters[2].Direction = ParameterDirection.InputOutput;
cmd.ExecuteNonQuery();
Modified: branches/5.0/TestSuite/Syntax.cs
===================================================================
--- branches/5.0/TestSuite/Syntax.cs 2007-02-21 18:09:19 UTC (rev 602)
+++ branches/5.0/TestSuite/Syntax.cs 2007-02-21 18:39:43 UTC (rev 603)
@@ -72,9 +72,9 @@
c.Open();
MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (?id, ?text, ?mt)", c);
- cmd.Parameters.Add("?id", 1);
- cmd.Parameters.Add("?text", "This is my;test ? string- cmd.Parameters.Add("?mt", "My MT string: + cmd.Parameters.AddWithValue("?id", 1);
+ cmd.Parameters.AddWithValue("?text", "This is my;test ? string+ cmd.Parameters.AddWithValue("?mt", "My MT string: ?");
cmd.ExecuteNonQuery();
cmd.CommandText = "SELECT * FROM Test";
@@ -85,7 +85,7 @@
Assert.IsTrue(reader.Read());
Assert.AreEqual(1, reader.GetInt32(0));
Assert.AreEqual("This is my;test ? string- Assert.AreEqual("My MT string: + Assert.AreEqual("My MT string: ?", reader.GetString(2));
}
catch (Exception ex)
{
@@ -107,9 +107,9 @@
"PRIMARY KEY(id))");
MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (?id, ?text, ?mt)",
conn);
- cmd.Parameters.Add("?id", 1);
- cmd.Parameters.Add("?text", "This is my;test ? string-'''\"\".");
- cmd.Parameters.Add("?mt", "My MT string: + cmd.Parameters.AddWithValue("?id", 1);
+ cmd.Parameters.AddWithValue("?text", "This is my;test ? string-'''\"\".");
+ cmd.Parameters.AddWithValue("?mt", "My MT string: ?");
cmd.ExecuteNonQuery();
cmd.CommandText = "SELECT * FROM Test";
@@ -120,7 +120,7 @@
Assert.IsTrue(reader.Read());
Assert.AreEqual(1, reader.GetInt32(0));
Assert.AreEqual("This is my;test ? string-'''\"\".", reader.GetString(1));
- Assert.AreEqual("My MT string: + Assert.AreEqual("My MT string: ?", reader.GetString(2));
}
catch (Exception ex)
{
| Thread |
|---|
| • Connector/NET commit: r603 - branches/5.0/TestSuite | rburnett | 21 Feb |