Set ProviderType in GetColumnSchema.

Author: bgrainger

src/MySqlConnector/MySqlClient/MySqlDataReader.cs

@@ -241,7 +241,7 @@ public override void Close()
 		public ReadOnlyCollection<DbColumn> GetColumnSchema()
 		{
 			return GetResultSet().ColumnDefinitions
-				.Select((c, n) => (DbColumn) new MySqlDbColumn(n, c, GetFieldType(n), GetDataTypeName(n)))
+				.Select((c, n) => (DbColumn) new MySqlDbColumn(n, c, GetResultSet().ColumnTypes[n]))
 				.ToList().AsReadOnly();
 		}
 

src/MySqlConnector/MySqlClient/MySqlDbColumn.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Globalization;
+using MySql.Data.MySqlClient.Types;
 using MySql.Data.Serialization;
 
 #if !NETSTANDARD1_3 && !NETSTANDARD2_0
@@ -38,8 +40,11 @@ namespace MySql.Data.MySqlClient
 {
 	public sealed class MySqlDbColumn : System.Data.Common.DbColumn
 	{
-		internal MySqlDbColumn(int ordinal, ColumnDefinitionPayload column, Type type, string dataTypeName)
+		internal MySqlDbColumn(int ordinal, ColumnDefinitionPayload column, MySqlDbType mySqlDbType)
 		{
+			var columnTypeMapping = TypeMapper.Mapper.GetColumnMapping(mySqlDbType);
+
+			var type = columnTypeMapping.DbTypeMapping.ClrType;
 			var columnSize = type == typeof(string) || type == typeof(Guid) ?
 				column.ColumnLength / SerializationUtility.GetBytesPerCharacter(column.CharacterSet) :
 				column.ColumnLength;
@@ -53,7 +58,9 @@ internal MySqlDbColumn(int ordinal, ColumnDefinitionPayload column, Type type, s
 			ColumnOrdinal = ordinal;
 			ColumnSize = columnSize > int.MaxValue ? int.MaxValue : unchecked((int) columnSize);
 			DataType = type;
-			DataTypeName = dataTypeName;
+			DataTypeName = columnTypeMapping.SimpleDataTypeName;
+			if (mySqlDbType == MySqlDbType.String)
+				DataTypeName += string.Format(CultureInfo.InvariantCulture, "({0})", columnSize);
 			IsAliased = column.PhysicalName != column.Name;
 			IsAutoIncrement = (column.ColumnFlags & ColumnFlags.AutoIncrement) != 0;
 			IsExpression = false;
@@ -72,9 +79,9 @@ internal MySqlDbColumn(int ordinal, ColumnDefinitionPayload column, Type type, s
 					NumericPrecision--;
 			}
 			NumericScale = column.Decimals;
-			ProviderType = (int) column.ColumnType;
+			ProviderType = mySqlDbType;
 		}
 
-		public int ProviderType { get; }
+		public MySqlDbType ProviderType { get; }
 	}
 }

src/MySqlConnector/MySqlClient/Types/TypeMapper.cs

@@ -47,8 +47,8 @@ private TypeMapper()
 			var typeDecimal = AddDbTypeMapping(new DbTypeMapping(typeof(decimal), new[] { DbType.Decimal }, convert: o => Convert.ToDecimal(o)));
 			var typeDouble = AddDbTypeMapping(new DbTypeMapping(typeof(double), new[] { DbType.Double }, convert: o => Convert.ToDouble(o)));
 			var typeFloat = AddDbTypeMapping(new DbTypeMapping(typeof(float), new[] { DbType.Single }, convert: o => Convert.ToSingle(o)));
-			AddMySqlDbTypeMapping(new ColumnTypeMapping("DECIMAL", typeDecimal, MySqlDbType.Decimal));
 			AddMySqlDbTypeMapping(new ColumnTypeMapping("DECIMAL", typeDecimal, MySqlDbType.NewDecimal));
+			AddMySqlDbTypeMapping(new ColumnTypeMapping("DECIMAL", typeDecimal, MySqlDbType.Decimal));
 			AddMySqlDbTypeMapping(new ColumnTypeMapping("DOUBLE", typeDouble, MySqlDbType.Double));
 			AddMySqlDbTypeMapping(new ColumnTypeMapping("FLOAT", typeFloat, MySqlDbType.Float));
 
@@ -197,7 +197,7 @@ public static MySqlDbType ConvertToMySqlDbType(ColumnDefinitionPayload columnDef
 						MySqlDbType.LongBlob;
 				}
 				return type == ColumnType.String ? MySqlDbType.String :
-					type == ColumnType.VarString ? MySqlDbType.VarString :
+					type == ColumnType.VarString ? MySqlDbType.VarChar :
 					type == ColumnType.TinyBlob ? MySqlDbType.TinyText :
 					type == ColumnType.Blob ? MySqlDbType.Text:
 					type == ColumnType.MediumBlob ? MySqlDbType.MediumText :