From: Date: November 5 2007 11:31pm
Subject: Connector/NET commit: r1074 - in branches/5.1: . Driver/Source Driver/Source/Types TestSuite/Source
List-Archive: http://lists.mysql.com/commits/37150
X-Bug: 26344
Message-Id: <200711052231.lA5MVqnT015317@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Modified:
branches/5.1/CHANGES
branches/5.1/Driver/Source/Field.cs
branches/5.1/Driver/Source/MysqlDefs.cs
branches/5.1/Driver/Source/Types/MetaData.cs
branches/5.1/Driver/Source/Types/MySqlDateTime.cs
branches/5.1/Driver/Source/parameter.cs
branches/5.1/TestSuite/Source/StoredProcedure.cs
Log:
Marked MySqlDbType.Datetime obsolete; replaced with DateTime (just corrected capitalization) (Bug #26344)
Modified: branches/5.1/CHANGES
===================================================================
--- branches/5.1/CHANGES 2007-11-05 22:27:03 UTC (rev 1073)
+++ branches/5.1/CHANGES 2007-11-05 22:31:52 UTC (rev 1074)
@@ -13,6 +13,8 @@
- Fixed problem with web providers not being usable on medium trust systems
- Fixed problem with installer where attempting to install over a failed uninstall could
leave multiple clients registered in machine.config. (Bug #31731)
+ - Marked MySqlDbType.Datetime obsolete; replaced with DateTime (just corrected capitalization) (Bug #26344)
+
Version 5.1.3 - 9/19/2007
- Fixed problem with using a stored procedure that takes a parameter as a select routine
Modified: branches/5.1/Driver/Source/Field.cs
===================================================================
--- branches/5.1/Driver/Source/Field.cs 2007-11-05 22:27:03 UTC (rev 1073)
+++ branches/5.1/Driver/Source/Field.cs 2007-11-05 22:31:52 UTC (rev 1074)
@@ -308,7 +308,7 @@
case MySqlDbType.Time:
return new MySqlTimeSpan();
case MySqlDbType.Date:
- case MySqlDbType.Datetime:
+ case MySqlDbType.DateTime:
case MySqlDbType.Newdate:
case MySqlDbType.Timestamp:
return new MySqlDateTime(type, true);
Modified: branches/5.1/Driver/Source/MysqlDefs.cs
===================================================================
--- branches/5.1/Driver/Source/MysqlDefs.cs 2007-11-05 22:27:03 UTC (rev 1073)
+++ branches/5.1/Driver/Source/MysqlDefs.cs 2007-11-05 22:31:52 UTC (rev 1074)
@@ -162,7 +162,9 @@
///DateTime The supported range is '1000-01-01 00:00:00' to
///'9999-12-31 23:59:59'.
///
+ [Obsolete("The Datetime enum value is obsolete. Please use DateTime.")]
Datetime = 12,
+ DateTime = 12,
///
/// A year in 2- or 4-digit format (default is 4-digit). The
/// allowable values are 1901 to 2155, 0000 in the 4-digit year
Modified: branches/5.1/Driver/Source/Types/MetaData.cs
===================================================================
--- branches/5.1/Driver/Source/Types/MetaData.cs 2007-11-05 22:27:03 UTC (rev 1073)
+++ branches/5.1/Driver/Source/Types/MetaData.cs 2007-11-05 22:31:52 UTC (rev 1074)
@@ -57,7 +57,7 @@
case "char": return MySqlDbType.String;
case "varchar": return MySqlDbType.VarChar;
case "date": return MySqlDbType.Date;
- case "datetime": return MySqlDbType.Datetime;
+ case "datetime": return MySqlDbType.DateTime;
case "numeric":
case "decimal":
case "dec":
Modified: branches/5.1/Driver/Source/Types/MySqlDateTime.cs
===================================================================
--- branches/5.1/Driver/Source/Types/MySqlDateTime.cs 2007-11-05 22:27:03 UTC (rev 1073)
+++ branches/5.1/Driver/Source/Types/MySqlDateTime.cs 2007-11-05 22:31:52 UTC (rev 1074)
@@ -48,7 +48,7 @@
/// The minute to use.
/// The second to use.
public MySqlDateTime(int year, int month, int day, int hour, int minute, int second)
- : this(MySqlDbType.Datetime, year, month, day, hour, minute, second)
+ : this(MySqlDbType.DateTime, year, month, day, hour, minute, second)
{
}
@@ -57,7 +57,7 @@
///
/// The object to copy.
public MySqlDateTime(DateTime dt)
- : this(MySqlDbType.Datetime, dt)
+ : this(MySqlDbType.DateTime, dt)
{
}
@@ -74,7 +74,7 @@
minute = mdt.Minute;
second = mdt.Second;
millisecond = 0;
- type = MySqlDbType.Datetime;
+ type = MySqlDbType.DateTime;
isNull = false;
}
@@ -493,7 +493,7 @@
{
string[] types = new string[] { "DATE", "DATETIME", "TIMESTAMP" };
MySqlDbType[] dbtype = new MySqlDbType[] { MySqlDbType.Date,
- MySqlDbType.Datetime, MySqlDbType.Timestamp };
+ MySqlDbType.DateTime, MySqlDbType.Timestamp };
// we use name indexing because this method will only be called
// when GetSchema is called for the DataSourceInformation
Modified: branches/5.1/Driver/Source/parameter.cs
===================================================================
--- branches/5.1/Driver/Source/parameter.cs 2007-11-05 22:27:03 UTC (rev 1073)
+++ branches/5.1/Driver/Source/parameter.cs 2007-11-05 22:31:52 UTC (rev 1074)
@@ -407,7 +407,7 @@
dbType = DbType.Double;
break;
case MySqlDbType.Timestamp:
- case MySqlDbType.Datetime:
+ case MySqlDbType.DateTime:
dbType = DbType.DateTime;
break;
case MySqlDbType.Date:
@@ -465,7 +465,7 @@
mySqlDbType = MySqlDbType.Date;
break;
case DbType.DateTime:
- mySqlDbType = MySqlDbType.Datetime;
+ mySqlDbType = MySqlDbType.DateTime;
break;
case DbType.Time:
Modified: branches/5.1/TestSuite/Source/StoredProcedure.cs
===================================================================
--- branches/5.1/TestSuite/Source/StoredProcedure.cs 2007-11-05 22:27:03 UTC (rev 1073)
+++ branches/5.1/TestSuite/Source/StoredProcedure.cs 2007-11-05 22:31:52 UTC (rev 1074)
@@ -136,7 +136,7 @@
cmd.CommandType = CommandType.StoredProcedure;
cmd.Parameters.Add(new MySqlParameter("?value", MySqlDbType.VarChar));
cmd.Parameters.Add(new MySqlParameter("?intVal", MySqlDbType.Int32));
- cmd.Parameters.Add(new MySqlParameter("?dateVal", MySqlDbType.Datetime));
+ cmd.Parameters.Add(new MySqlParameter("?dateVal", MySqlDbType.DateTime));
cmd.Parameters.Add(new MySqlParameter("?floatVal", MySqlDbType.Float));
MySqlParameter vcP = new MySqlParameter();
vcP.ParameterName = "?noTypeVarChar";
@@ -642,7 +642,7 @@
Assert.AreEqual(2, cmd.Parameters.Count);
Assert.AreEqual("?v1", cmd.Parameters[0].ParameterName);
Assert.AreEqual(ParameterDirection.Input, cmd.Parameters[0].Direction);
- Assert.AreEqual(MySqlDbType.Datetime, cmd.Parameters[0].MySqlDbType);
+ Assert.AreEqual(MySqlDbType.DateTime, cmd.Parameters[0].MySqlDbType);
Assert.AreEqual(ParameterDirection.ReturnValue, cmd.Parameters[1].Direction);
Assert.AreEqual(MySqlDbType.Int32, cmd.Parameters[1].MySqlDbType);
@@ -1380,7 +1380,7 @@
da.Fill(ds);
Assert.Fail("The above should have thrown an exception");
}
- catch (Exception ex)
+ catch (Exception)
{
}
}