Represent column type with MySqlDbType.

bgrainger · bgrainger · commit 9673c0f7b89f · 2017-10-20T19:15:00.000-07:00
diff --git a/src/MySqlConnector/MySqlClient/MySqlDbType.cs b/src/MySqlConnector/MySqlClient/MySqlDbType.cs
@@ -4,13 +4,15 @@ namespace MySql.Data.MySqlClient
 {
 	public enum MySqlDbType
 	{
+		Bool = -1,
 		Decimal,
 		Byte,
 		Int16,
 		Int32,
 		Float,
 		Double,
-		Timestamp = 7,
+		Null,
+		Timestamp,
 		Int64,
 		Int24,
 		Date,
diff --git a/src/MySqlConnector/MySqlClient/Results/ResultSet.cs b/src/MySqlConnector/MySqlClient/Results/ResultSet.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using MySql.Data.MySqlClient.Types;
 using MySql.Data.Protocol.Serialization;
 using MySql.Data.Serialization;
 
@@ -21,6 +22,7 @@ public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 			// ResultSet can be re-used, so initialize everything
 			BufferState = ResultSetState.None;
 			ColumnDefinitions = null;
+			ColumnTypes = null;
 			LastInsertId = 0;
 			RecordsAffected = 0;
 			State = ResultSetState.None;
@@ -45,6 +47,7 @@ public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 						RecordsAffected += ok.AffectedRowCount;
 						LastInsertId = ok.LastInsertId;
 						ColumnDefinitions = null;
+						ColumnTypes = null;
 						State = (ok.ServerStatus & ServerStatus.MoreResultsExist) == 0
 							? ResultSetState.NoMoreData
 							: ResultSetState.HasMoreData;
@@ -92,6 +95,7 @@ public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 						Array.Resize(ref m_columnDefinitionPayloads, columnCount * 96);
 
 						ColumnDefinitions = new ColumnDefinitionPayload[columnCount];
+						ColumnTypes = new MySqlDbType[columnCount];
 						m_dataOffsets = new int[columnCount];
 						m_dataLengths = new int[columnCount];
 
@@ -105,7 +109,9 @@ public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 								Array.Resize(ref m_columnDefinitionPayloads, Math.Max(m_columnDefinitionPayloadUsedBytes + arraySegment.Count, m_columnDefinitionPayloadUsedBytes * 2));
 							Buffer.BlockCopy(arraySegment.Array, arraySegment.Offset, m_columnDefinitionPayloads, m_columnDefinitionPayloadUsedBytes, arraySegment.Count);
 
-							ColumnDefinitions[column] = ColumnDefinitionPayload.Create(new ArraySegment<byte>(m_columnDefinitionPayloads, m_columnDefinitionPayloadUsedBytes, arraySegment.Count));
+							var columnDefinition = ColumnDefinitionPayload.Create(new ArraySegment<byte>(m_columnDefinitionPayloads, m_columnDefinitionPayloadUsedBytes, arraySegment.Count));
+							ColumnDefinitions[column] = columnDefinition;
+							ColumnTypes[column] = TypeMapper.ConvertToMySqlDbType(columnDefinition, treatTinyAsBoolean: Connection.TreatTinyAsBoolean, oldGuids: Connection.OldGuids);
 							m_columnDefinitionPayloadUsedBytes += arraySegment.Count;
 						}
 
@@ -269,74 +275,96 @@ public string GetDataTypeName(int ordinal)
 			if (ordinal < 0 || ordinal > ColumnDefinitions.Length)
 				throw new ArgumentOutOfRangeException(nameof(ordinal), "value must be between 0 and {0}.".FormatInvariant(ColumnDefinitions.Length));
 
-			var columnDefinition = ColumnDefinitions[ordinal];
-			switch (columnDefinition.ColumnType)
+			switch (ColumnTypes[ordinal])
 			{
-				case ColumnType.Tiny:
-					return Connection.TreatTinyAsBoolean && columnDefinition.ColumnLength == 1 ? "BOOL" : "TINYINT";
+			case MySqlDbType.Bool:
+				return "BOOL";
 
-				case ColumnType.Short:
-					return "SMALLINT";
+			case MySqlDbType.UByte:
+			case MySqlDbType.Byte:
+				return "TINYINT";
 
-				case ColumnType.Int24:
-					return "MEDIUMINT";
+			case MySqlDbType.UInt16:
+			case MySqlDbType.Int16:
+				return "SMALLINT";
 
-				case ColumnType.Long:
-					return "INT";
+			case MySqlDbType.UInt24:
+			case MySqlDbType.Int24:
+				return "MEDIUMINT";
 
-				case ColumnType.Longlong:
-					return "BIGINT";
+			case MySqlDbType.UInt32:
+			case MySqlDbType.Int32:
+				return "INT";
 
-				case ColumnType.Bit:
-					return "BIT";
+			case MySqlDbType.UInt64:
+			case MySqlDbType.Int64:
+				return "BIGINT";
 
-				case ColumnType.String:
-					return columnDefinition.CharacterSet == CharacterSet.Binary ? "BLOB" :
-						(columnDefinition.ColumnFlags & ColumnFlags.Enum) != 0 ? "ENUM" :
-						(columnDefinition.ColumnFlags & ColumnFlags.Set) != 0 ? "SET" :
-						string.Format(CultureInfo.InvariantCulture, "CHAR({0})", columnDefinition.ColumnLength / SerializationUtility.GetBytesPerCharacter(columnDefinition.CharacterSet));
+			case MySqlDbType.Bit:
+				return "BIT";
 
-				case ColumnType.VarString:
-				case ColumnType.TinyBlob:
-				case ColumnType.Blob:
-				case ColumnType.MediumBlob:
-				case ColumnType.LongBlob:
-					return columnDefinition.CharacterSet == CharacterSet.Binary ? "BLOB" : "VARCHAR";
+			case MySqlDbType.Enum:
+				return "ENUM";
 
-				case ColumnType.Date:
-					return "DATE";
+			case MySqlDbType.Set:
+				return "SET";
 
-				case ColumnType.DateTime:
-					return "DATETIME";
+			case MySqlDbType.Guid:
+				return "CHAR(36)";
 
-				case ColumnType.Timestamp:
-					return "TIMESTAMP";
+			case MySqlDbType.String:
+				var columnDefinition = ColumnDefinitions[ordinal];
+				return string.Format(CultureInfo.InvariantCulture, "CHAR({0})", columnDefinition.ColumnLength / SerializationUtility.GetBytesPerCharacter(columnDefinition.CharacterSet));
 
-				case ColumnType.Time:
-					return "TIME";
+			case MySqlDbType.VarString:
+			case MySqlDbType.TinyText:
+			case MySqlDbType.Text:
+			case MySqlDbType.MediumText:
+			case MySqlDbType.LongText:
+				return "VARCHAR";
 
-				case ColumnType.Year:
-					return "YEAR";
+			case MySqlDbType.Binary:
+			case MySqlDbType.VarBinary:
+			case MySqlDbType.TinyBlob:
+			case MySqlDbType.Blob:
+			case MySqlDbType.MediumBlob:
+			case MySqlDbType.LongBlob:
+				return "BLOB";
 
-				case ColumnType.Float:
-					return "FLOAT";
+			case MySqlDbType.Date:
+				return "DATE";
 
-				case ColumnType.Double:
-					return "DOUBLE";
+			case MySqlDbType.DateTime:
+				return "DATETIME";
 
-				case ColumnType.Decimal:
-				case ColumnType.NewDecimal:
-					return "DECIMAL";
+			case MySqlDbType.Timestamp:
+				return "TIMESTAMP";
 
-				case ColumnType.Json:
-					return "JSON";
+			case MySqlDbType.Time:
+				return "TIME";
 
-				case ColumnType.Null:
-					// not a valid data type name, but only happens when there is no way to infer the type of the column, e.g., "SELECT NULL;"
-					return "NULL";
+			case MySqlDbType.Year:
+				return "YEAR";
 
-				default:
-					throw new NotImplementedException("GetDataTypeName for {0} is not implemented".FormatInvariant(columnDefinition.ColumnType));
+			case MySqlDbType.Float:
+				return "FLOAT";
+
+			case MySqlDbType.Double:
+				return "DOUBLE";
+
+			case MySqlDbType.Decimal:
+			case MySqlDbType.NewDecimal:
+				return "DECIMAL";
+
+			case MySqlDbType.JSON:
+				return "JSON";
+
+			case MySqlDbType.Null:
+				// not a valid data type name, but only happens when there is no way to infer the type of the column, e.g., "SELECT NULL;"
+				return "NULL";
+
+			default:
+				throw new NotImplementedException("GetDataTypeName for {0} is not implemented".FormatInvariant(ColumnTypes[ordinal]));
 			}
 		}
 
@@ -439,6 +467,7 @@ public Row GetCurrentRow()
 
 		public ResultSetState BufferState { get; private set; }
 		public ColumnDefinitionPayload[] ColumnDefinitions { get; private set; }
+		public MySqlDbType[] ColumnTypes { get; private set; }
 		public long LastInsertId { get; private set; }
 		public int RecordsAffected { get; private set; }
 		public ResultSetState State { get; private set; }
diff --git a/src/MySqlConnector/MySqlClient/Types/TypeMapper.cs b/src/MySqlConnector/MySqlClient/Types/TypeMapper.cs
@@ -132,6 +132,102 @@ internal ColumnTypeMapping GetColumnTypeMapping(string columnTypeName, bool unsi
 			return columnTypeMapping;
 		}
 
+		public static MySqlDbType ConvertToMySqlDbType(ColumnDefinitionPayload columnDefinition, bool treatTinyAsBoolean, bool oldGuids)
+		{
+			var isUnsigned = (columnDefinition.ColumnFlags & ColumnFlags.Unsigned) != 0;
+			switch (columnDefinition.ColumnType)
+			{
+			case ColumnType.Tiny:
+				return treatTinyAsBoolean && columnDefinition.ColumnLength == 1 ? MySqlDbType.Bool :
+					isUnsigned ? MySqlDbType.UByte : MySqlDbType.Byte;
+
+			case ColumnType.Int24:
+				return isUnsigned ? MySqlDbType.UInt24 : MySqlDbType.Int24;
+
+			case ColumnType.Long:
+				return isUnsigned ? MySqlDbType.UInt32 : MySqlDbType.Int32;
+
+			case ColumnType.Longlong:
+				return isUnsigned ? MySqlDbType.UInt64 : MySqlDbType.Int64;
+
+			case ColumnType.Bit:
+				return MySqlDbType.Bit;
+
+			case ColumnType.String:
+				if (!oldGuids && columnDefinition.ColumnLength / SerializationUtility.GetBytesPerCharacter(columnDefinition.CharacterSet) == 36)
+					return MySqlDbType.Guid;
+				if ((columnDefinition.ColumnFlags & ColumnFlags.Enum) != 0)
+					return MySqlDbType.Enum;
+				if ((columnDefinition.ColumnFlags & ColumnFlags.Set) != 0)
+					return MySqlDbType.Set;
+				goto case ColumnType.VarString;
+
+			case ColumnType.VarString:
+			case ColumnType.TinyBlob:
+			case ColumnType.Blob:
+			case ColumnType.MediumBlob:
+			case ColumnType.LongBlob:
+				var type = columnDefinition.ColumnType;
+				if (columnDefinition.CharacterSet == CharacterSet.Binary)
+				{
+					if (oldGuids && columnDefinition.ColumnLength == 16)
+						return MySqlDbType.Guid;
+
+					return type == ColumnType.String ? MySqlDbType.Binary :
+						type == ColumnType.VarString ? MySqlDbType.VarBinary :
+						type == ColumnType.TinyBlob ? MySqlDbType.TinyBlob :
+						type == ColumnType.Blob ? MySqlDbType.Blob :
+						type == ColumnType.MediumBlob ? MySqlDbType.MediumBlob :
+						MySqlDbType.LongBlob;
+				}
+				return type == ColumnType.String ? MySqlDbType.String :
+					type == ColumnType.VarString ? MySqlDbType.VarString :
+					type == ColumnType.TinyBlob ? MySqlDbType.TinyText :
+					type == ColumnType.Blob ? MySqlDbType.Text:
+					type == ColumnType.MediumBlob ? MySqlDbType.MediumText :
+					MySqlDbType.LongText;
+
+			case ColumnType.Json:
+				return MySqlDbType.JSON;
+
+			case ColumnType.Short:
+				return isUnsigned ? MySqlDbType.UInt16 : MySqlDbType.Int16;
+
+			case ColumnType.Date:
+				return MySqlDbType.Date;
+
+			case ColumnType.DateTime:
+				return MySqlDbType.DateTime;
+
+			case ColumnType.Timestamp:
+				return MySqlDbType.Timestamp;
+
+			case ColumnType.Time:
+				return MySqlDbType.Time;
+
+			case ColumnType.Year:
+				return MySqlDbType.Year;
+
+			case ColumnType.Float:
+				return MySqlDbType.Float;
+
+			case ColumnType.Double:
+				return MySqlDbType.Double;
+
+			case ColumnType.Decimal:
+				return MySqlDbType.Decimal;
+
+			case ColumnType.NewDecimal:
+				return MySqlDbType.NewDecimal;
+
+			case ColumnType.Null:
+				return MySqlDbType.Null;
+
+			default:
+				throw new NotImplementedException("ConvertToMySqlDbType for {0} is not implemented".FormatInvariant(columnDefinition.ColumnType));
+			}
+		}
+
 		internal static MySqlDbType ConverToMySqlDbType(DbType dbtype)
 		{
 			switch (dbtype)
@@ -209,6 +305,8 @@ internal static DbType ConvertFromMySqlDbType(MySqlDbType dbtype)
 			case MySqlDbType.LongText: return DbType.String;
 			case MySqlDbType.Text: return DbType.String;
 			case MySqlDbType.Guid: return DbType.Guid;
+			case MySqlDbType.Bool: return DbType.Boolean;
+			case MySqlDbType.Null: return DbType.Object;
 			}
 			throw new InvalidCastException("Never reached. " + dbtype.ToString());
 		}
