Merge 0.69.7 into 1.0.

Conflicts:
	docs/content/overview/version-history.md
	src/Directory.Build.props

Author: bgrainger

docs/content/overview/version-history.md

@@ -8,8 +8,7 @@ title: Version History
 weight: 30
 ---
 
-Version History
-===============
+# Version History
 
 ### 1.0.0
 
@@ -26,6 +25,10 @@ Version History
 * Allow rows larger than 1 MiB in `MySqlBulkCopy`: [#834](https://github.com/mysql-net/MySqlConnector/issues/834).
 * Reduce memory allocations when hashing passwords (during login).
 
+### 0.69.7
+
+* Support `ENUM` columns that use the `MYSQL_TYPE_ENUM` type in their column metadata: [#850](https://github.com/mysql-net/MySqlConnector/issues/850).
+
 ### 0.69.6
 
 * Support `GEOMCOLLECTION` data type alias in MySQL Server 8.0: [#845](https://github.com/mysql-net/MySqlConnector/issues/845).

src/MySqlConnector/Core/BinaryRow.cs

@@ -110,6 +110,8 @@ protected override object GetValueCore(ReadOnlySpan<byte> data, ColumnDefinition
 			case ColumnType.Blob:
 			case ColumnType.MediumBlob:
 			case ColumnType.LongBlob:
+			case ColumnType.Enum:
+			case ColumnType.Set:
 				if (columnDefinition.CharacterSet == CharacterSet.Binary)
 				{
 					var guidFormat = Connection.GuidFormat;

src/MySqlConnector/Core/TextRow.cs

@@ -66,6 +66,8 @@ protected override object GetValueCore(ReadOnlySpan<byte> data, ColumnDefinition
 			case ColumnType.Blob:
 			case ColumnType.MediumBlob:
 			case ColumnType.LongBlob:
+			case ColumnType.Enum:
+			case ColumnType.Set:
 				if (columnDefinition.CharacterSet == CharacterSet.Binary)
 				{
 					var guidFormat = Connection.GuidFormat;

src/MySqlConnector/Core/TypeMapper.cs

@@ -207,6 +207,7 @@ public static MySqlDbType ConvertToMySqlDbType(ColumnDefinitionPayload columnDef
 					return MySqlDbType.Set;
 				goto case ColumnType.VarString;
 
+			case ColumnType.VarChar:
 			case ColumnType.VarString:
 			case ColumnType.TinyBlob:
 			case ColumnType.Blob:
@@ -271,6 +272,12 @@ public static MySqlDbType ConvertToMySqlDbType(ColumnDefinitionPayload columnDef
 			case ColumnType.Null:
 				return MySqlDbType.Null;
 
+			case ColumnType.Enum:
+				return MySqlDbType.Enum;
+
+			case ColumnType.Set:
+				return MySqlDbType.Set;
+
 			default:
 				throw new NotImplementedException("ConvertToMySqlDbType for {0} is not implemented".FormatInvariant(columnDefinition.ColumnType));
 			}