Modified:
trunk/mysqlclient/MysqlDefs.cs
trunk/mysqlclient/Types/MySqlBinary.cs
trunk/mysqlclient/Types/MySqlBit.cs
trunk/mysqlclient/Types/MySqlByte.cs
trunk/mysqlclient/Types/MySqlDateTime.cs
trunk/mysqlclient/Types/MySqlDecimal.cs
trunk/mysqlclient/Types/MySqlDouble.cs
trunk/mysqlclient/Types/MySqlInt16.cs
trunk/mysqlclient/Types/MySqlInt32.cs
trunk/mysqlclient/Types/MySqlInt64.cs
trunk/mysqlclient/Types/MySqlSingle.cs
trunk/mysqlclient/Types/MySqlString.cs
trunk/mysqlclient/Types/MySqlTime.cs
trunk/mysqlclient/Types/MySqlUByte.cs
trunk/mysqlclient/Types/MySqlUInt16.cs
trunk/mysqlclient/Types/MySqlUInt32.cs
trunk/mysqlclient/Types/MySqlUInt64.cs
Log:
MysqlDefs
Removed definition of MySqlCommandType (not being used)
All other files
Cleaned up how we implement IMySqlValue members
Modified: trunk/mysqlclient/MysqlDefs.cs
===================================================================
--- trunk/mysqlclient/MysqlDefs.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/MysqlDefs.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -322,23 +322,4 @@
/// </summary>
Embedded
}
-
- /// <summary>
- /// Specifies command types that are specific to MySQL.
- /// </summary>
- public enum MySqlCommandType
- {
- /// <summary>
- /// Direct SQL execution.
- /// </summary>
- Text,
- /// <summary>
- /// Used to execute a stored procedure.
- /// </summary>
- StoredProcedure,
- /// <summary>
- /// Use to execute a stored function.
- /// </summary>
- StoredFunction
- }
}
Modified: trunk/mysqlclient/Types/MySqlBinary.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlBinary.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlBinary.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -52,12 +52,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return type; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.Binary; }
}
@@ -72,12 +72,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(byte[]); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get
{
Modified: trunk/mysqlclient/Types/MySqlBit.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlBit.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlBit.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -45,12 +45,12 @@
get { return isNull; }
}
- public MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.Bit; }
}
- public DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.UInt64; }
}
@@ -65,7 +65,7 @@
get { return typeof(UInt64); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "BIT"; }
}
Modified: trunk/mysqlclient/Types/MySqlByte.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlByte.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlByte.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -49,12 +49,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.Byte; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.SByte; }
}
@@ -69,12 +69,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(sbyte); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "TINYINT"; }
}
Modified: trunk/mysqlclient/Types/MySqlDateTime.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlDateTime.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlDateTime.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -137,12 +137,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return type; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get
{
@@ -162,12 +162,12 @@
get { return GetDateTime(); }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(DateTime); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get
{
Modified: trunk/mysqlclient/Types/MySqlDecimal.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlDecimal.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlDecimal.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -54,7 +54,7 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.Decimal; }
}
@@ -72,7 +72,7 @@
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.Decimal; }
}
@@ -87,12 +87,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(decimal); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "DECIMAL"; }
}
Modified: trunk/mysqlclient/Types/MySqlDouble.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlDouble.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlDouble.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -50,12 +50,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.Double; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.Double; }
}
@@ -70,12 +70,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(double); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "DOUBLE"; }
}
Modified: trunk/mysqlclient/Types/MySqlInt16.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlInt16.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlInt16.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -50,12 +50,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.Int16; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.Int16; }
}
@@ -70,12 +70,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(short); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "SMALLINT"; }
}
Modified: trunk/mysqlclient/Types/MySqlInt32.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlInt32.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlInt32.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -20,7 +20,8 @@
using System;
using System.Data;
-using MySql.Data.MySqlClient;
+using MySql.Data.MySqlClient;
+using System.Globalization;
namespace MySql.Data.Types
{
@@ -55,12 +56,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.Int32; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.Int32; }
}
@@ -75,12 +76,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(Int32); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return is24Bit ? "MEDIUMINT" : "INT"; }
}
@@ -96,14 +97,16 @@
IMySqlValue IMySqlValue.ReadValue(MySqlStream stream, long length, bool nullVal)
{
- if (nullVal)
- return new MySqlInt32(MySqlDbType, true);
+ if (nullVal)
+ return new MySqlInt32((this as IMySqlValue).MySqlDbType, true);
- if (length == -1)
- return new MySqlInt32(MySqlDbType, stream.ReadInteger(4));
- else
- return new MySqlInt32(MySqlDbType, Int32.Parse(
- stream.ReadString(length )));
+ if (length == -1)
+ return new MySqlInt32((this as IMySqlValue).MySqlDbType,
+ stream.ReadInteger(4));
+ else
+ return new MySqlInt32((this as IMySqlValue).MySqlDbType,
+ Int32.Parse(stream.ReadString(length),
+ CultureInfo.InvariantCulture));
}
void IMySqlValue.SkipValue(MySqlStream stream)
Modified: trunk/mysqlclient/Types/MySqlInt64.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlInt64.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlInt64.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -49,12 +49,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.Int64; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.Int64; }
}
@@ -69,12 +69,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(long); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "BIGINT"; }
}
Modified: trunk/mysqlclient/Types/MySqlSingle.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlSingle.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlSingle.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -50,12 +50,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.Float; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.Single; }
}
@@ -70,12 +70,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(float); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "FLOAT"; }
}
Modified: trunk/mysqlclient/Types/MySqlString.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlString.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlString.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -53,12 +53,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return type; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.String; }
}
@@ -73,12 +73,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(string); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return type == MySqlDbType.Set ? "SET" : type == MySqlDbType.Enum ? "ENUM" : "VARCHAR"; }
}
Modified: trunk/mysqlclient/Types/MySqlTime.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlTime.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlTime.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -49,12 +49,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.Time; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.Time; }
}
@@ -69,12 +69,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(TimeSpan); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "TIME"; }
}
Modified: trunk/mysqlclient/Types/MySqlUByte.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlUByte.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlUByte.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -49,12 +49,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.UByte; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.Byte; }
}
@@ -69,12 +69,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(byte); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "TINYINT"; }
}
Modified: trunk/mysqlclient/Types/MySqlUInt16.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlUInt16.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlUInt16.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -49,12 +49,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.UInt16; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.UInt16; }
}
@@ -69,12 +69,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(ushort); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "SMALLINT"; }
}
Modified: trunk/mysqlclient/Types/MySqlUInt32.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlUInt32.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlUInt32.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -20,7 +20,8 @@
using System;
using System.Data;
-using MySql.Data.MySqlClient;
+using MySql.Data.MySqlClient;
+using System.Globalization;
namespace MySql.Data.Types
{
@@ -56,12 +57,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.UInt32; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.UInt32; }
}
@@ -76,12 +77,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(UInt32); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return is24Bit ? "MEDIUMINT" : "INT"; }
}
@@ -97,13 +98,16 @@
IMySqlValue IMySqlValue.ReadValue(MySqlStream stream, long length, bool nullVal)
{
- if (nullVal) return new MySqlUInt32(MySqlDbType, true);
+ if (nullVal)
+ return new MySqlUInt32((this as IMySqlValue).MySqlDbType, true);
- if (length == -1)
- return new MySqlUInt32(MySqlDbType, (uint)stream.ReadInteger(4));
- else
- return new MySqlUInt32(MySqlDbType, UInt32.Parse(
- stream.ReadString(length)));
+ if (length == -1)
+ return new MySqlUInt32((this as IMySqlValue).MySqlDbType,
+ (uint)stream.ReadInteger(4));
+ else
+ return new MySqlUInt32((this as IMySqlValue).MySqlDbType,
+ UInt32.Parse(stream.ReadString(length),
+ CultureInfo.InvariantCulture));
}
void IMySqlValue.SkipValue(MySqlStream stream)
Modified: trunk/mysqlclient/Types/MySqlUInt64.cs
===================================================================
--- trunk/mysqlclient/Types/MySqlUInt64.cs 2006-07-30 17:00:41 UTC (rev 287)
+++ trunk/mysqlclient/Types/MySqlUInt64.cs 2006-07-31 14:28:30 UTC (rev 288)
@@ -49,12 +49,12 @@
get { return isNull; }
}
- public MySql.Data.MySqlClient.MySqlDbType MySqlDbType
+ MySqlDbType IMySqlValue.MySqlDbType
{
get { return MySqlDbType.UInt64; }
}
- public System.Data.DbType DbType
+ DbType IMySqlValue.DbType
{
get { return DbType.UInt64; }
}
@@ -69,12 +69,12 @@
get { return mValue; }
}
- public Type SystemType
+ Type IMySqlValue.SystemType
{
get { return typeof(ulong); }
}
- public string MySqlTypeName
+ string IMySqlValue.MySqlTypeName
{
get { return "BIGINT"; }
}
| Thread |
|---|
| • Connector/NET commit: r288 - in trunk/mysqlclient: . Types | rburnett | 31 Jul |
